Automated merge with file:///work/netbeans/jet-main
authorVita Stejskal <vstejskal@netbeans.org>
Tue, 03 Aug 2010 12:53:43 +0200
changeset 294848208d9176c1
parent 2940 4cd622d3f068
parent 2947 38f4ef731f2c
child 2949 1c74419ce52b
Automated merge with file:///work/netbeans/jet-main
     1.1 --- a/visualweb.designer.jsf/nbproject/project.xml	Thu Jul 15 12:14:32 2010 -0400
     1.2 +++ b/visualweb.designer.jsf/nbproject/project.xml	Tue Aug 03 12:53:43 2010 +0200
     1.3 @@ -427,6 +427,15 @@
     1.4                          <specification-version>6.5.2</specification-version>
     1.5                      </run-dependency>
     1.6                  </dependency>
     1.7 +                <dependency>
     1.8 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
     1.9 +                    <build-prerequisite/>
    1.10 +                    <compile-dependency/>
    1.11 +                    <run-dependency>
    1.12 +                        <release-version>0-1</release-version>
    1.13 +                        <specification-version>1.0</specification-version>
    1.14 +                    </run-dependency>
    1.15 +                </dependency>
    1.16              </module-dependencies>
    1.17              <friend-packages>
    1.18                  <friend>org.netbeans.modules.visualweb.gravy</friend>
     2.1 --- a/visualweb.gravy/nbproject/project.xml	Thu Jul 15 12:14:32 2010 -0400
     2.2 +++ b/visualweb.gravy/nbproject/project.xml	Tue Aug 03 12:53:43 2010 +0200
     2.3 @@ -310,6 +310,15 @@
     2.4                          <specification-version>6.23</specification-version>
     2.5                      </run-dependency>
     2.6                  </dependency>
     2.7 +            <dependency>
     2.8 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
     2.9 +                    <build-prerequisite/>
    2.10 +                    <compile-dependency/>
    2.11 +                    <run-dependency>
    2.12 +                        <release-version>0-1</release-version>
    2.13 +                        <specification-version>1.0</specification-version>
    2.14 +                    </run-dependency>
    2.15 +                </dependency>
    2.16              </module-dependencies>
    2.17              <public-packages/>
    2.18          </data>
     3.1 --- a/visualweb.insync/nbproject/project.xml	Thu Jul 15 12:14:32 2010 -0400
     3.2 +++ b/visualweb.insync/nbproject/project.xml	Tue Aug 03 12:53:43 2010 +0200
     3.3 @@ -107,7 +107,7 @@
     3.4                      <compile-dependency/>
     3.5                      <run-dependency>
     3.6                          <release-version>3</release-version>
     3.7 -                        <specification-version>1.41</specification-version>
     3.8 +                        <specification-version>1.42</specification-version>
     3.9                      </run-dependency>
    3.10                  </dependency>
    3.11                  <dependency>
    3.12 @@ -483,6 +483,15 @@
    3.13                          <specification-version>6.5</specification-version>
    3.14                      </run-dependency>
    3.15                  </dependency>
    3.16 +                <dependency>
    3.17 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
    3.18 +                    <build-prerequisite/>
    3.19 +                    <compile-dependency/>
    3.20 +                    <run-dependency>
    3.21 +                        <release-version>0-1</release-version>
    3.22 +                        <specification-version>1.0</specification-version>
    3.23 +                    </run-dependency>
    3.24 +                </dependency>
    3.25              </module-dependencies>
    3.26              <test-dependencies>
    3.27                  <test-type>
     4.1 --- a/visualweb.palette/nbproject/project.xml	Thu Jul 15 12:14:32 2010 -0400
     4.2 +++ b/visualweb.palette/nbproject/project.xml	Tue Aug 03 12:53:43 2010 +0200
     4.3 @@ -165,6 +165,15 @@
     4.4                          <specification-version>6.5.21</specification-version>
     4.5                      </run-dependency>
     4.6                  </dependency>
     4.7 +                <dependency>
     4.8 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
     4.9 +                    <build-prerequisite/>
    4.10 +                    <compile-dependency/>
    4.11 +                    <run-dependency>
    4.12 +                        <release-version>0-1</release-version>
    4.13 +                        <specification-version>1.0</specification-version>
    4.14 +                    </run-dependency>
    4.15 +                </dependency>
    4.16              </module-dependencies>
    4.17              <friend-packages>
    4.18                  <friend>org.netbeans.modules.visualweb.complib</friend>
     5.1 --- a/visualweb.project.jsfloader/nbproject/project.xml	Thu Jul 15 12:14:32 2010 -0400
     5.2 +++ b/visualweb.project.jsfloader/nbproject/project.xml	Tue Aug 03 12:53:43 2010 +0200
     5.3 @@ -260,6 +260,15 @@
     5.4                          <specification-version>6.5</specification-version>
     5.5                      </run-dependency>
     5.6                  </dependency>
     5.7 +                <dependency>
     5.8 +                    <code-name-base>org.netbeans.modules.editor.deprecated.pre65formatting</code-name-base>
     5.9 +                    <build-prerequisite/>
    5.10 +                    <compile-dependency/>
    5.11 +                    <run-dependency>
    5.12 +                        <release-version>0-1</release-version>
    5.13 +                        <specification-version>1.0</specification-version>
    5.14 +                    </run-dependency>
    5.15 +                </dependency>
    5.16              </module-dependencies>
    5.17              <test-dependencies>
    5.18                  <test-type>