1.1 --- a/.hgignore Wed Mar 23 11:45:18 2011 -0400
1.2 +++ b/.hgignore Wed Mar 23 14:24:30 2011 -0400
1.3 @@ -1,5 +1,7 @@
1.4 (^|/)build$
1.5 +(^|/)dist$
1.6 (^|/)nbproject/private$
1.7 +^[^/]+/external/[^/]+\.(zip|jar|gz|bz2|gem|dll|xpi)$
1.8 ^visualweb.complib/\.classpath$
1.9 ^visualweb.complib/\.project$
1.10 ^visualweb.dataconnectivity/doc$
2.1 --- a/build.xml Wed Mar 23 11:45:18 2011 -0400
2.2 +++ b/build.xml Wed Mar 23 14:24:30 2011 -0400
2.3 @@ -1,8 +1,17 @@
2.4 <?xml version="1.0" encoding="UTF-8"?>
2.5 -<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
2.6 -<!-- for some information on what you could do (e.g. targets to override). -->
2.7 -<!-- If you delete this file and reopen the project it will be recreated. -->
2.8 <project name="visualweb" basedir=".">
2.9 - <description>Builds the module suite visualweb.</description>
2.10 <import file="nbproject/build-impl.xml"/>
2.11 + <target name="downloadbinaries" description="Download external binaries not stored in Mercurial sources.">
2.12 + <!-- XXX as of NB 7.0 (a5514d070c77) this will be standard; until then need our own copy: -->
2.13 + <taskdef classpath="tasks.jar" resource="org/netbeans/nbbuild/taskdefs.properties"/>
2.14 + <property file="${user.home}/.nbbuild.properties"/> <!-- permit binaries.cache to be overridden -->
2.15 + <property name="binaries.cache" location="${user.home}/.hgexternalcache"/>
2.16 + <property name="binaries.server" value="http://hg.netbeans.org/binaries/"/>
2.17 + <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
2.18 + <manifest dir=".">
2.19 + <include name="*/external/binaries-list"/>
2.20 + </manifest>
2.21 + </downloadbinaries>
2.22 + </target>
2.23 + <target name="-init" depends="suite.-init,downloadbinaries"/>
2.24 </project>
3.1 --- a/libs.httpunit/build.xml Wed Mar 23 11:45:18 2011 -0400
3.2 +++ b/libs.httpunit/build.xml Wed Mar 23 14:24:30 2011 -0400
3.3 @@ -19,5 +19,8 @@
3.4 -->
3.5 <project name="libs.httpunit" default="netbeans" basedir=".">
3.6 <import file="nbproject/build-impl.xml"/>
3.7 -
3.8 + <target name="release" depends="projectized-common.release">
3.9 + <mkdir dir="${cluster}/modules/ext"/>
3.10 + <copy file="external/httpunit-1.6.2.jar" todir="${cluster}/modules/ext"/>
3.11 + </target>
3.12 </project>
4.1 --- a/libs.httpunit/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
4.2 +++ b/libs.httpunit/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
4.3 @@ -41,6 +41,6 @@
4.4 # made subject to such option by the copyright holder.
4.5
4.6 is.autoload=true
4.7 -release.external/httpunit-1.6.2.jar=modules/ext/httpunit-1.6.2.jar
4.8 +extra.module.files=modules/ext/httpunit-1.6.2.jar
4.9 module.jar.verifylinkageignores=com.meterware.*
4.10 spec.version.base=1.18.0
5.1 --- a/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
5.2 +++ b/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
5.3 @@ -6,7 +6,6 @@
5.4 ${project.org.netbeans.modules.visualweb.api.j2ee}:\
5.5 ${project.org.netbeans.modules.visualweb.api.portlet.dd}:\
5.6 ${project.org.netbeans.modules.visualweb.classloaderprovider}:\
5.7 - ${project.org.netbeans.modules.visualweb.compatibilitykit}:\
5.8 ${project.org.netbeans.modules.visualweb.complib}:\
5.9 ${project.org.netbeans.modules.visualweb.complib.api}:\
5.10 ${project.org.netbeans.modules.visualweb.dataconnectivity}:\
5.11 @@ -72,7 +71,6 @@
5.12 project.org.netbeans.modules.visualweb.api.j2ee=visualweb.api.j2ee
5.13 project.org.netbeans.modules.visualweb.api.portlet.dd=visualweb.api.portlet.dd
5.14 project.org.netbeans.modules.visualweb.classloaderprovider=visualweb.classloaderprovider
5.15 -project.org.netbeans.modules.visualweb.compatibilitykit=visualweb.compatibilitykit
5.16 project.org.netbeans.modules.visualweb.complib=visualweb.complib
5.17 project.org.netbeans.modules.visualweb.complib.api=visualweb.complib.api
5.18 project.org.netbeans.modules.visualweb.dataconnectivity=visualweb.dataconnectivity
6.1 Binary file tasks.jar has changed
7.1 --- a/visualweb.compatibilitykit/nbproject/build-impl.xml Wed Mar 23 11:45:18 2011 -0400
7.2 +++ b/visualweb.compatibilitykit/nbproject/build-impl.xml Wed Mar 23 14:24:30 2011 -0400
7.3 @@ -11,11 +11,8 @@
7.4 </not>
7.5 </condition>
7.6 </fail>
7.7 - <property file="nbproject/private/suite-private.properties"/>
7.8 - <property file="nbproject/suite.properties"/>
7.9 - <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
7.10 - <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
7.11 - <property file="${suite.dir}/nbproject/platform.properties"/>
7.12 + <property file="nbproject/private/platform-private.properties"/>
7.13 + <property file="nbproject/platform.properties"/>
7.14 <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
7.15 <attribute name="name"/>
7.16 <attribute name="value"/>
8.1 --- a/visualweb.compatibilitykit/nbproject/genfiles.properties Wed Mar 23 11:45:18 2011 -0400
8.2 +++ b/visualweb.compatibilitykit/nbproject/genfiles.properties Wed Mar 23 14:24:30 2011 -0400
8.3 @@ -1,5 +1,5 @@
8.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
8.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
8.6 -nbproject/build-impl.xml.data.CRC32=8aeee302
8.7 -nbproject/build-impl.xml.script.CRC32=a07f7c79
8.8 +nbproject/build-impl.xml.data.CRC32=4d2ce096
8.9 +nbproject/build-impl.xml.script.CRC32=43e58d5f
8.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/visualweb.compatibilitykit/nbproject/platform.properties Wed Mar 23 14:24:30 2011 -0400
9.3 @@ -0,0 +1,9 @@
9.4 +cluster.path=\
9.5 + ${nbplatform.active.dir}/platform:\
9.6 + ${nbplatform.active.dir}/harness:\
9.7 + ${nbplatform.active.dir}/websvccommon:\
9.8 + ${nbplatform.active.dir}/java:\
9.9 + ${nbplatform.active.dir}/nb:\
9.10 + ${nbplatform.active.dir}/enterprise:\
9.11 + ${nbplatform.active.dir}/ide
9.12 +nbplatform.active=nb69
10.1 --- a/visualweb.compatibilitykit/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
10.2 +++ b/visualweb.compatibilitykit/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
10.3 @@ -48,7 +48,7 @@
10.4 <configuration>
10.5 <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
10.6 <code-name-base>org.netbeans.modules.visualweb.compatibilitykit</code-name-base>
10.7 - <suite-component/>
10.8 + <standalone/>
10.9 <module-dependencies>
10.10 <dependency>
10.11 <code-name-base>org.netbeans.modules.visualweb.libs.rowset</code-name-base>
11.1 --- a/visualweb.compatibilitykit/nbproject/suite.properties Wed Mar 23 11:45:18 2011 -0400
11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
11.3 @@ -1,1 +0,0 @@
11.4 -suite.dir=${basedir}/..
12.1 --- a/visualweb.dataconnectivity/build.xml Wed Mar 23 11:45:18 2011 -0400
12.2 +++ b/visualweb.dataconnectivity/build.xml Wed Mar 23 14:24:30 2011 -0400
12.3 @@ -48,7 +48,7 @@
12.4 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.dataconnectivity.</description>
12.5 <import file="nbproject/build-impl.xml"/>
12.6
12.7 - <target name="init" depends="projectized.init">
12.8 + <target name="init" depends="harness.init">
12.9 <condition property="nbjdk.bootclasspath.available">
12.10 <isset property="nbjdk.bootclasspath"/>
12.11 </condition>
13.1 --- a/visualweb.dataprovider/build.xml Wed Mar 23 11:45:18 2011 -0400
13.2 +++ b/visualweb.dataprovider/build.xml Wed Mar 23 14:24:30 2011 -0400
13.3 @@ -49,7 +49,7 @@
13.4 <description>Builds and tests the project org.netbeans.modules.visualweb.dataprovider.</description>
13.5 <import file="nbproject/build-impl.xml"/>
13.6
13.7 - <target name="init" depends="projectized.init,library-init,javadoc-zip-init,src-zip-init"/>
13.8 + <target name="init" depends="harness.init,library-init,javadoc-zip-init,src-zip-init"/>
13.9
13.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
13.11 <target name="library-init">
14.1 --- a/visualweb.designer.decoration/build.xml Wed Mar 23 11:45:18 2011 -0400
14.2 +++ b/visualweb.designer.decoration/build.xml Wed Mar 23 14:24:30 2011 -0400
14.3 @@ -41,7 +41,7 @@
14.4 made subject to such option by the copyright holder.
14.5 -->
14.6
14.7 -<project name="contrib/visualweb.designer.decoration" default="netbeans" basedir=".">
14.8 +<project name="visualweb.designer.decoration" default="netbeans" basedir=".">
14.9 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.designer.decoration.</description>
14.10 - <import file="../nbproject/build-impl.xml"/>
14.11 + <import file="nbproject/build-impl.xml"/>
14.12 </project>
15.1 --- a/visualweb.designer.html/build.xml Wed Mar 23 11:45:18 2011 -0400
15.2 +++ b/visualweb.designer.html/build.xml Wed Mar 23 14:24:30 2011 -0400
15.3 @@ -48,7 +48,7 @@
15.4 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.designer.html.</description>
15.5 <import file="nbproject/build-impl.xml"/>
15.6
15.7 - <target name="init" depends="projectized.init,library-init"/>
15.8 + <target name="init" depends="harness.init,library-init"/>
15.9
15.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
15.11 <target name="library-init">
16.1 --- a/visualweb.designer.jsf/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
16.2 +++ b/visualweb.designer.jsf/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
16.3 @@ -91,8 +91,8 @@
16.4 <build-prerequisite/>
16.5 <compile-dependency/>
16.6 <run-dependency>
16.7 - <release-version>3</release-version>
16.8 - <specification-version>3.1</specification-version>
16.9 + <release-version>2-3</release-version>
16.10 + <specification-version>2.1</specification-version>
16.11 </run-dependency>
16.12 </dependency>
16.13 <dependency>
17.1 --- a/visualweb.designtime.base/build.xml Wed Mar 23 11:45:18 2011 -0400
17.2 +++ b/visualweb.designtime.base/build.xml Wed Mar 23 14:24:30 2011 -0400
17.3 @@ -49,11 +49,13 @@
17.4 <description>Builds ant tests the project com.sun.rave.designtime.base.</description>
17.5 <import file="nbproject/build-impl.xml"/>
17.6
17.7 - <target name="init" depends="projectized.init,library-init"/>
17.8 + <target name="init" depends="harness.init,library-init"/>
17.9
17.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
17.11 <target name="library-init">
17.12 - <ant dir="library" target="jar" inheritAll="false"/>
17.13 + <ant dir="library" target="jar" inheritAll="false">
17.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
17.15 + </ant>
17.16 </target>
17.17
17.18 <target name="netbeans-extra" depends="init">
18.1 --- a/visualweb.designtime.base/library/build.xml Wed Mar 23 11:45:18 2011 -0400
18.2 +++ b/visualweb.designtime.base/library/build.xml Wed Mar 23 14:24:30 2011 -0400
18.3 @@ -46,7 +46,6 @@
18.4
18.5 <project name="visualweb.designtime.base/library" default="default" basedir=".">
18.6 <import file="nbproject/build-impl.xml"/>
18.7 - <import file="../../nbbuild/templates/projectized.xml"/>
18.8 <!--
18.9
18.10 There exist several targets which are by default empty and which can be
19.1 --- a/visualweb.designtime.base/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
19.2 +++ b/visualweb.designtime.base/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
19.3 @@ -59,19 +59,16 @@
19.4 dist.jar=${dist.dir}/designtime-base.jar
19.5 dist.javadoc.dir=${dist.dir}/javadoc
19.6 excludes=
19.7 -file.reference.designtime.jar=${visualweb.designtime.dir}/modules/ext/designtime.jar
19.8 +file.reference.designtime.jar=../../visualweb.designtime/library/dist/designtime.jar
19.9
19.10 # JSF 1.1
19.11 #file.reference.jsf-api.jar=../../../ravelibs/jsf-api/release/modules/ext/jsf-api.jar
19.12
19.13 -# Have JSF1.2 API, JSP & Servlet API
19.14 -file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
19.15 -file.reference.jsf-api.jar=../../nbbuild/netbeans/enterprise/modules/ext/jsf-1_2/jsf-api.jar
19.16 +file.reference.jsf-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/jsf-1_2/jsf-api.jar
19.17
19.18 includes=**
19.19 jar.compress=false
19.20 javac.classpath=\
19.21 - ${file.reference.servlet3.0-jsp2.2-api.jar}:\
19.22 ${file.reference.jsf-api.jar}:\
19.23 ${file.reference.designtime.jar}
19.24
20.1 --- a/visualweb.designtime/build.xml Wed Mar 23 11:45:18 2011 -0400
20.2 +++ b/visualweb.designtime/build.xml Wed Mar 23 14:24:30 2011 -0400
20.3 @@ -50,11 +50,13 @@
20.4 <description>Builds and tests the project org.netbeans.modules.visualweb.designtime.</description>
20.5 <import file="nbproject/build-impl.xml"/>
20.6
20.7 - <target name="init" depends="projectized.init,library-init"/>
20.8 + <target name="init" depends="harness.init,library-init"/>
20.9
20.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
20.11 <target name="library-init">
20.12 - <ant dir="library" target="jar" inheritAll="false"/>
20.13 + <ant dir="library" target="jar" inheritAll="false">
20.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
20.15 + </ant>
20.16 </target>
20.17
20.18 <target name="netbeans-extra" depends="init">
21.1 --- a/visualweb.designtime/library/build.xml Wed Mar 23 11:45:18 2011 -0400
21.2 +++ b/visualweb.designtime/library/build.xml Wed Mar 23 14:24:30 2011 -0400
21.3 @@ -48,7 +48,6 @@
21.4 <project name="visualweb.designtime/library" default="default" basedir=".">
21.5
21.6 <import file="nbproject/build-impl.xml"/>
21.7 - <import file="../../nbbuild/templates/projectized.xml"/>
21.8
21.9 <target name="-pre-jar">
21.10 <tstamp>
22.1 --- a/visualweb.designtime/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
22.2 +++ b/visualweb.designtime/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
22.3 @@ -65,8 +65,8 @@
22.4 excludes=
22.5
22.6 # Have JSF1.2 API, JSP & Servlet API
22.7 -file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
22.8 -file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
22.9 +file.reference.servlet3.0-jsp2.2-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/servlet3.0-jsp2.2-api.jar
22.10 +file.reference.jsf-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/jsf-1_2/jsf-api.jar
22.11
22.12 includes=**
22.13 jar.compress=false
23.1 --- a/visualweb.designtimeext/build.xml Wed Mar 23 11:45:18 2011 -0400
23.2 +++ b/visualweb.designtimeext/build.xml Wed Mar 23 14:24:30 2011 -0400
23.3 @@ -50,7 +50,7 @@
23.4 <description>Builds and tests the project org.netbeans.modules.visualweb.designtime.</description>
23.5 <import file="nbproject/build-impl.xml"/>
23.6
23.7 - <target name="init" depends="projectized.init,library-init"/>
23.8 + <target name="init" depends="harness.init,library-init"/>
23.9
23.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
23.11 <target name="library-init">
24.1 --- a/visualweb.errorhandler.client/build.xml Wed Mar 23 11:45:18 2011 -0400
24.2 +++ b/visualweb.errorhandler.client/build.xml Wed Mar 23 14:24:30 2011 -0400
24.3 @@ -48,11 +48,13 @@
24.4 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.errorhandler.client.</description>
24.5 <import file="nbproject/build-impl.xml"/>
24.6
24.7 - <target name="init" depends="projectized.init,library-init"/>
24.8 + <target name="init" depends="harness.init,library-init"/>
24.9
24.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
24.11 <target name="library-init">
24.12 - <ant dir="library" target="jar" inheritAll="false"/>
24.13 + <ant dir="library" target="jar" inheritAll="false">
24.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
24.15 + </ant>
24.16 </target>
24.17
24.18 <target name="netbeans-extra" depends="init">
25.1 --- a/visualweb.errorhandler.client/library/build.xml Wed Mar 23 11:45:18 2011 -0400
25.2 +++ b/visualweb.errorhandler.client/library/build.xml Wed Mar 23 14:24:30 2011 -0400
25.3 @@ -46,7 +46,6 @@
25.4
25.5 <project name="visualweb.errorhandler.client/library" default="default" basedir=".">
25.6 <import file="nbproject/build-impl.xml"/>
25.7 - <import file="../../nbbuild/templates/projectized.xml"/>
25.8 <!--
25.9
25.10 There exist several targets which are by default empty and which can be
26.1 --- a/visualweb.errorhandler.client/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
26.2 +++ b/visualweb.errorhandler.client/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
26.3 @@ -59,7 +59,7 @@
26.4 dist.jar=${dist.dir}/errorhandler.jar
26.5 dist.javadoc.dir=${dist.dir}/javadoc
26.6 excludes=
26.7 -file.reference.servlet-jsp-api.jar=${servletjspapi.dir}/modules/ext/servlet3.0-jsp2.2-api.jar
26.8 +file.reference.servlet-jsp-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/servlet2.5-jsp2.1-api.jar
26.9 includes=**
26.10 jar.compress=false
26.11 javac.classpath=\
27.1 --- a/visualweb.gravy/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
27.2 +++ b/visualweb.gravy/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
27.3 @@ -90,8 +90,8 @@
27.4 <build-prerequisite/>
27.5 <compile-dependency/>
27.6 <run-dependency>
27.7 - <release-version>3</release-version>
27.8 - <specification-version>3.1</specification-version>
27.9 + <release-version>2-3</release-version>
27.10 + <specification-version>2.1</specification-version>
27.11 </run-dependency>
27.12 </dependency>
27.13 <dependency>
28.1 --- a/visualweb.insync/nbproject/genfiles.properties Wed Mar 23 11:45:18 2011 -0400
28.2 +++ b/visualweb.insync/nbproject/genfiles.properties Wed Mar 23 14:24:30 2011 -0400
28.3 @@ -1,5 +1,5 @@
28.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
28.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
28.6 -nbproject/build-impl.xml.data.CRC32=0481aeb4
28.7 +nbproject/build-impl.xml.data.CRC32=4767b086
28.8 nbproject/build-impl.xml.script.CRC32=578bda41
28.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
29.1 --- a/visualweb.insync/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
29.2 +++ b/visualweb.insync/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
29.3 @@ -108,7 +108,7 @@
29.4 <compile-dependency/>
29.5 <run-dependency>
29.6 <release-version>3</release-version>
29.7 - <specification-version>1.53</specification-version>
29.8 + <specification-version>1.42</specification-version>
29.9 </run-dependency>
29.10 </dependency>
29.11 <dependency>
29.12 @@ -116,8 +116,8 @@
29.13 <build-prerequisite/>
29.14 <compile-dependency/>
29.15 <run-dependency>
29.16 - <release-version>3</release-version>
29.17 - <specification-version>3.1</specification-version>
29.18 + <release-version>2-3</release-version>
29.19 + <specification-version>2.1</specification-version>
29.20 </run-dependency>
29.21 </dependency>
29.22 <dependency>
29.23 @@ -134,7 +134,7 @@
29.24 <build-prerequisite/>
29.25 <compile-dependency/>
29.26 <run-dependency>
29.27 - <specification-version>0.67</specification-version>
29.28 + <specification-version>0.4.0.1.3</specification-version>
29.29 </run-dependency>
29.30 </dependency>
29.31 <dependency>
30.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ElementGripFactory.java Wed Mar 23 11:45:18 2011 -0400
30.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/ElementGripFactory.java Wed Mar 23 14:24:30 2011 -0400
30.3 @@ -51,7 +51,6 @@
30.4 import java.util.WeakHashMap;
30.5 import javax.lang.model.element.Element;
30.6 import org.netbeans.api.java.source.CompilationInfo;
30.7 -import org.netbeans.api.java.source.TreeUtilities;
30.8 import org.openide.filesystems.FileObject;
30.9
30.10 /**
30.11 @@ -141,7 +140,7 @@
30.12 long end = info.getTrees().getSourcePositions().getEndPosition(info.getCompilationUnit(), t);
30.13 Element current = info.getTrees().getElement(tp);
30.14 Tree.Kind kind = tp.getLeaf().getKind();
30.15 - if (!TreeUtilities.CLASS_TREE_KINDS.contains(kind) && kind != Tree.Kind.METHOD) {
30.16 + if (!/*java.source 0.67: TreeUtilities.CLASS_TREE_KINDS.contains(kind)*/kind.name().matches("ANNOTATION_TYPE|CLASS|ENUM|INTERFACE") && kind != Tree.Kind.METHOD) {
30.17 if (tp.getParentPath()==null || tp.getParentPath().getLeaf().getKind() == Tree.Kind.COMPILATION_UNIT) {
30.18 //xxx: rather workaround. should be fixed better.
30.19 return null;
31.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringsPluginFactory.java Wed Mar 23 11:45:18 2011 -0400
31.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringsPluginFactory.java Wed Mar 23 14:24:30 2011 -0400
31.3 @@ -44,11 +44,9 @@
31.4
31.5 package org.netbeans.modules.visualweb.insync.faces.refactoring;
31.6
31.7 -import java.util.Arrays;
31.8
31.9 import org.netbeans.api.fileinfo.NonRecursiveFolder;
31.10 import org.netbeans.api.java.source.TreePathHandle;
31.11 -import org.netbeans.api.java.source.TreeUtilities;
31.12 import org.netbeans.modules.refactoring.api.AbstractRefactoring;
31.13 import org.netbeans.modules.refactoring.api.MoveRefactoring;
31.14 import org.netbeans.modules.refactoring.api.RenameRefactoring;
31.15 @@ -58,7 +56,6 @@
31.16 import org.openide.filesystems.FileObject;
31.17 import org.openide.util.Lookup;
31.18
31.19 -import com.sun.source.tree.Tree;
31.20
31.21 /**
31.22 * <p>This is a factory for refactoring plugins that participate in Insync supported refactoring.</p>
31.23 @@ -145,7 +142,7 @@
31.24 FacesModelSet.getInstance(refactoredFileObject);
31.25 if (FacesRefactoringUtils.isJavaFileObjectOfInterest(refactoredFileObject)) {
31.26 TreePathHandle treePathHandle = refactoringSource.lookup(TreePathHandle.class);
31.27 - if (treePathHandle == null || TreeUtilities.CLASS_TREE_KINDS.contains(treePathHandle.getKind())) {
31.28 + if (treePathHandle == null || /*java.source 0.67: TreeUtilities.CLASS_TREE_KINDS.contains(treePathHandle.getKind())*/treePathHandle.getKind().name().matches("ANNOTATION_TYPE|CLASS|ENUM|INTERFACE")) {
31.29 if (refactoring instanceof RenameRefactoring) {
31.30 return new FacesJavaFileRenameRefactoringPlugin((RenameRefactoring)refactoring);
31.31 } else if (refactoring instanceof MoveRefactoring) {
32.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaClass.java Wed Mar 23 11:45:18 2011 -0400
32.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/java/JavaClass.java Wed Mar 23 14:24:30 2011 -0400
32.3 @@ -77,7 +77,6 @@
32.4 import org.netbeans.api.java.source.CompilationInfo;
32.5 import org.netbeans.api.java.source.ElementHandle;
32.6 import org.netbeans.api.java.source.TreeMaker;
32.7 -import org.netbeans.api.java.source.TreeUtilities;
32.8 import org.netbeans.api.java.source.WorkingCopy;
32.9 import org.netbeans.modules.visualweb.insync.beans.Bean;
32.10 import org.netbeans.modules.visualweb.insync.beans.BeansUnit;
32.11 @@ -746,7 +745,7 @@
32.12 public Object run(CompilationInfo cinfo) {
32.13 CompilationUnitTree cunit = cinfo.getCompilationUnit();
32.14 for(Tree tree : cunit.getTypeDecls()) {
32.15 - if(TreeUtilities.CLASS_TREE_KINDS.contains(tree.getKind())) {
32.16 + if(/*java.source 0.67: TreeUtilities.CLASS_TREE_KINDS.contains(tree.getKind())*/tree.getKind().name().matches("ANNOTATION_TYPE|CLASS|ENUM|INTERFACE")) {
32.17 ClassTree clazz = (ClassTree)tree;
32.18 if(clazz.getSimpleName().toString().equals(fObj.getName()) &&
32.19 clazz.getModifiers().getFlags().contains(Modifier.PUBLIC)) {
33.1 --- a/visualweb.jsfsupport.components/build.xml Wed Mar 23 11:45:18 2011 -0400
33.2 +++ b/visualweb.jsfsupport.components/build.xml Wed Mar 23 14:24:30 2011 -0400
33.3 @@ -50,11 +50,13 @@
33.4 <description>Builds and tests the project org.netbeans.modules.visualweb.jsfsupport.components.</description>
33.5 <import file="nbproject/build-impl.xml"/>
33.6
33.7 - <target name="init" depends="projectized.init,library-init,javadoc-zip-init,src-zip-init"/>
33.8 + <target name="init" depends="harness.init,library-init,javadoc-zip-init,src-zip-init"/>
33.9
33.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
33.11 <target name="library-init">
33.12 - <ant dir="library" target="jar" inheritAll="false"/>
33.13 + <ant dir="library" target="jar" inheritAll="false">
33.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
33.15 + </ant>
33.16 </target>
33.17
33.18 <target name="src-zip-init">
34.1 --- a/visualweb.jsfsupport.components/library/build.xml Wed Mar 23 11:45:18 2011 -0400
34.2 +++ b/visualweb.jsfsupport.components/library/build.xml Wed Mar 23 14:24:30 2011 -0400
34.3 @@ -48,7 +48,6 @@
34.4 <project name="visualweb.jsfsupport.components/library" default="default" basedir=".">
34.5
34.6 <import file="nbproject/build-impl.xml"/>
34.7 - <import file="../../nbbuild/templates/projectized.xml"/>
34.8
34.9 <target name="-post-compile" depends="copy-metadata"/>
34.10
35.1 --- a/visualweb.jsfsupport.components/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
35.2 +++ b/visualweb.jsfsupport.components/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
35.3 @@ -66,8 +66,8 @@
35.4 #file.reference.jsf-api.jar=../../../ravelibs/jsf-api/release/modules/ext/jsf-api.jar
35.5
35.6 # Have JSF1.2 API, JSP & Servlet API
35.7 -file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
35.8 -file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
35.9 +file.reference.servlet3.0-jsp2.2-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/servlet2.5-jsp2.1-api.jar
35.10 +file.reference.jsf-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/jsf-1_2/jsf-api.jar
35.11
35.12
35.13 file.reference.rowset-1.0.1.jar=../../visualweb.libs.rowset/external/rowset-1.0.1.jar
36.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveExternalContext.java Wed Mar 23 11:45:18 2011 -0400
36.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveExternalContext.java Wed Mar 23 14:24:30 2011 -0400
36.3 @@ -48,7 +48,6 @@
36.4 import java.net.MalformedURLException;
36.5 import java.net.URL;
36.6 import java.security.Principal;
36.7 -import java.util.Collection;
36.8 import java.util.Enumeration;
36.9 import java.util.HashMap;
36.10 import java.util.Iterator;
36.11 @@ -57,16 +56,9 @@
36.12 import java.util.Set;
36.13 import javax.faces.context.ExternalContext;
36.14 //import javax.portlet.PortletContext;
36.15 -import javax.servlet.AsyncContext;
36.16 -import javax.servlet.DispatcherType;
36.17 import javax.servlet.ServletContext;
36.18 -import javax.servlet.ServletException;
36.19 -import javax.servlet.ServletRequest;
36.20 -import javax.servlet.ServletResponse;
36.21 import javax.servlet.http.HttpServletRequest;
36.22 -import javax.servlet.http.HttpServletResponse;
36.23 import javax.servlet.http.HttpSession;
36.24 -import javax.servlet.http.Part;
36.25 import org.openide.util.Enumerations;
36.26
36.27 /**
36.28 @@ -437,54 +429,6 @@
36.29
36.30 public void setCharacterEncoding(String str) throws java.io.UnsupportedEncodingException {
36.31 }
36.32 - @Override
36.33 - public boolean authenticate(HttpServletResponse hsr) throws IOException, ServletException {
36.34 - throw new UnsupportedOperationException("Not supported yet.");
36.35 - }
36.36 - @Override
36.37 - public void login(String string, String string1) throws ServletException {
36.38 - throw new UnsupportedOperationException("Not supported yet.");
36.39 - }
36.40 - @Override
36.41 - public void logout() throws ServletException {
36.42 - throw new UnsupportedOperationException("Not supported yet.");
36.43 - }
36.44 - @Override
36.45 - public Collection<Part> getParts() throws IOException, ServletException {
36.46 - throw new UnsupportedOperationException("Not supported yet.");
36.47 - }
36.48 - @Override
36.49 - public Part getPart(String string) throws IOException, ServletException {
36.50 - throw new UnsupportedOperationException("Not supported yet.");
36.51 - }
36.52 - @Override
36.53 - public ServletContext getServletContext() {
36.54 - throw new UnsupportedOperationException("Not supported yet.");
36.55 - }
36.56 - @Override
36.57 - public AsyncContext startAsync() throws IllegalStateException {
36.58 - throw new UnsupportedOperationException("Not supported yet.");
36.59 - }
36.60 - @Override
36.61 - public AsyncContext startAsync(ServletRequest sr, ServletResponse sr1) throws IllegalStateException {
36.62 - throw new UnsupportedOperationException("Not supported yet.");
36.63 - }
36.64 - @Override
36.65 - public boolean isAsyncStarted() {
36.66 - throw new UnsupportedOperationException("Not supported yet.");
36.67 - }
36.68 - @Override
36.69 - public boolean isAsyncSupported() {
36.70 - throw new UnsupportedOperationException("Not supported yet.");
36.71 - }
36.72 - @Override
36.73 - public AsyncContext getAsyncContext() {
36.74 - throw new UnsupportedOperationException("Not supported yet.");
36.75 - }
36.76 - @Override
36.77 - public DispatcherType getDispatcherType() {
36.78 - throw new UnsupportedOperationException("Not supported yet.");
36.79 - }
36.80 };
36.81
36.82 /**
37.1 --- a/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServletContext.java Wed Mar 23 11:45:18 2011 -0400
37.2 +++ b/visualweb.jsfsupport/src/org/netbeans/modules/visualweb/jsfsupport/container/RaveServletContext.java Wed Mar 23 14:24:30 2011 -0400
37.3 @@ -48,22 +48,13 @@
37.4 import java.net.MalformedURLException;
37.5 import java.net.URL;
37.6 import java.util.Enumeration;
37.7 -import java.util.EventListener;
37.8 import java.util.Hashtable;
37.9 -import java.util.Map;
37.10 import java.util.Set;
37.11 -import javax.servlet.Filter;
37.12 -import javax.servlet.FilterRegistration;
37.13
37.14 import javax.servlet.RequestDispatcher;
37.15 import javax.servlet.Servlet;
37.16 import javax.servlet.ServletContext;
37.17 import javax.servlet.ServletException;
37.18 -import javax.servlet.ServletRegistration;
37.19 -import javax.servlet.ServletRegistration.Dynamic;
37.20 -import javax.servlet.SessionCookieConfig;
37.21 -import javax.servlet.SessionTrackingMode;
37.22 -import javax.servlet.descriptor.JspConfigDescriptor;
37.23
37.24 import org.openide.modules.InstalledFileLocator;
37.25
37.26 @@ -389,108 +380,4 @@
37.27 public String getContextPath() {
37.28 return "";
37.29 }
37.30 - @Override
37.31 - public int getEffectiveMajorVersion() {
37.32 - throw new UnsupportedOperationException("Not supported yet.");
37.33 - }
37.34 - @Override
37.35 - public int getEffectiveMinorVersion() {
37.36 - throw new UnsupportedOperationException("Not supported yet.");
37.37 - }
37.38 - @Override
37.39 - public boolean setInitParameter(String string, String string1) {
37.40 - throw new UnsupportedOperationException("Not supported yet.");
37.41 - }
37.42 - @Override
37.43 - public Dynamic addServlet(String string, String string1) {
37.44 - throw new UnsupportedOperationException("Not supported yet.");
37.45 - }
37.46 - @Override
37.47 - public Dynamic addServlet(String string, Servlet srvlt) {
37.48 - throw new UnsupportedOperationException("Not supported yet.");
37.49 - }
37.50 - @Override
37.51 - public Dynamic addServlet(String string, Class<? extends Servlet> type) {
37.52 - throw new UnsupportedOperationException("Not supported yet.");
37.53 - }
37.54 - @Override
37.55 - public <T extends Servlet> T createServlet(Class<T> type) throws ServletException {
37.56 - throw new UnsupportedOperationException("Not supported yet.");
37.57 - }
37.58 - @Override
37.59 - public ServletRegistration getServletRegistration(String string) {
37.60 - throw new UnsupportedOperationException("Not supported yet.");
37.61 - }
37.62 - @Override
37.63 - public Map<String, ? extends ServletRegistration> getServletRegistrations() {
37.64 - throw new UnsupportedOperationException("Not supported yet.");
37.65 - }
37.66 - @Override
37.67 - public FilterRegistration.Dynamic addFilter(String string, String string1) {
37.68 - throw new UnsupportedOperationException("Not supported yet.");
37.69 - }
37.70 - @Override
37.71 - public FilterRegistration.Dynamic addFilter(String string, Filter filter) {
37.72 - throw new UnsupportedOperationException("Not supported yet.");
37.73 - }
37.74 - @Override
37.75 - public FilterRegistration.Dynamic addFilter(String string, Class<? extends Filter> type) {
37.76 - throw new UnsupportedOperationException("Not supported yet.");
37.77 - }
37.78 - @Override
37.79 - public <T extends Filter> T createFilter(Class<T> type) throws ServletException {
37.80 - throw new UnsupportedOperationException("Not supported yet.");
37.81 - }
37.82 - @Override
37.83 - public FilterRegistration getFilterRegistration(String string) {
37.84 - throw new UnsupportedOperationException("Not supported yet.");
37.85 - }
37.86 - @Override
37.87 - public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
37.88 - throw new UnsupportedOperationException("Not supported yet.");
37.89 - }
37.90 - @Override
37.91 - public SessionCookieConfig getSessionCookieConfig() {
37.92 - throw new UnsupportedOperationException("Not supported yet.");
37.93 - }
37.94 - @Override
37.95 - public void setSessionTrackingModes(Set<SessionTrackingMode> set) {
37.96 - throw new UnsupportedOperationException("Not supported yet.");
37.97 - }
37.98 - @Override
37.99 - public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
37.100 - throw new UnsupportedOperationException("Not supported yet.");
37.101 - }
37.102 - @Override
37.103 - public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
37.104 - throw new UnsupportedOperationException("Not supported yet.");
37.105 - }
37.106 - @Override
37.107 - public void addListener(String string) {
37.108 - throw new UnsupportedOperationException("Not supported yet.");
37.109 - }
37.110 - @Override
37.111 - public <T extends EventListener> void addListener(T t) {
37.112 - throw new UnsupportedOperationException("Not supported yet.");
37.113 - }
37.114 - @Override
37.115 - public void addListener(Class<? extends EventListener> type) {
37.116 - throw new UnsupportedOperationException("Not supported yet.");
37.117 - }
37.118 - @Override
37.119 - public <T extends EventListener> T createListener(Class<T> type) throws ServletException {
37.120 - throw new UnsupportedOperationException("Not supported yet.");
37.121 - }
37.122 - @Override
37.123 - public JspConfigDescriptor getJspConfigDescriptor() {
37.124 - throw new UnsupportedOperationException("Not supported yet.");
37.125 - }
37.126 - @Override
37.127 - public ClassLoader getClassLoader() {
37.128 - throw new UnsupportedOperationException("Not supported yet.");
37.129 - }
37.130 - @Override
37.131 - public void declareRoles(String... strings) {
37.132 - throw new UnsupportedOperationException("Not supported yet.");
37.133 - }
37.134 }
38.1 --- a/visualweb.libs.batik/build.xml Wed Mar 23 11:45:18 2011 -0400
38.2 +++ b/visualweb.libs.batik/build.xml Wed Mar 23 14:24:30 2011 -0400
38.3 @@ -50,7 +50,7 @@
38.4
38.5 <import file="nbproject/build-impl.xml"/>
38.6
38.7 - <target name="init" depends="projectized.init,library-init"/>
38.8 + <target name="init" depends="harness.init,library-init"/>
38.9
38.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
38.11 <target name="library-init">
39.1 --- a/visualweb.libs.jtidy/build.xml Wed Mar 23 11:45:18 2011 -0400
39.2 +++ b/visualweb.libs.jtidy/build.xml Wed Mar 23 14:24:30 2011 -0400
39.3 @@ -50,7 +50,7 @@
39.4
39.5 <import file="nbproject/build-impl.xml"/>
39.6
39.7 - <target name="init" depends="projectized.init,library-init"/>
39.8 + <target name="init" depends="harness.init,library-init"/>
39.9
39.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
39.11 <target name="library-init">
40.1 --- a/visualweb.libs.rowset/build.xml Wed Mar 23 11:45:18 2011 -0400
40.2 +++ b/visualweb.libs.rowset/build.xml Wed Mar 23 14:24:30 2011 -0400
40.3 @@ -49,9 +49,13 @@
40.4 <project name="visualweb.libs.rowset" default="netbeans" basedir=".">
40.5 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.libs.rowset.</description>
40.6 <import file="nbproject/build-impl.xml"/>
40.7 -
40.8 - <!-- Create the javadoc zip file from the rowset src -->
40.9 - <!-- this target below is not currently being used -->
40.10 + <target name="release" depends="projectized-common.release">
40.11 + <mkdir dir="${cluster}/modules/ext"/>
40.12 + <copy file="external/rowset-1.0.1.jar" todir="${cluster}/modules/ext"/>
40.13 + <mkdir dir="${cluster}/docs"/>
40.14 + <copy file="external/rowset-doc.zip" todir="${cluster}/docs"/>
40.15 + </target>
40.16 + <!-- Create the javadoc zip file from the rowset src; XXX rewrite to use build dir, not external which is in sources
40.17 <target name="rowset-doc-zip">
40.18 <unzip src="external/src.zip" dest="external">
40.19 <patternset>
40.20 @@ -78,5 +82,5 @@
40.21 <mkdir dir="release/docs"/>
40.22 <zip basedir="external/javadoc" destfile="release/docs/rowset-doc.zip" />
40.23 </target>
40.24 -
40.25 + -->
40.26 </project>
41.1 --- a/visualweb.libs.rowset/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
41.2 +++ b/visualweb.libs.rowset/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
41.3 @@ -42,5 +42,6 @@
41.4
41.5 # nbm.is.global=true
41.6
41.7 -release.external/rowset-1.0.1.jar=modules/ext/rowset-1.0.1.jar
41.8 -release.external/rowset-doc.zip=docs/rowset-doc.zip
41.9 +extra.module.files=\
41.10 + modules/ext/rowset-1.0.1.jar,\
41.11 + docs/rowset-doc.zip
42.1 --- a/visualweb.palette/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
42.2 +++ b/visualweb.palette/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
42.3 @@ -64,8 +64,8 @@
42.4 <build-prerequisite/>
42.5 <compile-dependency/>
42.6 <run-dependency>
42.7 - <release-version>3</release-version>
42.8 - <specification-version>3.1</specification-version>
42.9 + <release-version>2-3</release-version>
42.10 + <specification-version>2.1</specification-version>
42.11 </run-dependency>
42.12 </dependency>
42.13 <dependency>
43.1 --- a/visualweb.project.importpage/build.xml Wed Mar 23 11:45:18 2011 -0400
43.2 +++ b/visualweb.project.importpage/build.xml Wed Mar 23 14:24:30 2011 -0400
43.3 @@ -44,7 +44,7 @@
43.4 <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
43.5 <!-- for some information on what you could do (e.g. targets to override). -->
43.6 <!-- If you delete this file and reopen the project it will be recreated. -->
43.7 -<project name="contrib/visualweb.project.importpage" default="netbeans" basedir=".">
43.8 +<project name="visualweb.project.importpage" default="netbeans" basedir=".">
43.9 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.project.importpage.</description>
43.10 - <import file="../nbproject/build-impl.xml"/>
43.11 + <import file="nbproject/build-impl.xml"/>
43.12 </project>
44.1 --- a/visualweb.project.importpage/nbproject/genfiles.properties Wed Mar 23 11:45:18 2011 -0400
44.2 +++ b/visualweb.project.importpage/nbproject/genfiles.properties Wed Mar 23 14:24:30 2011 -0400
44.3 @@ -1,5 +1,5 @@
44.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
44.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
44.6 -nbproject/build-impl.xml.data.CRC32=01df1935
44.7 +nbproject/build-impl.xml.data.CRC32=626ea8b0
44.8 nbproject/build-impl.xml.script.CRC32=902b7481
44.9 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
45.1 --- a/visualweb.project.importpage/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
45.2 +++ b/visualweb.project.importpage/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
45.3 @@ -48,6 +48,42 @@
45.4 <suite-component/>
45.5 <module-dependencies>
45.6 <dependency>
45.7 + <code-name-base>org.netbeans.libs.xerces</code-name-base>
45.8 + <build-prerequisite/>
45.9 + <compile-dependency/>
45.10 + <run-dependency>
45.11 + <release-version>1</release-version>
45.12 + <specification-version>1.8</specification-version>
45.13 + </run-dependency>
45.14 + </dependency>
45.15 + <dependency>
45.16 + <code-name-base>org.netbeans.modules.projectapi</code-name-base>
45.17 + <build-prerequisite/>
45.18 + <compile-dependency/>
45.19 + <run-dependency>
45.20 + <release-version>1</release-version>
45.21 + <specification-version>1.9</specification-version>
45.22 + </run-dependency>
45.23 + </dependency>
45.24 + <dependency>
45.25 + <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
45.26 + <build-prerequisite/>
45.27 + <compile-dependency/>
45.28 + <run-dependency>
45.29 + <release-version>1</release-version>
45.30 + <specification-version>1.13.0.5</specification-version>
45.31 + </run-dependency>
45.32 + </dependency>
45.33 + <dependency>
45.34 + <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
45.35 + <build-prerequisite/>
45.36 + <compile-dependency/>
45.37 + <run-dependency>
45.38 + <release-version>1</release-version>
45.39 + <specification-version>1.1</specification-version>
45.40 + </run-dependency>
45.41 + </dependency>
45.42 + <dependency>
45.43 <code-name-base>org.netbeans.modules.visualweb.api.designer</code-name-base>
45.44 <build-prerequisite/>
45.45 <compile-dependency/>
45.46 @@ -117,24 +153,6 @@
45.47 </run-dependency>
45.48 </dependency>
45.49 <dependency>
45.50 - <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
45.51 - <build-prerequisite/>
45.52 - <compile-dependency/>
45.53 - <run-dependency>
45.54 - <release-version>1</release-version>
45.55 - <specification-version>1.1</specification-version>
45.56 - </run-dependency>
45.57 - </dependency>
45.58 - <dependency>
45.59 - <code-name-base>org.netbeans.modules.web.jsf12</code-name-base>
45.60 - <build-prerequisite/>
45.61 - <compile-dependency/>
45.62 - <run-dependency>
45.63 - <release-version>1</release-version>
45.64 - <specification-version>1.0</specification-version>
45.65 - </run-dependency>
45.66 - </dependency>
45.67 - <dependency>
45.68 <code-name-base>org.netbeans.modules.visualweb.libs.jtidy</code-name-base>
45.69 <build-prerequisite/>
45.70 <compile-dependency/>
45.71 @@ -162,6 +180,14 @@
45.72 </run-dependency>
45.73 </dependency>
45.74 <dependency>
45.75 + <code-name-base>org.netbeans.modules.visualweb.woodstock.webui.jsf</code-name-base>
45.76 + <build-prerequisite/>
45.77 + <compile-dependency/>
45.78 + <run-dependency>
45.79 + <specification-version>1.0</specification-version>
45.80 + </run-dependency>
45.81 + </dependency>
45.82 + <dependency>
45.83 <code-name-base>org.netbeans.modules.visualweb.xhtml</code-name-base>
45.84 <build-prerequisite/>
45.85 <compile-dependency/>
45.86 @@ -170,38 +196,20 @@
45.87 </run-dependency>
45.88 </dependency>
45.89 <dependency>
45.90 - <code-name-base>org.netbeans.modules.visualweb.woodstock.webui.jsf</code-name-base>
45.91 + <code-name-base>org.netbeans.modules.web.jsf12</code-name-base>
45.92 <build-prerequisite/>
45.93 <compile-dependency/>
45.94 <run-dependency>
45.95 + <release-version>1</release-version>
45.96 <specification-version>1.0</specification-version>
45.97 </run-dependency>
45.98 </dependency>
45.99 <dependency>
45.100 - <code-name-base>org.netbeans.libs.xerces</code-name-base>
45.101 + <code-name-base>org.openide.awt</code-name-base>
45.102 <build-prerequisite/>
45.103 <compile-dependency/>
45.104 <run-dependency>
45.105 - <release-version>1</release-version>
45.106 - <specification-version>1.8</specification-version>
45.107 - </run-dependency>
45.108 - </dependency>
45.109 - <dependency>
45.110 - <code-name-base>org.netbeans.modules.projectapi</code-name-base>
45.111 - <build-prerequisite/>
45.112 - <compile-dependency/>
45.113 - <run-dependency>
45.114 - <release-version>1</release-version>
45.115 - <specification-version>1.9</specification-version>
45.116 - </run-dependency>
45.117 - </dependency>
45.118 - <dependency>
45.119 - <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
45.120 - <build-prerequisite/>
45.121 - <compile-dependency/>
45.122 - <run-dependency>
45.123 - <release-version>1</release-version>
45.124 - <specification-version>1.13.0.5</specification-version>
45.125 + <specification-version>7.23.1</specification-version>
45.126 </run-dependency>
45.127 </dependency>
45.128 <dependency>
46.1 --- a/visualweb.project.jsfloader/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
46.2 +++ b/visualweb.project.jsfloader/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
46.3 @@ -64,8 +64,8 @@
46.4 <build-prerequisite/>
46.5 <compile-dependency/>
46.6 <run-dependency>
46.7 - <release-version>3</release-version>
46.8 - <specification-version>3.1</specification-version>
46.9 + <release-version>2-3</release-version>
46.10 + <specification-version>2.1</specification-version>
46.11 </run-dependency>
46.12 </dependency>
46.13 <dependency>
47.1 --- a/visualweb.propertyeditors.api/build.xml Wed Mar 23 11:45:18 2011 -0400
47.2 +++ b/visualweb.propertyeditors.api/build.xml Wed Mar 23 14:24:30 2011 -0400
47.3 @@ -47,11 +47,13 @@
47.4 <project name="visualweb.propertyeditors.api" default="netbeans" basedir=".">
47.5 <description>Builds the project org.netbeans.modules.visualweb.propertyeditors.api.</description>
47.6 <import file="nbproject/build-impl.xml"/>
47.7 - <target name="init" depends="projectized.init,library-init"/>
47.8 + <target name="init" depends="harness.init,library-init"/>
47.9
47.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
47.11 <target name="library-init">
47.12 - <ant dir="library" target="jar" inheritAll="false"/>
47.13 + <ant dir="library" target="jar" inheritAll="false">
47.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
47.15 + </ant>
47.16 </target>
47.17
47.18 <target name="netbeans-extra" depends="init">
48.1 --- a/visualweb.propertyeditors.api/library/build.xml Wed Mar 23 11:45:18 2011 -0400
48.2 +++ b/visualweb.propertyeditors.api/library/build.xml Wed Mar 23 14:24:30 2011 -0400
48.3 @@ -47,7 +47,6 @@
48.4 <project name="visualweb.propertyeditors.api/library" default="default" basedir=".">
48.5
48.6 <import file="nbproject/build-impl.xml"/>
48.7 - <import file="../../nbbuild/templates/projectized.xml"/>
48.8
48.9 <target name="-pre-jar">
48.10 <tstamp>
49.1 --- a/visualweb.propertyeditors.api/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
49.2 +++ b/visualweb.propertyeditors.api/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
49.3 @@ -61,8 +61,8 @@
49.4 file.reference.dataprovider.jar=../../visualweb.dataprovider/library/dist/dataprovider.jar
49.5 file.reference.designtime.jar=../../visualweb.designtime/library/dist/designtime.jar
49.6 # Have JSF1.2 API, JSP & Servlet API
49.7 -file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
49.8 -file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
49.9 +file.reference.servlet3.0-jsp2.2-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/servlet2.5-jsp2.1-api.jar
49.10 +file.reference.jsf-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/jsf-1_2/jsf-api.jar
49.11
49.12 includes=**
49.13 jar.compress=false
50.1 --- a/visualweb.propertyeditors.resolver/build.xml Wed Mar 23 11:45:18 2011 -0400
50.2 +++ b/visualweb.propertyeditors.resolver/build.xml Wed Mar 23 14:24:30 2011 -0400
50.3 @@ -48,7 +48,7 @@
50.4 <description>Builds the project org.netbeans.modules.visualweb.propertyeditors.resolver.</description>
50.5 <import file="nbproject/build-impl.xml"/>
50.6
50.7 - <target name="init" depends="projectized.init,library-init"/>
50.8 + <target name="init" depends="harness.init,library-init"/>
50.9
50.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
50.11 <target name="library-init">
51.1 --- a/visualweb.ravehelp.rave_nbpack/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
51.2 +++ b/visualweb.ravehelp.rave_nbpack/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
51.3 @@ -40,6 +40,5 @@
51.4 # Version 2 license, then the option applies only if the new code is
51.5 # made subject to such option by the copyright holder.
51.6
51.7 -jhall.jar=../javahelp/external/jh-2.0_05.jar
51.8 javahelp.base=org/netbeans/modules/visualweb/ravehelp/rave_nbpack/docs
51.9 javahelp.hs=rave_nbpack.hs
52.1 --- a/visualweb.removebindings/build.xml Wed Mar 23 11:45:18 2011 -0400
52.2 +++ b/visualweb.removebindings/build.xml Wed Mar 23 14:24:30 2011 -0400
52.3 @@ -1,5 +1,5 @@
52.4 <?xml version="1.0" encoding="UTF-8"?>
52.5 -<project basedir="." default="netbeans" name="contrib/visualweb.removebindings">
52.6 +<project basedir="." default="netbeans" name="visualweb.removebindings">
52.7 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.removebindings</description>
52.8 - <import file="../nbproject/build-impl.xml"/>
52.9 + <import file="nbproject/build-impl.xml"/>
52.10 </project>
53.1 --- a/visualweb.rowset/build.xml Wed Mar 23 11:45:18 2011 -0400
53.2 +++ b/visualweb.rowset/build.xml Wed Mar 23 14:24:30 2011 -0400
53.3 @@ -49,7 +49,7 @@
53.4 <description>Builds and tests the project org.netbeans.modules.visualweb.rowset.</description>
53.5 <import file="nbproject/build-impl.xml"/>
53.6
53.7 - <target name="init" depends="projectized.init,library-init,javadoc-zip-init,src-zip-init"/>
53.8 + <target name="init" depends="harness.init,library-init,javadoc-zip-init,src-zip-init"/>
53.9
53.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
53.11 <target name="library-init">
54.1 --- a/visualweb.runtime.kit/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
54.2 +++ b/visualweb.runtime.kit/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
54.3 @@ -8,8 +8,6 @@
54.4 <module-dependencies>
54.5 <dependency>
54.6 <code-name-base>org.netbeans.modules.visualweb.dataprovider</code-name-base>
54.7 - <build-prerequisite/>
54.8 - <compile-dependency/>
54.9 <run-dependency>
54.10 <release-version>1</release-version>
54.11 <specification-version>2.6</specification-version>
54.12 @@ -24,16 +22,12 @@
54.13 </dependency>
54.14 <dependency>
54.15 <code-name-base>org.netbeans.modules.visualweb.jsfsupport.components</code-name-base>
54.16 - <build-prerequisite/>
54.17 - <compile-dependency/>
54.18 <run-dependency>
54.19 <specification-version>2.6</specification-version>
54.20 </run-dependency>
54.21 </dependency>
54.22 <dependency>
54.23 <code-name-base>org.netbeans.modules.visualweb.rowset</code-name-base>
54.24 - <build-prerequisite/>
54.25 - <compile-dependency/>
54.26 <run-dependency>
54.27 <release-version>1</release-version>
54.28 <specification-version>1.6</specification-version>
54.29 @@ -48,8 +42,6 @@
54.30 </dependency>
54.31 <dependency>
54.32 <code-name-base>org.netbeans.modules.visualweb.webui</code-name-base>
54.33 - <build-prerequisite/>
54.34 - <compile-dependency/>
54.35 <run-dependency>
54.36 <release-version>1</release-version>
54.37 <specification-version>2.6</specification-version>
54.38 @@ -69,8 +61,6 @@
54.39 </dependency>
54.40 <dependency>
54.41 <code-name-base>org.netbeans.modules.visualweb.woodstock.webui.jsf</code-name-base>
54.42 - <build-prerequisite/>
54.43 - <compile-dependency/>
54.44 <run-dependency>
54.45 <specification-version>2.6</specification-version>
54.46 </run-dependency>
55.1 --- a/visualweb.samples.postrel/build.xml Wed Mar 23 11:45:18 2011 -0400
55.2 +++ b/visualweb.samples.postrel/build.xml Wed Mar 23 14:24:30 2011 -0400
55.3 @@ -40,9 +40,9 @@
55.4 Version 2 license, then the option applies only if the new code is
55.5 made subject to such option by the copyright holder.
55.6 -->
55.7 -<project basedir="." default="netbeans" name="contrib/visualweb.samples.postrel">
55.8 +<project basedir="." default="netbeans" name="visualweb.samples.postrel">
55.9 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.samples.postrel</description>
55.10 - <import file="../nbproject/build-impl.xml"/>
55.11 + <import file="nbproject/build-impl.xml"/>
55.12
55.13 <target name="jar" depends="gather-samples,projectized-common.jar"/>
55.14
56.1 --- a/visualweb.web.ui.appbase/build.xml Wed Mar 23 11:45:18 2011 -0400
56.2 +++ b/visualweb.web.ui.appbase/build.xml Wed Mar 23 14:24:30 2011 -0400
56.3 @@ -48,11 +48,13 @@
56.4 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.web.ui.appbase.</description>
56.5 <import file="nbproject/build-impl.xml"/>
56.6
56.7 - <target name="init" depends="projectized.init,library-init,javadoc-zip-init,src-zip-init"/>
56.8 + <target name="init" depends="harness.init,library-init,javadoc-zip-init,src-zip-init"/>
56.9
56.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
56.11 <target name="library-init">
56.12 - <ant dir="library" target="jar" inheritAll="false"/>
56.13 + <ant dir="library" target="jar" inheritAll="false">
56.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
56.15 + </ant>
56.16 </target>
56.17
56.18 <target name="src-zip-init">
57.1 --- a/visualweb.web.ui.appbase/library/build.xml Wed Mar 23 11:45:18 2011 -0400
57.2 +++ b/visualweb.web.ui.appbase/library/build.xml Wed Mar 23 14:24:30 2011 -0400
57.3 @@ -46,7 +46,6 @@
57.4
57.5 <project name="visualweb.web.ui.appbase/library" default="default" basedir=".">
57.6 <import file="nbproject/build-impl.xml"/>
57.7 - <import file="../../nbbuild/templates/projectized.xml"/>
57.8 <!--
57.9
57.10 There exist several targets which are by default empty and which can be
58.1 --- a/visualweb.web.ui.appbase/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
58.2 +++ b/visualweb.web.ui.appbase/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
58.3 @@ -66,8 +66,8 @@
58.4 src.zip=${dist.dir}/appbase-src.zip
58.5
58.6 # Have JSF1.2 API, JSP & Servlet API
58.7 -file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
58.8 -file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
58.9 +file.reference.servlet3.0-jsp2.2-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/servlet2.5-jsp2.1-api.jar
58.10 +file.reference.jsf-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/jsf-1_2/jsf-api.jar
58.11
58.12 jar.compress=false
58.13 javac.classpath=\
59.1 --- a/visualweb.webui.jsf.defaulttheme/build.xml Wed Mar 23 11:45:18 2011 -0400
59.2 +++ b/visualweb.webui.jsf.defaulttheme/build.xml Wed Mar 23 14:24:30 2011 -0400
59.3 @@ -46,4 +46,8 @@
59.4
59.5 <project name="visualweb.webui.jsf.defaulttheme" default="netbeans" basedir=".">
59.6 <import file="nbproject/build-impl.xml"/>
59.7 + <target name="release" depends="projectized-common.release">
59.8 + <mkdir dir="${cluster}/modules/ext"/>
59.9 + <unzip src="external/woodstock-defaulttheme-4.2.zip" dest="${cluster}/modules/ext"/>
59.10 + </target>
59.11 </project>
60.1 --- a/visualweb.webui.jsf.defaulttheme/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
60.2 +++ b/visualweb.webui.jsf.defaulttheme/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
60.3 @@ -43,26 +43,27 @@
60.4 javac.compilerargs=-Xlint -Xlint:-serial
60.5 javac.source=1.6
60.6
60.7 -release.external/woodstock-defaulttheme-4.2.zip!/webui-jsf-suntheme.jar=modules/ext/webui-jsf-suntheme.jar
60.8 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_de.jar=modules/ext/locale/webui-jsf_de.jar
60.9 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_es.jar=modules/ext/locale/webui-jsf_es.jar
60.10 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_fr.jar=modules/ext/locale/webui-jsf_fr.jar
60.11 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_it.jar=modules/ext/locale/webui-jsf_it.jar
60.12 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_ja.jar=modules/ext/locale/webui-jsf_ja.jar
60.13 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_ko.jar=modules/ext/locale/webui-jsf_ko.jar
60.14 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_pt_BR.jar=modules/ext/locale/webui-jsf_pt_BR.jar
60.15 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_sv.jar=modules/ext/locale/webui-jsf_sv.jar
60.16 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_zh_CN.jar=modules/ext/locale/webui-jsf_zh_CN.jar
60.17 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_zh_HK.jar=modules/ext/locale/webui-jsf_zh_HK.jar
60.18 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf_zh_TW.jar=modules/ext/locale/webui-jsf_zh_TW.jar
60.19 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_de.jar=modules/ext/locale/webui-jsf-suntheme_de.jar
60.20 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_es.jar=modules/ext/locale/webui-jsf-suntheme_es.jar
60.21 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_fr.jar=modules/ext/locale/webui-jsf-suntheme_fr.jar
60.22 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_it.jar=modules/ext/locale/webui-jsf-suntheme_it.jar
60.23 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_ja.jar=modules/ext/locale/webui-jsf-suntheme_ja.jar
60.24 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_ko.jar=modules/ext/locale/webui-jsf-suntheme_ko.jar
60.25 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_pt_BR.jar=modules/ext/locale/webui-jsf-suntheme_pt_BR.jar
60.26 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_sv.jar=modules/ext/locale/webui-jsf-suntheme_sv.jar
60.27 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_zh_CN.jar=modules/ext/locale/webui-jsf-suntheme_zh_CN.jar
60.28 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_zh_HK.jar=modules/ext/locale/webui-jsf-suntheme_zh_HK.jar
60.29 -release.external/woodstock-defaulttheme-4.2.zip!/locale/webui-jsf-suntheme_zh_TW.jar=modules/ext/locale/webui-jsf-suntheme_zh_TW.jar
60.30 +extra.module.files=\
60.31 + modules/ext/webui-jsf-suntheme.jar,\
60.32 + modules/ext/locale/webui-jsf_de.jar,\
60.33 + modules/ext/locale/webui-jsf_es.jar,\
60.34 + modules/ext/locale/webui-jsf_fr.jar,\
60.35 + modules/ext/locale/webui-jsf_it.jar,\
60.36 + modules/ext/locale/webui-jsf_ja.jar,\
60.37 + modules/ext/locale/webui-jsf_ko.jar,\
60.38 + modules/ext/locale/webui-jsf_pt_BR.jar,\
60.39 + modules/ext/locale/webui-jsf_sv.jar,\
60.40 + modules/ext/locale/webui-jsf_zh_CN.jar,\
60.41 + modules/ext/locale/webui-jsf_zh_HK.jar,\
60.42 + modules/ext/locale/webui-jsf_zh_TW.jar,\
60.43 + modules/ext/locale/webui-jsf-suntheme_de.jar,\
60.44 + modules/ext/locale/webui-jsf-suntheme_es.jar,\
60.45 + modules/ext/locale/webui-jsf-suntheme_fr.jar,\
60.46 + modules/ext/locale/webui-jsf-suntheme_it.jar,\
60.47 + modules/ext/locale/webui-jsf-suntheme_ja.jar,\
60.48 + modules/ext/locale/webui-jsf-suntheme_ko.jar,\
60.49 + modules/ext/locale/webui-jsf-suntheme_pt_BR.jar,\
60.50 + modules/ext/locale/webui-jsf-suntheme_sv.jar,\
60.51 + modules/ext/locale/webui-jsf-suntheme_zh_CN.jar,\
60.52 + modules/ext/locale/webui-jsf-suntheme_zh_HK.jar,\
60.53 + modules/ext/locale/webui-jsf-suntheme_zh_TW.jar
61.1 --- a/visualweb.webui/build.xml Wed Mar 23 11:45:18 2011 -0400
61.2 +++ b/visualweb.webui/build.xml Wed Mar 23 14:24:30 2011 -0400
61.3 @@ -50,11 +50,13 @@
61.4 <description>Builds and tests the project org.netbeans.modules.visualweb.webui.</description>
61.5 <import file="nbproject/build-impl.xml"/>
61.6
61.7 - <target name="init" depends="projectized.init,library-init,javadoc-zip-init,src-zip-init"/>
61.8 + <target name="init" depends="harness.init,library-init,javadoc-zip-init,src-zip-init"/>
61.9
61.10 <!-- Build the J2SE project JAR on which this library wrapper module depends. -->
61.11 <target name="library-init">
61.12 - <ant dir="library" target="jar" inheritAll="false"/>
61.13 + <ant dir="library" target="jar" inheritAll="false">
61.14 + <property name="nbplatform.nb69.netbeans.dest.dir" value="${nbplatform.nb69.netbeans.dest.dir}"/>
61.15 + </ant>
61.16 </target>
61.17
61.18 <target name="src-zip-init">
62.1 --- a/visualweb.webui/library/build.xml Wed Mar 23 11:45:18 2011 -0400
62.2 +++ b/visualweb.webui/library/build.xml Wed Mar 23 14:24:30 2011 -0400
62.3 @@ -47,7 +47,6 @@
62.4 <project name="visualweb.webui/library" default="default" basedir=".">
62.5
62.6 <import file="nbproject/build-impl.xml"/>
62.7 - <import file="../../nbbuild/templates/projectized.xml"/>
62.8
62.9 <target name="-post-compile" depends="copy-metadata"/>
62.10
63.1 --- a/visualweb.webui/library/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
63.2 +++ b/visualweb.webui/library/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
63.3 @@ -63,22 +63,22 @@
63.4 dist.javadoc.dir=${dist.dir}/javadoc
63.5 dist.javadoc.zip=${dist.dir}/webui-doc.zip
63.6 excludes=
63.7 -file.reference.jhall-2.0_05.jar=../../javahelp/external/jhall-2.0_05.jar
63.8 +file.reference.jhall-2.0_05.jar=${nbplatform.nb69.netbeans.dest.dir}/platform/modules/ext/jh-2.0_05.jar
63.9 includes=**
63.10 src.zip=${dist.dir}/webui-src.zip
63.11 file.reference.commons-beanutils.jar=../../../ravelibs/commons-beanutils/release/modules/ext/commons-beanutils.jar
63.12 file.reference.commons-collections.jar=../../../ravelibs/commons-collections/release/modules/ext/commons-collections.jar
63.13 file.reference.commons-digester.jar=../../../ravelibs/commons-digester/release/modules/ext/commons-digester.jar
63.14 -file.reference.commons-fileupload.jar=../../libs.commons_fileupload/external/commons-fileupload-1.0.jar
63.15 -file.reference.dataprovider.jar=${visualweb.dataprovider.dir}/modules/ext/dataprovider.jar
63.16 +file.reference.commons-fileupload.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/commons-fileupload-1.0.jar
63.17 +file.reference.dataprovider.jar=../../visualweb.dataprovider/library/dist/dataprovider.jar
63.18
63.19 #file.reference.jsf-api.jar=../../../ravelibs/jsf-api/release/modules/ext/jsf-api.jar
63.20 #file.reference.jsf-ri.jar=../../../ravelibs/jsf-ri/release/modules/ext/jsf-impl.jar
63.21 #file.reference.jstl.jar=../../../ravebuild/netbeans/enterprise/modules/ext/jstl.jar
63.22
63.23 # Have JSF1.2 API, JSP & Servlet API
63.24 -file.reference.servlet3.0-jsp2.2-api.jar=../../servletjspapi/external/servlet3.0-jsp2.2-api.jar
63.25 -file.reference.jsf-api.jar=${web.jsf12.dir}/modules/ext/jsf-1_2/jsf-api.jar
63.26 +file.reference.servlet3.0-jsp2.2-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/servlet2.5-jsp2.1-api.jar
63.27 +file.reference.jsf-api.jar=${nbplatform.nb69.netbeans.dest.dir}/enterprise/modules/ext/jsf-1_2/jsf-api.jar
63.28
63.29 file.reference.jsf-metadata.jar=../../../ravelibs/jsf-metadata/library/dist/jsf-metadata.jar
63.30
64.1 --- a/visualweb.woodstock.pagetemplates/build.xml Wed Mar 23 11:45:18 2011 -0400
64.2 +++ b/visualweb.woodstock.pagetemplates/build.xml Wed Mar 23 14:24:30 2011 -0400
64.3 @@ -2,7 +2,7 @@
64.4 <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
64.5 <!-- for some information on what you could do (e.g. targets to override). -->
64.6 <!-- If you delete this file and reopen the project it will be recreated. -->
64.7 -<project name="contrib/visualweb.woodstock.pagetemplates" default="netbeans" basedir=".">
64.8 +<project name="visualweb.woodstock.pagetemplates" default="netbeans" basedir=".">
64.9 <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.woodstock.pagetemplates.</description>
64.10 <import file="nbproject/build-impl.xml"/>
64.11 </project>
65.1 --- a/visualweb.woodstock.webui.jsf/build.xml Wed Mar 23 11:45:18 2011 -0400
65.2 +++ b/visualweb.woodstock.webui.jsf/build.xml Wed Mar 23 14:24:30 2011 -0400
65.3 @@ -43,8 +43,19 @@
65.4 Version 2 license, then the option applies only if the new code is
65.5 made subject to such option by the copyright holder.
65.6 -->
65.7 -
65.8 <project name="visualweb.woodstock.webui.jsf" default="netbeans" basedir=".">
65.9 - <description>Builds, tests, and runs the project org.netbeans.modules.visualweb.woodstock.webui.jsf.</description>
65.10 <import file="nbproject/build-impl.xml"/>
65.11 + <target name="release" depends="projectized-common.release">
65.12 + <mkdir dir="${cluster}/modules/ext/locale"/>
65.13 + <unzip src="external/woodstock-components-4.2.zip" dest="${cluster}/modules/ext">
65.14 + <patternset includes="jsf-extensions-common-0.1.jar,jsf-extensions-dynamic-faces-0.1.jar,json-2.jar,webui-jsf-dt.jar,webui-jsf.jar"/>
65.15 + </unzip>
65.16 + <unzip src="external/woodstock-components-4.2.zip" dest="${cluster}/modules/ext/locale">
65.17 + <patternset includes="webui-jsf-dt_ja.jar,webui-jsf-dt_pt_BR.jar,webui-jsf-dt_zh_CN.jar"/>
65.18 + </unzip>
65.19 + <mkdir dir="${cluster}/docs"/>
65.20 + <unzip src="external/woodstock-components-4.2.zip" dest="${cluster}/docs">
65.21 + <patternset includes="webui-jsf-doc.zip,webui-jsf-src.zip,webui-jsf-tld.zip"/>
65.22 + </unzip>
65.23 + </target>
65.24 </project>
66.1 --- a/visualweb.woodstock.webui.jsf/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
66.2 +++ b/visualweb.woodstock.webui.jsf/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
66.3 @@ -51,17 +51,18 @@
66.4
66.5 is.autoload=true
66.6
66.7 -release.external/woodstock-components-4.2.zip!/jsf-extensions-common-0.1.jar=modules/ext/jsf-extensions-common-0.1.jar
66.8 -release.external/woodstock-components-4.2.zip!/jsf-extensions-dynamic-faces-0.1.jar=modules/ext/jsf-extensions-dynamic-faces-0.1.jar
66.9 -release.external/woodstock-components-4.2.zip!/json-2.jar=modules/ext/json-2.jar
66.10 -release.external/woodstock-components-4.2.zip!/webui-jsf-dt.jar=modules/ext/webui-jsf-dt.jar
66.11 -release.external/woodstock-components-4.2.zip!/webui-jsf-dt_ja.jar=modules/ext/locale/webui-jsf-dt_ja.jar
66.12 -release.external/woodstock-components-4.2.zip!/webui-jsf-dt_pt_BR.jar=modules/ext/locale/webui-jsf-dt_pt_BR.jar
66.13 -release.external/woodstock-components-4.2.zip!/webui-jsf-dt_zh_CN.jar=modules/ext/locale/webui-jsf-dt_zh_CN.jar
66.14 -release.external/woodstock-components-4.2.zip!/webui-jsf.jar=modules/ext/webui-jsf.jar
66.15 -release.external/woodstock-components-4.2.zip!/webui-jsf-doc.zip=docs/webui-jsf-doc.zip
66.16 -release.external/woodstock-components-4.2.zip!/webui-jsf-src.zip=docs/webui-jsf-src.zip
66.17 -release.external/woodstock-components-4.2.zip!/webui-jsf-tld.zip=docs/webui-jsf-tld.zip
66.18 +extra.module.files=\
66.19 + modules/ext/jsf-extensions-common-0.1.jar,\
66.20 + modules/ext/jsf-extensions-dynamic-faces-0.1.jar,\
66.21 + modules/ext/json-2.jar,\
66.22 + modules/ext/webui-jsf-dt.jar,\
66.23 + modules/ext/locale/webui-jsf-dt_ja.jar,\
66.24 + modules/ext/locale/webui-jsf-dt_pt_BR.jar,\
66.25 + modules/ext/locale/webui-jsf-dt_zh_CN.jar,\
66.26 + modules/ext/webui-jsf.jar,\
66.27 + docs/webui-jsf-doc.zip,\
66.28 + docs/webui-jsf-src.zip,\
66.29 + docs/webui-jsf-tld.zip
66.30
66.31
66.32 # Fatal error: class org.apache.commons.fileupload.DiskFileUpload not found
67.1 --- a/visualweb.woodstock.webui.jsf/nbproject/project.xml Wed Mar 23 11:45:18 2011 -0400
67.2 +++ b/visualweb.woodstock.webui.jsf/nbproject/project.xml Wed Mar 23 14:24:30 2011 -0400
67.3 @@ -230,7 +230,6 @@
67.4 <friend>org.netbeans.modules.visualweb.insync</friend>
67.5 <friend>org.netbeans.modules.visualweb.j2ee15classloaderprovider</friend>
67.6 <friend>org.netbeans.modules.visualweb.project.importpage</friend>
67.7 - <friend>org.netbeans.modules.visualweb.runtime.kit</friend>
67.8 <package>com.sun.webui.html</package>
67.9 <package>com.sun.webui.jsf.bean</package>
67.10 <package>com.sun.webui.jsf.component</package>
68.1 --- a/web.libraries.jsf1102/build.xml Wed Mar 23 11:45:18 2011 -0400
68.2 +++ b/web.libraries.jsf1102/build.xml Wed Mar 23 14:24:30 2011 -0400
68.3 @@ -45,4 +45,10 @@
68.4 -->
68.5 <project name="web.libraries.jsf1102" default="netbeans" basedir=".">
68.6 <import file="nbproject/build-impl.xml"/>
68.7 + <target name="release" depends="projectized-common.release">
68.8 + <mkdir dir="${cluster}/modules/ext"/>
68.9 + <unzip src="external/jsf-1.1.02.zip" dest="${cluster}/modules/ext">
68.10 + <mapper type="glob" from="jsf-1.1.02/*" to="jsf-1_1_02/*"/>
68.11 + </unzip>
68.12 + </target>
68.13 </project>
69.1 --- a/web.libraries.jsf1102/nbproject/project.properties Wed Mar 23 11:45:18 2011 -0400
69.2 +++ b/web.libraries.jsf1102/nbproject/project.properties Wed Mar 23 14:24:30 2011 -0400
69.3 @@ -40,13 +40,14 @@
69.4 # Version 2 license, then the option applies only if the new code is
69.5 # made subject to such option by the copyright holder.
69.6
69.7 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/commons-beanutils.jar=modules/ext/jsf-1_1_02/commons-beanutils.jar
69.8 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/commons-collections.jar=modules/ext/jsf-1_1_02/commons-collections.jar
69.9 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/commons-digester.jar=modules/ext/jsf-1_1_02/commons-digester.jar
69.10 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/commons-logging.jar=modules/ext/jsf-1_1_02/commons-logging.jar
69.11 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/jsf-api.jar=modules/ext/jsf-1_1_02/jsf-api.jar
69.12 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/jsf-impl.jar=modules/ext/jsf-1_1_02/jsf-impl.jar
69.13 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/LICENSE-APACHE.txt=modules/ext/jsf-1_1_02/LICENSE-APACHE.txt
69.14 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/LICENSE.txt=modules/ext/jsf-1_1_02/LICENSE.txt
69.15 -release.external/jsf-1.1.02.zip!/jsf-1.1.02/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-1_1_02/THIRDPARTYLICENSEREADME.txt
69.16 +extra.module.files=\
69.17 + modules/ext/jsf-1_1_02/commons-beanutils.jar,\
69.18 + modules/ext/jsf-1_1_02/commons-collections.jar,\
69.19 + modules/ext/jsf-1_1_02/commons-digester.jar,\
69.20 + modules/ext/jsf-1_1_02/commons-logging.jar,\
69.21 + modules/ext/jsf-1_1_02/jsf-api.jar,\
69.22 + modules/ext/jsf-1_1_02/jsf-impl.jar,\
69.23 + modules/ext/jsf-1_1_02/LICENSE-APACHE.txt,\
69.24 + modules/ext/jsf-1_1_02/LICENSE.txt,\
69.25 + modules/ext/jsf-1_1_02/THIRDPARTYLICENSEREADME.txt
69.26 spec.version.base=1.1.0