July 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r23518 - in trunk: site and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-18 10:35:03 -0400 (Sun, 18 Jul 2010) New Revision: 23518 Modified: trunk/build/aggregate/site/site.xml trunk/site/pom.xml trunk/site/site.xml Log: reenable drools Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2010-07-18 14:34:23 UTC (rev 23517) +++ trunk/build/aggregate/site/site.xml 2010-07-18 14:35:03 UTC (rev 23518) @@ -103,7 +103,7 @@ <category name="GeneralTools" /> </feature> -  + </feature> <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" Modified: trunk/site/pom.xml =================================================================== --- trunk/site/pom.xml 2010-07-18 14:34:23 UTC (rev 23517) +++ trunk/site/pom.xml 2010-07-18 14:35:03 UTC (rev 23518) @@ -8,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>site</artifactId> + <artifactId>org.jboss.tools.site</artifactId> <name>org.jboss.tools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> Modified: trunk/site/site.xml =================================================================== --- trunk/site/site.xml 2010-07-18 14:34:23 UTC (rev 23517) +++ trunk/site/site.xml 2010-07-18 14:35:03 UTC (rev 23518) @@ -102,8 +102,7 @@ <category name="DataTools" /> <category name="GeneralTools" /> </feature> - -  - + </feature> <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0"

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23517 - branches/jbosstools-3.2.0.M1/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-18 10:34:23 -0400 (Sun, 18 Jul 2010) New Revision: 23517 Modified: branches/jbosstools-3.2.0.M1/site/pom.xml Log: rename pom (port from trunk) Modified: branches/jbosstools-3.2.0.M1/site/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/site/pom.xml 2010-07-18 14:33:36 UTC (rev 23516) +++ branches/jbosstools-3.2.0.M1/site/pom.xml 2010-07-18 14:34:23 UTC (rev 23517) @@ -8,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>site</artifactId> + <artifactId>org.jboss.tools.site</artifactId> <name>org.jboss.tools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging>

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23516 - branches/jbosstools-3.2.0.M1/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-18 10:33:36 -0400 (Sun, 18 Jul 2010) New Revision: 23516 Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml Log: re-enable drools Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml 2010-07-16 23:56:49 UTC (rev 23515) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml 2010-07-18 14:33:36 UTC (rev 23516) @@ -103,7 +103,7 @@ <category name="GeneralTools" /> </feature> -  + </feature> <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature"

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23515 - branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-16 19:56:49 -0400 (Fri, 16 Jul 2010) New Revision: 23515 Modified: branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java Log: https://jira.jboss.org/browse/JBIDE-6596 New Seam WAR project has incorrect deployment artifact structure isBinaryObject(moduleTree) updated since it is referenced from other plugins Modified: branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:56:13 UTC (rev 23514) +++ branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:56:49 UTC (rev 23515) @@ -194,15 +194,10 @@ // TODO This can also change to find the isBinaryModule method public static boolean isBinaryObject(IModule[] moduleTree) { - String name; - for( int i = 0; i < moduleTree.length; i++ ) { - name = moduleTree[i].getName(); - if( new Path(name).segmentCount() > 1 ) - // we strongly suspect this is a binary object and not a project - return true; - } - return false; + IJ2EEModule j2eeModule = (IJ2EEModule) moduleTree[moduleTree.length-1].loadAdapter(IJ2EEModule.class, null); + return j2eeModule != null && j2eeModule.isBinary(); } + public static IModuleResource[] getResources(IModule module) throws CoreException { ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23514 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-16 19:56:13 -0400 (Fri, 16 Jul 2010) New Revision: 23514 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java Log: https://jira.jboss.org/browse/JBIDE-6596 New Seam WAR project has incorrect deployment artifact structure isBinaryObject(moduleTree) updated since it is referenced from other plugins Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:38:36 UTC (rev 23513) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:56:13 UTC (rev 23514) @@ -194,14 +194,8 @@ // TODO This can also change to find the isBinaryModule method public static boolean isBinaryObject(IModule[] moduleTree) { - String name; - for( int i = 0; i < moduleTree.length; i++ ) { - name = moduleTree[i].getName(); - if( new Path(name).segmentCount() > 1 ) - // we strongly suspect this is a binary object and not a project - return true; - } - return false; + IJ2EEModule j2eeModule = (IJ2EEModule) moduleTree[moduleTree.length-1].loadAdapter(IJ2EEModule.class, null); + return j2eeModule != null && j2eeModule.isBinary(); } public static IModuleResource[] getResources(IModule module) throws CoreException {

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23513 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-16 19:38:36 -0400 (Fri, 16 Jul 2010) New Revision: 23513 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java Log: https://jira.jboss.org/browse/JBIDE-6596 New Seam WAR project has incorrect deployment artifact structure isBinaryObject(moduleTree) replaced to module.isBinary() Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-07-16 23:37:21 UTC (rev 23512) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-07-16 23:38:36 UTC (rev 23513) @@ -117,12 +117,12 @@ if( !(new Path(module.getName()).segmentCount() > 1 ) && delete) list.addAll(Arrays.asList(localSafeDelete(deployPath))); - if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree)) { + if( !deployPackaged(moduleTree) && !j2eeModule.isBinary()) { LocalCopyCallback handler = new LocalCopyCallback(server.getServer(), deployPath, tempDeployPath); PublishCopyUtil util = new PublishCopyUtil(handler); list.addAll(Arrays.asList(util.publishFull(members, monitor))); } - else if( isBinaryObject(moduleTree)) + else if(j2eeModule.isBinary()) list.addAll(Arrays.asList(copyBinaryModule(moduleTree))); else list.addAll(Arrays.asList(packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath))); @@ -152,12 +152,13 @@ IStatus[] results = new IStatus[] {}; IPath deployPath = getDeployPath(moduleTree, server); IPath tempDeployPath = getTempDeployFolder(moduleTree, server); + IJ2EEModule j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null); LocalCopyCallback handler = null; - if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree)) { + if( !deployPackaged(moduleTree) && !j2eeModule.isBinary()) { handler = new LocalCopyCallback(server.getServer(), deployPath, tempDeployPath); results = new PublishCopyUtil(handler).publishDelta(delta, monitor); } else if( delta.length > 0 ) { - if( isBinaryObject(moduleTree)) + if( j2eeModule.isBinary()) results = copyBinaryModule(moduleTree); else results = packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:37:21 UTC (rev 23512) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:38:36 UTC (rev 23513) @@ -129,9 +129,6 @@ String type, modName, name, uri, suffixedName; for( int i = 0; i < moduleTree.length; i++ ) { IJ2EEModule j2eeModule = (IJ2EEModule) moduleTree[i].loadAdapter(IJ2EEModule.class, null); - if (j2eeModule != null && j2eeModule.isBinary()) { - continue; - } type = moduleTree[i].getModuleType().getId(); modName = moduleTree[i].getName(); name = new Path(modName).lastSegment();

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23512 - branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-16 19:37:21 -0400 (Fri, 16 Jul 2010) New Revision: 23512 Modified: branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java Log: https://jira.jboss.org/browse/JBIDE-6596 New Seam WAR project has incorrect deployment artifact structure isBinaryObject(moduleTree) replaced to module.isBinary() Modified: branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-07-16 23:14:47 UTC (rev 23511) +++ branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-07-16 23:37:21 UTC (rev 23512) @@ -117,12 +117,12 @@ if( !(new Path(module.getName()).segmentCount() > 1 ) && delete) list.addAll(Arrays.asList(localSafeDelete(deployPath))); - if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree)) { + if( !deployPackaged(moduleTree) && !j2eeModule.isBinary()) { LocalCopyCallback handler = new LocalCopyCallback(server.getServer(), deployPath, tempDeployPath); PublishCopyUtil util = new PublishCopyUtil(handler); list.addAll(Arrays.asList(util.publishFull(members, monitor))); } - else if( isBinaryObject(moduleTree)) + else if(j2eeModule.isBinary()) list.addAll(Arrays.asList(copyBinaryModule(moduleTree))); else list.addAll(Arrays.asList(packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath))); @@ -152,12 +152,13 @@ IStatus[] results = new IStatus[] {}; IPath deployPath = getDeployPath(moduleTree, server); IPath tempDeployPath = getTempDeployFolder(moduleTree, server); + IJ2EEModule j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null); LocalCopyCallback handler = null; - if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree)) { + if( !deployPackaged(moduleTree) && !j2eeModule.isBinary()) { handler = new LocalCopyCallback(server.getServer(), deployPath, tempDeployPath); results = new PublishCopyUtil(handler).publishDelta(delta, monitor); } else if( delta.length > 0 ) { - if( isBinaryObject(moduleTree)) + if( j2eeModule.isBinary()) results = copyBinaryModule(moduleTree); else results = packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath); Modified: branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:14:47 UTC (rev 23511) +++ branches/jbosstools-3.2.0.M1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16 23:37:21 UTC (rev 23512) @@ -129,9 +129,6 @@ String type, modName, name, uri, suffixedName; for( int i = 0; i < moduleTree.length; i++ ) { IJ2EEModule j2eeModule = (IJ2EEModule) moduleTree[i].loadAdapter(IJ2EEModule.class, null); - if (j2eeModule != null && j2eeModule.isBinary()) { - continue; - } type = moduleTree[i].getModuleType().getId(); modName = moduleTree[i].getName(); name = new Path(modName).lastSegment();

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23511 - branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-16 19:14:47 -0400 (Fri, 16 Jul 2010) New Revision: 23511 Modified: branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml Log: upversion from 1.9.1.2 to 1.9.12.qualifier Modified: branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml =================================================================== --- branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2010-07-16 22:48:12 UTC (rev 23510) +++ branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2010-07-16 23:14:47 UTC (rev 23511) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.xulrunner.feature" label="%featureName" - version="1.9.1.2" + version="1.9.12.qualifier" provider-name="%providerName" plugin="org.jboss.tools.xulrunner"> Modified: branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-07-16 22:48:12 UTC (rev 23510) +++ branches/jbosstools-3.2.0.M1/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-07-16 23:14:47 UTC (rev 23511) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools.vpe.features</groupId> <artifactId>org.jboss.tools.xulrunner.feature</artifactId> - <version>1.9.1.2</version> + <version>1.9.12.qualifier</version> <packaging>eclipse-feature</packaging> </project>

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23510 - in branches/jbosstools-3.2.0.M1/build: aggregate/site and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-16 18:48:12 -0400 (Fri, 16 Jul 2010) New Revision: 23510 Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch branches/jbosstools-3.2.0.M1/build/aggregate/site/web/ branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/ branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml branches/jbosstools-3.2.0.M1/build/publish.sh Log: port changes from trunk Property changes on: branches/jbosstools-3.2.0.M1/build/aggregate/site ___________________________________________________________________ Name: svn:ignore + target Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties (rev 0) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/aggregateSite.jbosstools.properties 2010-07-16 22:48:12 UTC (rev 23510) @@ -0,0 +1,17 @@ +# options: Nightly Build (default), Development Milestone, Stable Release +#update.site.description=Nightly Build +#update.site.description=Development Milestone +#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21 + +# associate sites to add to the resulting repo +associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\ +http://download.eclipse.org/eclipse/updates/3.6/,\ +http://download.eclipse.org/birt/update-site/2.6/,\ +http://download.eclipse.org/tptp/updates/galileo/,\ +http://m2eclipse.sonatype.org/sites/m2e/,\ +http://m2eclipse.sonatype.org/sites/m2e-extras/,\ +http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\ +http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2,\ +http://subclipse.tigris.org/update_1.6.x/,\ +http://download.eclipse.org/technology/subversive/0.7/update-site/,\ +http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/ Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml (rev 0) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/build.xml 2010-07-16 22:48:12 UTC (rev 23510) @@ -0,0 +1,185 @@ +<project default="custom.build" name="jbosstools aggregate site build.xml"> + +  + +  + <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> + <available file="${WORKSPACE}/results" /> + </condition> + + <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}"> + <available file="/home/hudson/static_build_env/jbds" type="dir" /> + </condition> + <mkdir dir="${COMMON_TOOLS}" /> + + <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> + <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> + </condition> + <condition property="build.xml" value="${basedir}/../../build/build.xml"> + <available file="${basedir}/../../build/build.xml" type="file" /> + </condition> + <condition property="build.xml" value="${basedir}/../../build.xml"> + <available file="${basedir}/../../build.xml" type="file" /> + </condition> +  + + <property name="update.site.source.dir" value="${output.dir}/target/site" /> + +  + <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> + <property file="${aggregateSite.properties}" /> + + <target name="init"> + <ant antfile="${build.xml}" target="init" /> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" /> + </classpath> + </taskdef> + </target> + + <target name="add.associate.sites" if="associate.sites"> + <if> + <and> +  + <isset property="associate.sites" /> + <not> + <equals arg1="${associate.sites}" arg2="" /> + </not> + </and> + <then> + <if> + <available file="${update.site.source.dir}/content.jar" type="file" /> + <then> + <unzip src="${update.site.source.dir}/content.jar" dest="${update.site.source.dir}" /> + <delete file="${update.site.source.dir}/content.jar" /> + </then> + </if> +  + <var name="associate.sites.0" value="" /> + <for param="associate.site" list="${associate.sites}" delimiter=", + "> + <sequential> + <var name="associate.sites.0" value="${associate.sites.0}00" /> + </sequential> + </for> + <length property="associate.sites.length" string="${associate.sites.0}" /> + + <loadfile srcfile="${update.site.source.dir}/content.xml" property="content.xml"> + <filterchain> + <tailfilter lines="-1" skip="1" /> + </filterchain> + </loadfile> + <echo file="${update.site.source.dir}/content.xml" message="${content.xml}" /> + <echo file="${update.site.source.dir}/content.xml" append="true"> <references size='${associate.sites.length}'> +</echo> + <for param="associate.site" list="${associate.sites}" delimiter=", + "> + <sequential> +  + <echo file="${update.site.source.dir}/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> + <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> +</echo> + </sequential> + </for> + <echo file="${update.site.source.dir}/content.xml" append="true"> </references> +</repository> +</echo> + <zip destfile="${update.site.source.dir}/content.jar" + basedir="${update.site.source.dir}" + includes="content.xml" /> + <delete file="${update.site.source.dir}/content.xml" /> + </then> + </if> + </target> + + <target name="unpack.zip"> + <unzip src="${output.dir}/target/site_assembly.zip" dest="${update.site.source.dir}" /> + </target> + + <target name="pack.zip"> + <zip destfile="${output.dir}/target/site_assembly.zip" + update="true" + basedir="${update.site.source.dir}" + includes="content.* index.html, web/*.css" /> + </target> + + <target name="check.target"> + <if> + <or> + <not> + <available file="${output.dir}/target/site" type="dir" /> + </not> + <not> + <available file="${output.dir}/target/site_assembly.zip" type="file" /> + </not> + </or> + <then> + <fail> +-- +This script must ONLY be called via the pom.xml in this directory, not run directly. +Cannot adjust an update site w/o first building it! +-- +To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e` +</fail> + </then> + </if> + </target> + + <target name="add.web.content"> +  + <property name="update.site.description" value="Nightly Build" /> + <if> + <and> + <not> + <isset property="update.site.version" /> + </not> + <isset property="JOB_NAME" /> + <isset property="BUILD_ID" /> + <isset property="BUILD_NUMBER" /> + </and> + <then> + <propertyregex override="true" + property="update.site.version" + defaultvalue="${JOB_NAME}" + input="${JOB_NAME}" + regexp="jbosstools-([0-9.]+.*).aggregate" + replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <property name="update.site.version" value="" /> + </else> + </if> + + <copy todir="${output.dir}" overwrite="true"> + <fileset file="index-template.html" /> + <mapper type="merge" to="index.html" /> + <filterchain> + <expandproperties /> + </filterchain> + </copy> + + <copy todir="${update.site.source.dir}"> + <fileset dir="${output.dir}" includes="index.html, **/*.css" /> + </copy> + </target> + + <target name="custom.build" + description="aggregate update site extras" + depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> + +</project> Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html (rev 0) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/index-template.html 2010-07-16 22:48:12 UTC (rev 23510) @@ -0,0 +1,135 @@ +<html> +<head> +<title>JBoss Tools ${update.site.description} Update Site${update.site.version}</title> +<style> +@import url("web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>${update.site.description}</b> + Update Site for JBoss Tools. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html (rev 0) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/index.html 2010-07-16 22:48:12 UTC (rev 23510) @@ -0,0 +1,135 @@ +<html> +<head> +<title>JBoss Tools Nightly Build Update Site: 3.2.0.M1.2010-07-16_17-40-51-H69</title> +<style> +@import url("web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build: 3.2.0.M1.2010-07-16_17-40-51-H69</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>Nightly Build</b> + Update Site for JBoss Tools. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch (rev 0) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/jbosstools trunk aggregate site build.launch 2010-07-16 22:48:12 UTC (rev 23510) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.maven.ide.eclipse.Maven2LaunchConfigurationType"> +<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> +<stringAttribute key="M2_GOALS" value="clean install"/> +<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> +<booleanAttribute key="M2_OFFLINE" value="false"/> +<stringAttribute key="M2_PROFILES" value=""/> +<listAttribute key="M2_PROPERTIES"/> +<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> +<booleanAttribute key="M2_SKIP_TESTS" value="false"/> +<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> +<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/nboldt/workspace36/jbosstools-trunk/build/aggregate/site"/> +</launchConfiguration> Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml 2010-07-16 22:33:14 UTC (rev 23509) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/pom.xml 2010-07-16 22:48:12 UTC (rev 23510) @@ -9,14 +9,63 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>site</artifactId> + <artifactId>org.jboss.tools.site.aggregate</artifactId> + <name>org.jboss.tools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>install</id> + <phase>install</phase> + <configuration> + <quiet>true</quiet> + <tasks> +  + <ant antfile="build.xml" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-commons-net</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-apache-regexp</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b3</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + <repositories> <repository> <id>jbosstools-continuous-snapshot</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> + <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -24,7 +73,7 @@ </repository> <repository> <id>jbosstools-snapshot</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> + <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -38,7 +87,116 @@ <enabled>true</enabled> </snapshots> </repository> -  + <repository> + <id>jbosstools-teiid-designer-snapshot</id> + <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> </repositories> + + <profiles> + <profile> + <id>helios-no-target</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>webtools32</id> + <url>http://download.eclipse.org/webtools/repository/helios</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse36</id> + <url>http://download.eclipse.org/eclipse/updates/3.6/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>birt26</id> + <url>http://download.eclipse.org/birt/update-site/2.6/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>swtbot-helios</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </profile> + </profiles> </project> Modified: branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml 2010-07-16 22:33:14 UTC (rev 23509) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/site.xml 2010-07-16 22:48:12 UTC (rev 23510) @@ -102,7 +102,8 @@ <category name="DataTools" /> <category name="GeneralTools" /> </feature> - <feature url="features/org.drools.eclipse.feature_0.0.0.jar" id="org.drools.eclipse.feature" version="0.0.0"> + +  + <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0" @@ -294,6 +296,7 @@ <feature url="features/org.pi4soa.core.feature_0.0.0.jar" id="org.pi4soa.core.feature" version="0.0.0"> <category name="AllTools" /> </feature> +  + --> </site> Added: branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css =================================================================== --- branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css (rev 0) +++ branches/jbosstools-3.2.0.M1/build/aggregate/site/web/site.css 2010-07-16 22:48:12 UTC (rev 23510) @@ -0,0 +1,66 @@ +< +STYLE type ="text/css">td.spacer { + padding-bottom: 10px; + padding-top: 10px; +} + +.title { + font-family: sans-serif; + color: #1778be; +} + +.bodyText { + font-family: sans-serif; + font-size: 9pt; + color: #000000; +} + +.sub-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; +} + +.log-text { + font-family: sans-serif; + font-style: normal; + font-weight: lighter; + font-size: 8pt; + color: black; +} + +.big-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; + border-top: 10px solid white; +} + +.light-row { + background: #FFFFFF +} + +.dark-row { + background: #EEEEEE +} + +.header { + background: #445562 +} + +#indent { + word-wrap: break-word; + width: 300px; + text-indent: 10px; +} + +.link { + color: #187dc6; +} +</ +STYLE +> \ No newline at end of file Modified: branches/jbosstools-3.2.0.M1/build/publish.sh =================================================================== --- branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-16 22:33:14 UTC (rev 23509) +++ branches/jbosstools-3.2.0.M1/build/publish.sh 2010-07-16 22:48:12 UTC (rev 23510) @@ -20,7 +20,7 @@ # define suffix to use for additional update sites SUFFNAME="-Update-${ZIPSUFFIX}.zip" -if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/nightly/3.2.helios"; fi +if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools"; fi # cleanup from last time rm -fr ${WORKSPACE}/results; mkdir -p ${STAGINGDIR} @@ -48,11 +48,15 @@ METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt" if [[ ${SVN_REVISION} ]]; then METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt" + echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE} + else + echo -n "" > ${STAGINGDIR}/logs/${METAFILE} fi - echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE} echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE} echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE} echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE} + echo "WORKSPACE = ${WORKSPACE}" >> ${STAGINGDIR}/logs/${METAFILE} + echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE} # unzip into workspace for publishing as unpacked site mkdir -p ${STAGINGDIR}/all/repo @@ -97,7 +101,7 @@ # generate HTML snippet, download-snippet.txt, for inclusion on jboss.org if [[ ${RELEASE} == "Yes" ]]; then mkdir -p ${STAGINGDIR}/logs - ANT_PARAMS="-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs" + ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}" if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS} elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then @@ -131,15 +135,23 @@ # publish to download.jboss.org, unless errors found - avoid destroying last-good update site if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then -date # publish update site dir if [[ -d ${STAGINGDIR} ]]; then - rsync -arzq --delete ${STAGINGDIR} $DESTINATION/ + date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/ fi # publish update site zip if [[ -f ${WORKSPACE}/results/${SNAPNAME} ]]; then - rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/ + date; rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/ fi + + # extra publish step for aggregate update sites ONLY + if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then + if [[ $1 == "trunk" ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/ + else + date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOB_NAME/.aggregate}/ + fi + fi fi date

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23509 - in trunk/build/aggregate: site and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-16 18:33:14 -0400 (Fri, 16 Jul 2010) New Revision: 23509 Added: trunk/build/aggregate/site/index-template.html trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch Removed: trunk/build/aggregate/TODO.txt trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED trunk/build/aggregate/aggregateRepos.jbosstools.properties trunk/build/aggregate/aggregateRepos.m2eclipse.properties trunk/build/aggregate/aggregateRepos.xml Modified: trunk/build/aggregate/site/ trunk/build/aggregate/site/build.xml trunk/build/aggregate/site/index.html trunk/build/aggregate/site/pom.xml trunk/build/aggregate/site/web/site.css Log: enable generation of index.html from Hudson properties; delete old deprecated/broken aggregateRepos stuff (b3 aggregator); add .launch config for use w/ m2eclipse Deleted: trunk/build/aggregate/TODO.txt =================================================================== --- trunk/build/aggregate/TODO.txt 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/TODO.txt 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,2 +0,0 @@ -TODO: for b3 script to work, fix or work around "The copies of profile SDKProfile are not in sync" ---> https://bugs.eclipse.org/bugs/show_bug.cgi?id=317656 \ No newline at end of file Deleted: trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED =================================================================== --- trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.jbds.properties.UNUSED 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,61 +0,0 @@ -# aggregateRepos.xml properties file - -# basic config when used in JBT/JBDS build -eclipse.home=${clean.eclipse.home} -working.dir=${product.build.directory}/b3.aggregator - -# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip -#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse -#working.dir=/tmp/build.b3.aggregator -# optional config when testing on local -#requirement.build.root=${working.dir} -#update.site.product.name=JBoss Tools -#update.site.description=Nightly -#product.versionTag=3.1.0.v201002111546N-H238-CR2 - -# descriptions and labels used to name the resulting repo or to name categories -repoName=${update.site.product.name} ${update.site.description} Update Site -#product.versionTag=3.1.0.v200910281633N-RC1 - -# location from which to install b3 aggregator -b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip -b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip - -# repos to aggregate - local paths require jar:file:/path/to.zip!/ -# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive -#jar:file:${product.build.directory}/all/${updateZip}!/,\ -#jar:file:${working.dir}/JBossTools-Update-3.1.0.v201002111546N-H238-CR2.zip!/,\ -# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... -repos=\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\ - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\ -http://download.eclipse.org/eclipse/updates/3.6milestones/,\ -http://download.eclipse.org/eclipse/updates/3.6/,\ -http://download.eclipse.org/birt/update-site/2.6-interim/,\ -http://download.eclipse.org/birt/update-site/2.6/,\ -http://download.eclipse.org/tptp/updates/galileo/,\ -http://m2eclipse.sonatype.org/sites/m2e/,\ -http://m2eclipse.sonatype.org/sites/m2e-extras/ - -# category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category -categories=SDKTools2,AllTools2,SOATools2 -SDKTools2.features=org.jboss.tools.jbpm3.sdk.feature -#,org.jboss.tools.jmx.sdk.feature -AllTools2.features=org.jbpm.gd.jpdl.feature -#,org.jboss.tools.jmx.feature -SOATools2.features=org.jbpm.gd.jpdl.feature -#,org.jboss.tools.jmx.feature - -# for each repo zip input, list features to collect and assign to existing/new custom categories -jbpm3-Update-N-SNAPSHOT.zip.features=org.jbpm.gd.jpdl.feature,org.jboss.tools.jbpm3.sdk.feature -#JMX-Update-N-SNAPSHOT.zip.features=org.jboss.tools.jmx.feature,org.jboss.tools.jmx.sdk.feature - -# descriptions and labels for existing/new custom categories -custom.category.label.SDKTools2=JBoss Developer Studio SDK -custom.category.description.SDKTools2=JBoss Developer Studio SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Developer Studio plugins. -custom.category.label.AllTools2=All JBoss Developer Studio Tools - ${product.versionTag} -custom.category.description.AllTools2=Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. -custom.category.label.SOATools2=SOA Development -custom.category.description.SOATools2=Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. Deleted: trunk/build/aggregate/aggregateRepos.jbosstools.properties =================================================================== --- trunk/build/aggregate/aggregateRepos.jbosstools.properties 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.jbosstools.properties 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,67 +0,0 @@ -# aggregateRepos.xml properties file - -# basic config when used in JBT/JBDS aggregation build -# if eclipse.home not set, fetch + unpack Eclipse Helios Java bundle for 32- or 64-bit linux -#eclipse.home=${clean.eclipse.home} -working.dir=${WORKSPACE}/b3aggr - -# basic config when testing on local - be sure to replace reference to ${updateZip} with local JBT/JBDS update site zip -#eclipse.home=/home/nboldt/eclipse/36clean2/eclipse -#working.dir=/tmp/build.b3.aggregator -# optional config when testing on local -#requirement.build.root=${working.dir} -#update.site.product.name=JBoss Tools -#update.site.description=Nightly -#product.versionTag=3.1.0.v201002111546N-H238-CR2 - -# descriptions and labels used to name the resulting repo or to name categories -repoName=JBoss Tools Nightly Aggregate Update Site -#product.versionTag=${JOB_NAME}-H${BUILD_NUMBER} - -# location from which to install b3 aggregator -b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip -b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip - -# repos to aggregate - local paths require jar:file:/path/to.zip!/ -# repos to aggregate - remote paths to a zip will be prefetched and treated as local repo archive -# http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools... -repos=\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-3.2.0.M1-Update-SNAPSHOT.zip,\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-cbi-pi4soa-Update-SNAPSHOT.zip,\ -http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools-teiid-designer-Update-SNAPSHOT.zip - -# associate sites to add to the resulting repo -associate.sites=http://download.jboss.org/jbosstools/updates/helios/,\ -http://download.eclipse.org/eclipse/updates/3.6/,\ -http://download.eclipse.org/birt/update-site/2.6/,\ -http://download.eclipse.org/tptp/updates/galileo/,\ -http://m2eclipse.sonatype.org/sites/m2e/,\ -http://m2eclipse.sonatype.org/sites/m2e-extras/,\ -http://subclipse.tigris.org/update_1.6.x/,\ -http://download.eclipse.org/technology/subversive/0.7/update-site/,\ -http://community.polarion.com/projects/subversive/download/eclipse/2.0/update-site/,\ -http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/,\ -http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2 - -#http://download.eclipse.org/birt/update-site/2.6-interim/,\ -#http://download.eclipse.org/eclipse/updates/3.6milestones/,\ - -# category to feature mappings: need a list of unique categoryIDs, then the list of features to assign to each category -categories=AllTools2,DataTools2 -AllTools2.features=org.pi4soa.core.feature,\ -org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature -DataTools2.features=org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature - -# for each repo zip input, list features to collect and assign to existing/new custom categories -pi4soa-Update-N-SNAPSHOT.zip.features=org.pi4soa.core.feature,org.pi4soa.sdk.feature -jbosstools-teiid-designer-Update-SNAPSHOT.zip=org.teiid.datatools.connectivity.feature,org.teiid.designer.feature,org.teiid.designer.runtime.feature - -# descriptions and labels for existing/new custom categories -custom.category.label.SDKTools2=JBoss Tools SDK -custom.category.description.SDKTools2=JBoss Tools SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want to debug and/or provide patches to JBoss Tools plugins. -custom.category.label.AllTools2=All JBoss Tools - ${product.versionTag} -custom.category.description.AllTools2=Contains ALL the plugins that are available from JBoss Tools except those related to integration with 3rd party plugins. Selecting this category will give you all tools needed for both Web, Seam and SOA Development. -custom.category.label.SOATools2=SOA Development -custom.category.description.SOATools2=Tools to help create SOA applications. Use these if you work with jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. -custom.category.label.DataTools2=Data Services -custom.category.description.DataTools2=Tools related to data services such as persistence and transformation. Deleted: trunk/build/aggregate/aggregateRepos.m2eclipse.properties =================================================================== --- trunk/build/aggregate/aggregateRepos.m2eclipse.properties 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.m2eclipse.properties 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,24 +0,0 @@ -# aggregateRepos.xml properties file - -# basic configuration -eclipse.home=/home/nboldt/eclipse/36clean/eclipse -working.dir=/tmp/build.b3.aggregator - -# descriptions and labels used to name the resulting repo or to name categories -repoName=m2eclipse 0.10.0.20100209-0800 Updates -product.versionTag=0.10.0.20100209-0800 - -# location from which to install b3 aggregator -b3.aggregator.repo=http://download.jboss.org/jbosstools/requirements/helios/b3.aggregator-repo-0.1.0.r01001_e36.zip -b3.backup.repos=http://download.eclipse.org/eclipse/updates/3.6milestones/,http://download.eclipse.org/releases/helios/,http://download.jboss.org/jbosstools/requirements/helios/buckminster-repo-1.3.0.r11439_e36.zip - -# repos to aggregate - local paths require jar:file:/path/to.zip!/ -repos=\ -http://m2eclipse.sonatype.org/sites/m2e/,\ -http://m2eclipse.sonatype.org/sites/m2e-extras/ - -associate.sites=http://download.eclipse.org/releases/galileo/,\ -http://download.eclipse.org/eclipse/updates/3.5/,\ -http://subclipse.tigris.org/update_1.6.x - -categories= Deleted: trunk/build/aggregate/aggregateRepos.xml =================================================================== --- trunk/build/aggregate/aggregateRepos.xml 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/aggregateRepos.xml 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,704 +0,0 @@ -<project default="run" name="aggregateRepos"> - - <target name="get.ant-contrib" unless="ant-contrib.jar.exists"> - <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" /> - <get usetimestamp="true" - dest="${requirement.build.root}/ant-contrib-1.0b2-bin.zip" - src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" - /> - <touch file="${requirement.build.root}/ant-contrib-1.0b2-bin.zip" /> - <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" /> - <unzip src="${requirement.build.root}/ant-contrib-1.0b2-bin.zip" - dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" - overwrite="true" - /> - <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar" - tofile="${requirement.build.root}/ant-contrib.jar" - failonerror="true" - /> - <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" /> - </target> - -  - <target name="run" - depends="init,prefetch.repo.zips,install.b3.aggregator,generate.build.file,run.build.file,add.associate.sites,zip.repo,cleanup" - /> - - <target name="init"> -  - - <property name="WORKSPACE" value="${java.io.tmpdir}" /> - - <property name="aggregateRepos.properties" value="aggregateRepos.jbosstools.properties" /> - <property file="${aggregateRepos.properties}" /> - -  - <property name="working.dir" value="${WORKSPACE}/b3aggr" /> - <property name="requirement.build.root" value="${working.dir}" /> - -  - <mkdir dir="${working.dir}" /> - <mkdir dir="${requirement.build.root}" /> - -  - <available file="${requirement.build.root}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" /> - <antcall target="get.ant-contrib" /> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> - <pathelement location="${requirement.build.root}/ant-contrib.jar" /> - </classpath> - </taskdef> - -  - <if> - <not> - <isset property="eclipse.home" /> - </not> - <then> - <if> - <os family="unix" /> - <then> -  - <exec executable="bash" outputproperty="arch"> - <arg line="../util/getArch.sh" /> - </exec> - </then> - <else> - <condition property="arch" value="x86_64" else=""> - <os arch="amd64" /> - </condition> - </else> - </if> - <property name="eclipse.home" value="${WORKSPACE}/eclipse" /> - <delete dir="${eclipse.home}" includeemptydirs="true" quiet="true" /> - <echo>Fetch + unpack fresh Eclipse into eclipse.home = ${eclipse.home}</echo> - <if> - <equals arg1="${arch}" arg2="x86_64" /> - <then> - <get src="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." - dest="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz" - usetimestamp="true" - /> - <untar compression="gzip" - dest="${WORKSPACE}" - src="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz" - /> - </then> - <else> - <get src="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." - dest="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk.tar.gz" - usetimestamp="true" - /> - <untar compression="gzip" - dest="${WORKSPACE}" - src="${WORKSPACE}/eclipse-SDK-3.6-linux-gtk.tar.gz" - /> - </else> - </if> - </then> - <else> - <echo>Use pre-existing eclipse.home = ${eclipse.home}</echo> - </else> - </if> - </target> - -  - <target name="prefetch.repo.zips" description="prefetch repo zips and convert remote repo zips to local"> - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${repos}" /> - </antcallback> - <var name="repos" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - - <if> - <and> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${associate.sites}" /> - </antcallback> - <var name="associate.sites" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - </then> - </if> - </target> - - <target name="install.b3.aggregator" description="b3 Aggregator requires Eclipse 3.6"> -  - -  - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${b3.aggregator.repo}" /> - </antcallback> - <var name="b3.aggregator.repo" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - - <antcallback return="prefetchRepoZips.return" target="prefetchRepoZips"> - <param name="theList" value="${b3.backup.repos}" /> - </antcallback> - <var name="b3.backup.repos" value="${prefetchRepoZips.return}" /> - <var name="prefetchRepoZips.return" unset="true" /> - - <chmod perm="+x" file="${eclipse.home}/eclipse" /> - <exec executable="${eclipse.home}/eclipse" - failonerror="true" - dir="${eclipse.home}" - timeout="900000" - taskname="p2.dir" - > - <arg line=" -vm ${java.home}/bin/java" /> -  - <arg line=" -application org.eclipse.equinox.p2.director" /> - <arg line=" -nosplash --launcher.suppressErrors -consoleLog -flavor tooling -roaming -profile SDKProfile" /> - <arg line=" -installIU org.eclipse.b3.aggregator.engine.feature.feature.group" /> -  -  - <arg line=" -destination ${eclipse.home} -bundlepool ${eclipse.home}" /> - <arg line=" -metadataRepository ${b3.aggregator.repo},${b3.backup.repos}" /> - <arg line=" -artifactRepository ${b3.aggregator.repo},${b3.backup.repos}" /> - <arg line=" -profileProperties org.eclipse.update.install.features=true" /> - <arg line=" -vmargs -Declipse.p2.data.area=${eclipse.home}/p2 -Declipse.p2.MD5Check=false" /> - </exec> - </target> - - <target name="prefetchRepoZips" - description="Support remote update site zips: if repoURL contains http: or ftp: and .zip, get then switch it to a jar:file: URL" - > - <property name="theList" value="" /> - <property name="theTargetDir" value="${requirement.build.root}/p2repos" /> - <mkdir dir="${theTargetDir}" /> - <var name="prefetchRepoZips.return" value="${theList}" /> - <for param="repoURL" list="${theList}" delimiter=", - "> - <sequential> - <if> - <and> - <contains string="@{repoURL}" substring=".zip" /> - <or> - <contains string="@{repoURL}" substring="http://" /> - <contains string="@{repoURL}" substring="https://" /> - <contains string="@{repoURL}" substring="ftp://" /> - <contains string="@{repoURL}" substring="file://" /> - </or> - </and> - - <then> - <var name="repoFile" unset="true" /> - <propertyregex property="repoFile" - input="@{repoURL}" - defaultvalue="@{repoURL}" - regexp=".+/([^/]+.zip)" - replace="\1" - casesensitive="false" - override="true" - /> - <propertyregex property="prefetchRepoZips.return" - input="${prefetchRepoZips.return}" - defaultvalue="${prefetchRepoZips.return}" - regexp="@{repoURL}" - replace="jar:file:${theTargetDir}/${repoFile}!/" - casesensitive="false" - override="true" - /> - <get dest="${theTargetDir}/${repoFile}" src="@{repoURL}" usetimestamp="true" /> - <var name="repoFile" unset="true" /> -  - </then> - </if> - </sequential> - </for> - </target> - - <target name="generate.build.file"> - <property name="repoName" value="JBoss Tools Aggregate Update Site" /> - <property name="platform.names" value="linux-gtk,linux-gtk-x86_64,win32,macosx-carbon,macosx-cocoa" /> -  -  - <echo file="${working.dir}/repo.b3aggr"><?xml version="1.0" encoding="UTF-8"?> -<aggregator:Aggregator xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:aggregator="http://www.eclipse.org/b3/2010/aggregator/1.0.0" - buildmaster="//@contacts[email='nickboldt(a)gmail.com']" - label="${repoName}" buildRoot="${working.dir}/output" - packedStrategy="COPY" type="N" mavenResult="false"> - <contacts name="Nick Boldt" email="nickboldt(a)gmail.com"/> -</echo> - <for param="platform" list="${platform.names}" delimiter=","> - <sequential> - <if> - <equals arg1="@{platform}" arg2="linux-gtk" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="linux" windowSystem="gtk"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="win32" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="win32" windowSystem="win32"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="linux-gtk-x86_64" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="linux" windowSystem="gtk" architecture="x86_64"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="macosx-carbon" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="macosx" windowSystem="carbon" architecture="x86"/> -</echo> - </then> - </if> - <if> - <equals arg1="@{platform}" arg2="macosx-cocoa" /> - <then> - <echo file="${working.dir}/repo.b3aggr" append="true"> <configurations operatingSystem="macosx" windowSystem="cocoa" architecture="x86"/> -</echo> - </then> - </if> - </sequential> - </for> - -  - <var name="unique.installableUnits" value="" /> - - <echo file="${working.dir}/repo.b3aggr" append="true"> - <contributions label="repos" contacts="//@contacts[email='nickboldt(a)gmail.com']"></echo> -  - <var name="repoID.string" value="" /> - <var name="repoID" value="0" /> - <for param="repo" list="${repos}" delimiter=", - "> - <sequential> -  - <var name="repoFile" unset="true" /> - <var name="repoFilename" unset="true" /> - <propertyregex property="repoFile" - input="@{repo}" - defaultvalue="@{repo}" - override="true" - regexp="jar:file:(.+)!/" - replace="\1" - /> - <propertyregex property="repoFilename" - input="${repoFile}" - defaultvalue="${repoFile}" - override="true" - regexp=".+/([^/]+.zip)" - replace="\1" - /> - <echo file="${working.dir}/repo.b3aggr" append="true"> - <repositories location="@{repo}"> -</echo> -  - <if> - <and> - <isset property="${repoFilename}.features" /> - <isset property="categories" /> - </and> - <then> -  - <propertycopy from="${repoFilename}.features" - property="repo.features" - override="true" - silent="true" - /> - <var name="featureID.num" value="0" /> - <for param="repo.feature" list="${repo.features}" delimiter=", "> - <sequential> -  -  - <for param="categoryID" list="${categories}" delimiter=", "> - <sequential> - <if> - <not> - <isset property="custom.category.features.@{categoryID}" /> - </not> - <then> - <var name="custom.category.features.@{categoryID}" value="" /> - </then> - </if> - - <if> - <and> -  - <isset property="@{categoryID}.features" /> - <contains string="${(a){categoryID}.features}" - substring="@{repo.feature}" - /> - </and> - <then> - <antcallback target="getIndex" return="getIndex.return"> - <param name="entry" value="@{repo.feature}" /> - <param name="list" value="${repo.features}" /> - </antcallback> - <var name="featureID.num" value="${getIndex.return}" /> - <var name="getIndex.return" unset="true" /> - -  - <antcallback target="addFeatureToCategories" - return="addFeatureToCategories.return, unique.installableUnits" - > - <param name="repoID" value="${repoID}" /> - <param name="featureID.num" value="${featureID.num}" /> - <param name="include" - value="features/(a){repo.feature}_*, **/features/(a){repo.feature}_*" - /> - <param name="repoFile" value="${repoFile}" /> - <param name="categories" value="${categories}" /> - </antcallback> - <var name="custom.category.features.@{categoryID}" - value="${custom.category.features.(a){categoryID}}${addFeatureToCategories.return}" - /> - </then> - </if> - </sequential> - </for> - </sequential> - </for> - </then> - </if> - <echo file="${working.dir}/repo.b3aggr" append="true"> </repositories> -</echo> - <var name="repoID.string" value="${repoID.string}R" /> - <var name="repoID" unset="true" /> - <length property="repoID" string="${repoID.string}" /> -  - </sequential> - </for> - - <echo file="${working.dir}/repo.b3aggr" append="true"> </contributions> - -</echo> -  - <for param="custom.category.id" list="${categories}" delimiter=", - "> - <sequential> -  - <propertyregex property="custom.category.features.(a){custom.category.id}" - defaultvalue="${custom.category.features.(a){custom.category.id}}" - input="${custom.category.features.(a){custom.category.id}}" - regexp=" (.+)" - replace="\1" - override="true" - /> - - <echo file="${working.dir}/repo.b3aggr" append="true"> <customCategories - identifier="@{custom.category.id}" - label="${custom.category.label.(a){custom.category.id}}" - description="${custom.category.description.(a){custom.category.id}}" - features="${custom.category.features.(a){custom.category.id}}" /> -</echo> - </sequential> - </for> - - <if> - <and> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <echo file="${working.dir}/repo.b3aggr" append="true"> - <validationRepositories location="@{associate.site}" /> -</echo> - </sequential> - </for> - </then> - </if> - - <echo file="${working.dir}/repo.b3aggr" append="true"></aggregator:Aggregator> -</echo> - </target> - - <target name="addFeatureToCategories"> - <var name="addFeatureToCategories.return" value="" /> - <property name="repoID" value="9" /> - <property name="include" value="features/org.pi4soa.core.feature_*, **/features/org.pi4soa.core.feature_*" /> - <property name="repoFile" value="${working.dir}/pi4soa-Update-N-SNAPSHOT.zip" /> - <property name="categories" value="SDKTools2,SOATools2,AllTools2" /> - <propertyregex property="repoFilename" - input="${repoFile}" - defaultvalue="${repoFile}" - regexp=".+/([^/]+.zip)" - replace="\1" - casesensitive="false" - override="true" - /> - - <if> - <and> -  - <not> - <available file="${repoFile}_" type="dir" /> - </not> - </and> - <then> - <if> - <available file="${repoFile}" type="file" /> - <then> - <unzip src="${repoFile}" dest="${repoFile}_" /> - </then> - <else> - <fail>Error! - Cannot find ${repoFile} to unpack! - </fail> - </else> - </if> - </then> - </if> - - <property name="featureID.num" value="0" /> - <for param="entry" delimiter=", - "> - <fileset dir="${repoFile}_" includes="${include}" /> - <sequential> -  - <var name="featureID" unset="true" /> - <var name="featureVersion" unset="true" /> - <propertyregex property="featureID" - input="@{entry}" - defaultvalue="@{entry}" - regexp=".+/([^/_]+)_.+" - replace="\1" - /> - <propertyregex property="featureVersion" - input="@{entry}" - defaultvalue="@{entry}" - regexp=".+/${featureID}_(.+).jar" - replace="\1" - /> - -  - <var name="featureID.categories" value="" /> - <for param="category" list="${categories}" delimiter=", "> - <sequential> - <if> - <isset property="@{category}.features" /> - <then> - <for param="featureID" list="${(a){category}.features}" delimiter=", -"> - <sequential> - <if> - <equals arg1="${featureID}" arg2="@{featureID}" /> - <then> -  - <var name="featureID.categories" - value="${featureID.categories} //@customCategories[identifier='@{category}']" - /> - </then> - </if> - </sequential> - </for> - </then> - </if> - </sequential> - </for> -  - <propertyregex property="featureID.categories" - defaultvalue="${featureID.categories}" - input="${featureID.categories}" - regexp=" (.+)" - replace="\1" - override="true" - /> - - <var name="isNewInstallableUnit" value="true" /> - <for param="installableUnit" list="${unique.installableUnits}" delimiter=", "> - <sequential> - <if> - <equals arg1="@{installableUnit}" arg2="${featureID}_${featureVersion}" /> - <then> - <var name="isNewInstallableUnit" value="false" /> - </then> - </if> - </sequential> - </for> - <if> -  - <istrue value="${isNewInstallableUnit}" /> - <then> - <var name="unique.installableUnits" - value="${unique.installableUnits}, ${featureID}_${featureVersion}" - /> - <echo file="${working.dir}/repo.b3aggr" append="true"> <features categories="${featureID.categories}" name="${featureID}.feature.group" versionRange="${featureVersion}" /> -</echo> - <echo level="info">${featureID}_${featureVersion}: add @repositories.${repoID}/(a)features.${featureID.num} to ${featureID.categories}</echo> - </then> - <else> - <echo level="info">${featureID}_${featureVersion} already added.</echo> - </else> - </if> - <var name="addFeatureToCategories.return" - value="${addFeatureToCategories.return} //@contributions[label='repos']/@repositories.${repoID}/(a)features.${featureID.num}" - /> - - </sequential> - </for> - <var name="featureID.categories" unset="true" /> - <var name="isNewInstallableUnit" unset="true" /> - </target> - - <target name="run.build.file"> - <chmod perm="+x" file="${eclipse.home}/eclipse" /> - <exec executable="${eclipse.home}/eclipse" - failonerror="true" - dir="${eclipse.home}" - timeout="900000" - taskname="b3aggr" - > - <arg line=" -vm ${java.home}/bin/java" /> - <arg line=" -application org.eclipse.b3.cli.headless" /> - <arg line=" -nosplash --launcher.suppressErrors -consoleLog aggregate" /> - <arg line=" --buildModel ${working.dir}/repo.b3aggr --action BUILD" /> -  - </exec> - </target> - -  - <target name="add.associate.sites"> - <if> - <and> - <isset property="associate.sites" /> - <not> - <equals arg1="${associate.sites}" arg2="" /> - </not> - </and> - <then> - <if> - <available file="${working.dir}/output/final/content.jar" type="file" /> - <then> - <unzip src="${working.dir}/output/final/content.jar" dest="${working.dir}/output/final" /> - <delete file="${working.dir}/output/final/content.jar" /> - </then> - </if> -  - <var name="associate.sites.0" value="" /> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> - <var name="associate.sites.0" value="${associate.sites.0}00" /> - </sequential> - </for> - <length property="associate.sites.length" string="${associate.sites.0}" /> - - <loadfile srcfile="${working.dir}/output/final/content.xml" property="content.xml"> - <filterchain> - <tailfilter lines="-1" skip="1" /> - </filterchain> - </loadfile> - <echo file="${working.dir}/output/final/content.xml" message="${content.xml}" /> - <echo file="${working.dir}/output/final/content.xml" append="true"> <references size='${associate.sites.length}'> -</echo> - <for param="associate.site" list="${associate.sites}" delimiter=", - "> - <sequential> -  - <echo file="${working.dir}/output/final/content.xml" append="true"> <repository uri='@{associate.site}' url='@{associate.site}' type='0' options='1'/> - <repository uri='@{associate.site}' url='@{associate.site}' type='1' options='1'/> -</echo> - </sequential> - </for> - <echo file="${working.dir}/output/final/content.xml" append="true"> </references> -</repository> -</echo> - <zip destfile="${working.dir}/output/final/content.jar" - basedir="${working.dir}/output/final" - includes="content.xml" - /> - <delete file="${working.dir}/output/final/content.xml" /> - </then> - </if> - </target> - -  - <target name="zip.repo"> - <zip destfile="${working.dir}/aggregate-Update-SNAPSHOT.zip" - basedir="${working.dir}/output/final" - update="false" - /> - </target> - - <target name="cleanup"> - <delete quiet="true" dir="${working.dir}/output" includeemptydirs="true" /> -  - <for param="theZip" list="${repos}" delimiter=", - "> - <sequential> - <var name="zipFile" unset="true" /> - <propertyregex property="zipFile" - input="@{theZip}" - defaultvalue="@{theZip}" - regexp=".+/([^/]+.zip).*" - replace="\1" - casesensitive="false" - override="true" - /> - <if> - <available file="${working.dir}/${zipFile}_" type="dir" /> - <then> - <delete dir="${working.dir}/${zipFile}_" quiet="true" includeemptydirs="true" /> - </then> - </if> - </sequential> - </for> - </target> - - <target name="getIndex"> - <property name="getIndex.string" value="" /> - <var name="getIndex.return" value="0" /> - <property name="entry" value="" /> - <property name="list" value="" /> - <for param="this.entry" list="${list}" delimiter=", "> - <sequential> - <if> - <not> - <equals arg1="@{this.entry}" arg2="${entry}" /> - </not> - <then> - <var name="getIndex.string" value="${getIndex.string}L" /> - </then> - <else> - <var name="getIndex.return" unset="true" /> - <length property="getIndex.return" string="${getIndex.string}" /> - </else> - </if> - - </sequential> - </for> -  - </target> - -</project> Property changes on: trunk/build/aggregate/site ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/build.xml 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,11 +1,11 @@ <project default="custom.build" name="jbosstools aggregate site build.xml"> -  - <property name="ZIPSUFFIX" value="SNAPSHOT" /> +  -  -  -  <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}"> <available file="${WORKSPACE}/results" /> @@ -29,6 +29,10 @@ <property name="update.site.source.dir" value="${output.dir}/target/site" /> +  + <property name="aggregateSite.properties" value="aggregateSite.jbosstools.properties" /> + <property file="${aggregateSite.properties}" /> + <target name="init"> <ant antfile="${build.xml}" target="init" /> <taskdef resource="net/sf/antcontrib/antlib.xml"> @@ -38,22 +42,10 @@ </taskdef> </target> - <target name="add.associate.sites"> + <target name="add.associate.sites" if="associate.sites"> <if> <and> - <not> - <isset property="associate.sites" /> - </not> - </and> - <then> -  - <property name="associate.sites.properties" value="associate.sites.jbosstools.properties" /> - <property file="${associate.sites.properties}" /> - </then> - </if> - - <if> - <and> +  <isset property="associate.sites" /> <not> <equals arg1="${associate.sites}" arg2="" /> @@ -97,7 +89,9 @@ <echo file="${update.site.source.dir}/content.xml" append="true"> </references> </repository> </echo> - <zip destfile="${update.site.source.dir}/content.jar" basedir="${update.site.source.dir}" includes="content.xml" /> + <zip destfile="${update.site.source.dir}/content.jar" + basedir="${update.site.source.dir}" + includes="content.xml" /> <delete file="${update.site.source.dir}/content.xml" /> </then> </if> @@ -108,17 +102,84 @@ </target> <target name="pack.zip"> - <zip destfile="${output.dir}/target/site_assembly.zip" update="true" basedir="${update.site.source.dir}" includes="content.* index.html, web/*.css" /> + <zip destfile="${output.dir}/target/site_assembly.zip" + update="true" + basedir="${update.site.source.dir}" + includes="content.* index.html, web/*.css" /> </target> + <target name="check.target"> + <if> + <or> + <not> + <available file="${output.dir}/target/site" type="dir" /> + </not> + <not> + <available file="${output.dir}/target/site_assembly.zip" type="file" /> + </not> + </or> + <then> + <fail> +-- +This script must ONLY be called via the pom.xml in this directory, not run directly. +Cannot adjust an update site w/o first building it! +-- +To run this build, use Tycho. Try `mvn3 clean install -U -B -fae -q -e` +</fail> + </then> + </if> + </target> + <target name="add.web.content"> -  +  + <property name="update.site.description" value="Nightly Build" /> + <if> + <and> + <not> + <isset property="update.site.version" /> + </not> + <isset property="JOB_NAME" /> + <isset property="BUILD_ID" /> + <isset property="BUILD_NUMBER" /> + </and> + <then> + <propertyregex override="true" + property="update.site.version" + defaultvalue="${JOB_NAME}" + input="${JOB_NAME}" + regexp="jbosstools-([0-9.]+.*).aggregate" + replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <property name="update.site.version" value="" /> + </else> + </if> + + <copy todir="${output.dir}" overwrite="true"> + <fileset file="index-template.html" /> + <mapper type="merge" to="index.html" /> + <filterchain> + <expandproperties /> + </filterchain> + </copy> + <copy todir="${update.site.source.dir}"> <fileset dir="${output.dir}" includes="index.html, **/*.css" /> </copy> </target> -  - <target name="custom.build" description="aggregate update site extras" depends="init,add.associate.sites,add.web.content,pack.zip" /> + <target name="custom.build" + description="aggregate update site extras" + depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> </project> Copied: trunk/build/aggregate/site/index-template.html (from rev 23507, trunk/build/aggregate/site/index.html) =================================================================== --- trunk/build/aggregate/site/index-template.html (rev 0) +++ trunk/build/aggregate/site/index-template.html 2010-07-16 22:33:14 UTC (rev 23509) @@ -0,0 +1,135 @@ +<html> +<head> +<title>JBoss Tools ${update.site.description} Update Site${update.site.version}</title> +<style> +@import url("web/site.css"); +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>${update.site.description}</b> + Update Site for JBoss Tools. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Property changes on: trunk/build/aggregate/site/index-template.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/aggregate/site/index.html =================================================================== --- trunk/build/aggregate/site/index.html 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/index.html 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,136 +1,135 @@ -<html> -<head> -<title>JBoss Tools ${update.site.description} Update Site: ${product.versionTag}</title> +<html> +<head> +<title>JBoss Tools Nightly Build Update Site: 3.2.0.M1.2010-07-16_17-40-51-H69</title> <style> @import url("web/site.css"); -</style> -</head> -<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> -<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0"> - <tr> - <td colspan="2"><img - src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> - </tr> - <tr> - <td>  </td> - </tr> - <tr> - <td>  </td> - <td> - <h2 class="title">JBoss Tools ${update.site.description} Update Site</h2> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build: - ${product.versionTag}</span></td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">This is the <b>${update.site.description}</b> - Update Site for JBoss Tools. See <a class="link" - href="http://www.jboss.org/tools/download/update">Installation - Instructions</a>.</p> - </td> - </tr> - - <tr class="dark-row" style="height: 90px"> - <td class="bodyText"> - <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some - features (such as BIRT and Maven) require additional third-party - prerequisites not available from Eclipse.org or JBoss.org. These can - be installed from the following update sites, which may already be - listed - but not enabled - in your Eclipse's list of Available - Software Sites:</p> - <ul> - <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> - <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> - <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li> - </ul> - </td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">You can also download JBoss Tools as - individual zips for offline installation. See <a class="link" - href="http://www.jboss.org/tools/download">JBoss Tools - Downloads</a>.</p> - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">For more information, see <a - href="http://www.jboss.org/tools/download/installation">Installation - methods</a>.</p> - </td> - </tr> - <tr> - <td class="spacer"><br /> - </td> - <td class="spacer"><br /> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td></td> - <td> - <table width="100%"> - <tr class="header"> - <td class="sub-header" width="100%"><span> Installation - Types</span></td> - </tr> - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">Depending on how close to the bleeding edge - you like to be, there are several types of releases available.</p> - <br /> - - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <h4>Stable Releases</h4> - - <p><a href="https://www.jboss.org/tools/download/stable.html">Stable - releases</a> are - as indicated by their name - stable.</p><br/> - - </td> - </tr> - - <tr class="light-row" style="height: 30px"> - <td class="bodyText"> - <h4>Development Milestones</h4> - - <p><a href="https://www.jboss.org/tools/download/dev.html">Development - builds</a>, released once per milestone and only a few times a year, are - fairly stable, but there may be some things which do not yet work. - If you would like to try one of these milestones, we'd greatly - appreciate the assistance in testing and <a - href="https://jira.jboss.org/jira/browse/JBIDE">reporting of - issues in our issue tracker</a>.</p><br/> - - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <h4>Nightly Builds</h4> - - <p>The <a - href="https://www.jboss.org/tools/download/nightly.html">bleeding - edge</a> contains the latest and greatest new features, but nothing is - stable or guaranteed - yet. If you're using a Milestone and need a - fix, you can update to the latest Nightly, or wait for the next - Milestone.</p><br/> - </td> - </tr> - </table> - </td> - </tr> -</table> -</html> +</style> +</head> +<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" + cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2"><img + src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> + </tr> + <tr> + <td>  </td> + </tr> + <tr> + <td>  </td> + <td> + <h2 class="title">JBoss Tools Nightly Build Update Site</h2> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span>Latest Build: 3.2.0.M1.2010-07-16_17-40-51-H69</span></td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">This is the <b>Nightly Build</b> + Update Site for JBoss Tools. See <a class="link" + href="http://www.jboss.org/tools/download/update">Installation + Instructions</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 90px"> + <td class="bodyText"> + <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b> Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:</p> + <ul> + <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li> + <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li> + </ul> + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">You can also download JBoss Tools as + individual zips for offline installation. See <a class="link" + href="http://www.jboss.org/tools/download">JBoss Tools + Downloads</a>.</p> + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">For more information, see <a + href="http://www.jboss.org/tools/download/installation">Installation + methods</a>.</p> + </td> + </tr> + <tr> + <td class="spacer"><br /> + </td> + <td class="spacer"><br /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td></td> + <td> + <table width="100%"> + <tr class="header"> + <td class="sub-header" width="100%"><span> Installation + Types</span></td> + </tr> + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <p class="bodyText">Depending on how close to the bleeding edge + you like to be, there are several types of releases available.</p> + <br /> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Stable Releases</h4> + + <p><a href="https://www.jboss.org/tools/download/stable.html">Stable + releases</a> are - as indicated by their name - stable.</p><br/> + + </td> + </tr> + + <tr class="light-row" style="height: 30px"> + <td class="bodyText"> + <h4>Development Milestones</h4> + + <p><a href="https://www.jboss.org/tools/download/dev.html">Development + builds</a>, released once per milestone and only a few times a year, are + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and <a + href="https://jira.jboss.org/jira/browse/JBIDE">reporting of + issues in our issue tracker</a>.</p><br/> + + </td> + </tr> + + <tr class="dark-row" style="height: 30px"> + <td class="bodyText"> + <h4>Nightly Builds</h4> + + <p>The <a + href="https://www.jboss.org/tools/download/nightly.html">bleeding + edge</a> contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.</p><br/> + </td> + </tr> + </table> + </td> + </tr> +</table> +</html> Added: trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch =================================================================== --- trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch (rev 0) +++ trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch 2010-07-16 22:33:14 UTC (rev 23509) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.maven.ide.eclipse.Maven2LaunchConfigurationType"> +<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> +<stringAttribute key="M2_GOALS" value="clean install"/> +<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> +<booleanAttribute key="M2_OFFLINE" value="false"/> +<stringAttribute key="M2_PROFILES" value=""/> +<listAttribute key="M2_PROPERTIES"/> +<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> +<booleanAttribute key="M2_SKIP_TESTS" value="false"/> +<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> +<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/nboldt/workspace36/jbosstools-trunk/build/aggregate/site"/> +</launchConfiguration> Property changes on: trunk/build/aggregate/site/jbosstools trunk aggregate site build.launch ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/pom.xml 2010-07-16 22:33:14 UTC (rev 23509) @@ -9,7 +9,8 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>site</artifactId> + <artifactId>org.jboss.tools.site.aggregate</artifactId> + <name>org.jboss.tools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> @@ -21,10 +22,12 @@ <version>1.3</version> <executions> <execution> - <id>clean</id> - <phase>clean</phase> + <id>install</id> + <phase>install</phase> <configuration> + <quiet>true</quiet> <tasks> +  <ant antfile="build.xml" /> </tasks> </configuration> @@ -84,7 +87,116 @@ <enabled>true</enabled> </snapshots> </repository> -  + <repository> + <id>jbosstools-teiid-designer-snapshot</id> + <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> </repositories> + + <profiles> + <profile> + <id>helios-no-target</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>helios</id> + <url>http://download.eclipse.org/releases/helios/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>webtools32</id> + <url>http://download.eclipse.org/webtools/repository/helios</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>eclipse36</id> + <url>http://download.eclipse.org/eclipse/updates/3.6/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>birt26</id> + <url>http://download.eclipse.org/birt/update-site/2.6/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>swtbot-helios</id> + <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/ + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse</id> + <url>http://m2eclipse.sonatype.org/sites/m2e/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>m2eclipse-extras</id> + <url>http://m2eclipse.sonatype.org/sites/m2e-extras/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + <repository> + <id>orbit</id> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/u... + </url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + </profile> + </profiles> </project> Modified: trunk/build/aggregate/site/web/site.css =================================================================== --- trunk/build/aggregate/site/web/site.css 2010-07-16 22:30:18 UTC (rev 23508) +++ trunk/build/aggregate/site/web/site.css 2010-07-16 22:33:14 UTC (rev 23509) @@ -1,66 +1,66 @@ -< -STYLE type ="text/css">td.spacer { - padding-bottom: 10px; - padding-top: 10px; -} - -.title { - font-family: sans-serif; - color: #1778be; -} - -.bodyText { - font-family: sans-serif; - font-size: 9pt; - color: #000000; -} - -.sub-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; -} - -.log-text { - font-family: sans-serif; - font-style: normal; - font-weight: lighter; - font-size: 8pt; - color: black; -} - -.big-header { - font-family: sans-serif; - font-style: normal; - font-weight: bold; - font-size: 9pt; - color: white; - border-top: 10px solid white; -} - -.light-row { - background: #FFFFFF -} - -.dark-row { - background: #EEEEEE -} - -.header { - background: #445562 -} - -#indent { - word-wrap: break-word; - width: 300px; - text-indent: 10px; -} - -.link { - color: #187dc6; -} -</ -STYLE +< +STYLE type ="text/css">td.spacer { + padding-bottom: 10px; + padding-top: 10px; +} + +.title { + font-family: sans-serif; + color: #1778be; +} + +.bodyText { + font-family: sans-serif; + font-size: 9pt; + color: #000000; +} + +.sub-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; +} + +.log-text { + font-family: sans-serif; + font-style: normal; + font-weight: lighter; + font-size: 8pt; + color: black; +} + +.big-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; + border-top: 10px solid white; +} + +.light-row { + background: #FFFFFF +} + +.dark-row { + background: #EEEEEE +} + +.header { + background: #445562 +} + +#indent { + word-wrap: break-word; + width: 300px; + text-indent: 10px; +} + +.link { + color: #187dc6; +} +</ +STYLE > \ No newline at end of file

15 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2010