1.1 --- a/sierra/build.pro Tue Jan 12 17:24:35 2010 +0300
1.2 +++ b/sierra/build.pro Fri Jan 22 11:59:47 2010 -0500
1.3 @@ -111,5 +111,5 @@
1.4 <property name="jbi" location="${cache}/test/${test.cvs.path}"/>
1.5 <property name="bpel.samples" value="${home}/bpel.samples/resources"/>
1.6 <property name="xslt.samples" value="${home}/xslt.samples/resources"/>
1.7 - <property name="build.number" value="${home}/nbbuild/netbeans/platform11/build_number"/>
1.8 + <property name="build.number" value="${home}/nbbuild/netbeans/platform/build_number"/>
1.9 </project>
2.1 --- a/sierra/build.tst Tue Jan 12 17:24:35 2010 +0300
2.2 +++ b/sierra/build.tst Fri Jan 22 11:59:47 2010 -0500
2.3 @@ -59,11 +59,11 @@
2.4 <subant target="default" inheritAll="false">
2.5 <property name="complete.validation" value="false"/>
2.6 <property name="esb.netbeans.home" location="${home}/nbbuild/netbeans"/>
2.7 - <property name="ide.module.install.dir" location="${home}/nbbuild/netbeans/ide10/modules"/>
2.8 - <property name="soa.module.install.dir" location="${home}/nbbuild/netbeans/soa2/modules"/>
2.9 - <property name="xml.module.install.dir" location="${home}/nbbuild/netbeans/xml2/modules"/>
2.10 - <property name="java.module.install.dir" location="${home}/nbbuild/netbeans/java3/modules"/>
2.11 - <property name="enterprise.module.install.dir" location="${home}/nbbuild/netbeans/enterprise6/modules"/>
2.12 + <property name="ide.module.install.dir" location="${home}/nbbuild/netbeans/ide/modules"/>
2.13 + <property name="soa.module.install.dir" location="${home}/nbbuild/netbeans/soa/modules"/>
2.14 + <property name="xml.module.install.dir" location="${home}/nbbuild/netbeans/xml/modules"/>
2.15 + <property name="java.module.install.dir" location="${home}/nbbuild/netbeans/java/modules"/>
2.16 + <property name="enterprise.module.install.dir" location="${home}/nbbuild/netbeans/enterprise/modules"/>
2.17
2.18 <!-- BPEL sample 1 -->
2.19 <buildpath location="${bpel.samples}/Asynchronous/Asynchronous/build.xml"/>
2.20 @@ -83,11 +83,11 @@
2.21 <subant target="default" inheritAll="false">
2.22 <property name="complete.validation" value="false"/>
2.23 <property name="esb.netbeans.home" location="${home}/nbbuild/netbeans"/>
2.24 - <property name="ide.module.install.dir" location="${home}/nbbuild/netbeans/ide10/modules"/>
2.25 - <property name="soa.module.install.dir" location="${home}/nbbuild/netbeans/soa2/modules"/>
2.26 - <property name="xml.module.install.dir" location="${home}/nbbuild/netbeans/xml2/modules"/>
2.27 - <property name="java.module.install.dir" location="${home}/nbbuild/netbeans/java3/modules"/>
2.28 - <property name="enterprise.module.install.dir" location="${home}/nbbuild/netbeans/enterprise6/modules"/>
2.29 + <property name="ide.module.install.dir" location="${home}/nbbuild/netbeans/ide/modules"/>
2.30 + <property name="soa.module.install.dir" location="${home}/nbbuild/netbeans/soa/modules"/>
2.31 + <property name="xml.module.install.dir" location="${home}/nbbuild/netbeans/xml/modules"/>
2.32 + <property name="java.module.install.dir" location="${home}/nbbuild/netbeans/java/modules"/>
2.33 + <property name="enterprise.module.install.dir" location="${home}/nbbuild/netbeans/enterprise/modules"/>
2.34
2.35 <!-- BPEL sample 2 -->
2.36 <buildpath location="${bpel.samples}/BluePrint3/BluePrint3/build.xml"/>
2.37 @@ -103,11 +103,11 @@
2.38 <subant target="default" inheritAll="false">
2.39 <property name="complete.validation" value="false"/>
2.40 <property name="esb.netbeans.home" location="${home}/nbbuild/netbeans"/>
2.41 - <property name="ide.module.install.dir" location="${home}/nbbuild/netbeans/ide10/modules"/>
2.42 - <property name="soa.module.install.dir" location="${home}/nbbuild/netbeans/soa2/modules"/>
2.43 - <property name="xml.module.install.dir" location="${home}/nbbuild/netbeans/xml2/modules"/>
2.44 - <property name="java.module.install.dir" location="${home}/nbbuild/netbeans/java3/modules"/>
2.45 - <property name="enterprise.module.install.dir" location="${home}/nbbuild/netbeans/enterprise6/modules"/>
2.46 + <property name="ide.module.install.dir" location="${home}/nbbuild/netbeans/ide/modules"/>
2.47 + <property name="soa.module.install.dir" location="${home}/nbbuild/netbeans/soa/modules"/>
2.48 + <property name="xml.module.install.dir" location="${home}/nbbuild/netbeans/xml/modules"/>
2.49 + <property name="java.module.install.dir" location="${home}/nbbuild/netbeans/java/modules"/>
2.50 + <property name="enterprise.module.install.dir" location="${home}/nbbuild/netbeans/enterprise/modules"/>
2.51
2.52 <!-- XSLT sample -->
2.53 <buildpath location="${xslt.samples}/Welcome/Welcome/build.xml"/>
3.1 --- a/sierra/build.xml Tue Jan 12 17:24:35 2010 +0300
3.2 +++ b/sierra/build.xml Fri Jan 22 11:59:47 2010 -0500
3.3 @@ -99,16 +99,16 @@
3.4 <zip destfile="${cache}/latest/${sierra.build}_${env.BUILD_NUMBER}_${time.stamp}.zip">
3.5 <zipfileset dir="${home}/nbbuild">
3.6 <include name="netbeans/bin/**"/>
3.7 - <include name="netbeans/enterprise6/**"/>
3.8 + <include name="netbeans/enterprise/**"/>
3.9 <include name="netbeans/etc/**"/>
3.10 <include name="netbeans/harness/**"/>
3.11 - <include name="netbeans/ide12/**"/>
3.12 - <include name="netbeans/java3/**"/>
3.13 - <include name="netbeans/nb6.8/**"/>
3.14 - <include name="netbeans/platform11/**"/>
3.15 - <include name="netbeans/soa2/**"/>
3.16 - <include name="netbeans/websvccommon1/**"/>
3.17 - <include name="netbeans/xml2/**"/>
3.18 + <include name="netbeans/ide/**"/>
3.19 + <include name="netbeans/java/**"/>
3.20 + <include name="netbeans/nb/**"/>
3.21 + <include name="netbeans/platform/**"/>
3.22 + <include name="netbeans/soa/**"/>
3.23 + <include name="netbeans/websvccommon/**"/>
3.24 + <include name="netbeans/xml/**"/>
3.25 <exclude name="netbeans/**/.lastModified"/>
3.26 </zipfileset>
3.27 </zip>