JBoss Tools SVN: r32112 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-15 02:15:04 -0400 (Wed, 15 Jun 2011)
New Revision: 32112
Modified:
trunk/build/publish.sh
Log:
remove empty line
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-06-15 06:07:39 UTC (rev 32111)
+++ trunk/build/publish.sh 2011-06-15 06:15:04 UTC (rev 32112)
@@ -265,7 +265,6 @@
# if an aggregate build, put output elsewhere on disk
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
-
if [[ ${PUBLISHPATHSUFFIX} ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
14 years, 10 months
JBoss Tools SVN: r32111 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-15 02:07:39 -0400 (Wed, 15 Jun 2011)
New Revision: 32111
Modified:
trunk/build/publish.sh
Log:
add shoutout to buildResults.aggregate instead of default target (JBIDE-7444)
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-06-15 06:07:28 UTC (rev 32110)
+++ trunk/build/publish.sh 2011-06-15 06:07:39 UTC (rev 32111)
@@ -219,7 +219,8 @@
RESULTS_DIR=${buildxml/\/build.xml/}
fi
done
-if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_PARAMS}; fi
+ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi
+if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi
# copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs
if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then
14 years, 10 months
JBoss Tools SVN: r32110 - trunk/build/results.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-15 02:07:28 -0400 (Wed, 15 Jun 2011)
New Revision: 32110
Modified:
trunk/build/results/build.xml
Log:
split aggregate results builder from single results builder; make single the default (JBIDE-7444)
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2011-06-15 05:25:39 UTC (rev 32109)
+++ trunk/build/results/build.xml 2011-06-15 06:07:28 UTC (rev 32110)
@@ -1,4 +1,4 @@
-<project default="buildResults.aggregate">
+<project default="buildResults.single">
<!-- should be set by script or in Hudson -->
<property name="ZIPSUFFIX" value="SNAPSHOT" />
@@ -101,10 +101,22 @@
<!-- NEW STUFF HERE -->
+ <target name="buildResults.single" depends="init" description="generate buildResults.html from build properties">
+ <ant target="collect.zips" antfile="../aggregate/site/build.xml">
+ <property name="inputRepos" value="2" />
+ <property name="inputRepo1" value="file://${input.dir}/all/repo/" />
+ <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/${JOB_NAME}/all/repo/" />
+ </ant>
+ <ant target="collect.metadata" antfile="../aggregate/site/build.xml">
+ </ant>
+ <antcall target="buildResults" />
+ </target>
+
<target name="buildResults.aggregate" depends="init" description="generate buildResults.html from build properties">
<ant target="collect.zips" antfile="../aggregate/site/build.xml">
- <property name="inputRepos" value="1" />
- <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo" />
+ <property name="inputRepos" value="2" />
+ <property name="inputRepo1" value="file://${input.dir}/all/repo/" />
+ <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo" />
</ant>
<ant target="collect.metadata" antfile="../aggregate/site/build.xml">
</ant>
14 years, 10 months
JBoss Tools SVN: r32109 - in trunk/as: tests and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-06-15 01:25:39 -0400 (Wed, 15 Jun 2011)
New Revision: 32109
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
trunk/as/tests/pom.xml
Log:
remove org.jboss.ide.eclipse.as.management.as7.tests from org.jboss.ide.eclipse.as.test.feature and tests/pom.xml, temporarily, per max
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-06-14 22:41:11 UTC (rev 32108)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2011-06-15 05:25:39 UTC (rev 32109)
@@ -52,11 +52,11 @@
version="0.0.0"
unpack="false"/>
- <plugin
+ <!-- removed per max, temporarily <plugin
id="org.jboss.ide.eclipse.as.management.as7.tests"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/> -->
</feature>
Modified: trunk/as/tests/pom.xml
===================================================================
--- trunk/as/tests/pom.xml 2011-06-14 22:41:11 UTC (rev 32108)
+++ trunk/as/tests/pom.xml 2011-06-15 05:25:39 UTC (rev 32109)
@@ -15,7 +15,7 @@
<module>org.jboss.ide.eclipse.as.archives.integration.test</module>
<module>org.jboss.ide.eclipse.as.test</module>
<module>org.jboss.ide.eclipse.as.ui.test</module>
- <module>org.jboss.ide.eclipse.as.management.as7.tests</module>
+ <!-- removed per max, temporarily <module>org.jboss.ide.eclipse.as.management.as7.tests</module> -->
</modules>
</project>
14 years, 10 months
JBoss Tools SVN: r32108 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-14 18:41:11 -0400 (Tue, 14 Jun 2011)
New Revision: 32108
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties
Log:
[JBIDE-9136] removed build order directive
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2011-06-14 22:14:31 UTC (rev 32107)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2011-06-14 22:41:11 UTC (rev 32108)
@@ -6,6 +6,5 @@
serverMock/,\
.,\
plugin.xml
-jars.compile.order = .
source.. = src/
output.. = bin/
14 years, 10 months
JBoss Tools SVN: r32107 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-14 18:14:31 -0400 (Tue, 14 Jun 2011)
New Revision: 32107
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties
Log:
[JBIDE-9136] removed nested jar since we already have . in the build path
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties 2011-06-14 22:04:10 UTC (rev 32106)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties 2011-06-14 22:14:31 UTC (rev 32107)
@@ -1,5 +1,4 @@
bin.includes = META-INF/,\
plugin.properties,\
.
-jars.compile.order = jbossasarchivesintegrationtest.jar
source.. = src/
14 years, 10 months
JBoss Tools SVN: r32106 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-14 18:04:10 -0400 (Tue, 14 Jun 2011)
New Revision: 32106
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties
Log:
fxinig archive integration test build failure
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties 2011-06-14 21:53:11 UTC (rev 32105)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.properties 2011-06-14 22:04:10 UTC (rev 32106)
@@ -2,5 +2,4 @@
plugin.properties,\
.
jars.compile.order = jbossasarchivesintegrationtest.jar
-output.jbossasarchivesintegrationtest.jar = bin/
source.. = src/
14 years, 10 months
JBoss Tools SVN: r32105 - trunk/forge/features/org.jboss.tools.forge.feature.
by jbosstools-commits@lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-06-14 17:53:11 -0400 (Tue, 14 Jun 2011)
New Revision: 32105
Added:
trunk/forge/features/org.jboss.tools.forge.feature/feature.properties
trunk/forge/features/org.jboss.tools.forge.feature/license.html
Modified:
trunk/forge/features/org.jboss.tools.forge.feature/build.properties
trunk/forge/features/org.jboss.tools.forge.feature/feature.xml
Log:
JBIDE-9139 replaced bogus example license info for forge feature
Modified: trunk/forge/features/org.jboss.tools.forge.feature/build.properties
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/build.properties 2011-06-14 21:19:32 UTC (rev 32104)
+++ trunk/forge/features/org.jboss.tools.forge.feature/build.properties 2011-06-14 21:53:11 UTC (rev 32105)
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ feature.properties,\
+ license.html
Added: trunk/forge/features/org.jboss.tools.forge.feature/feature.properties
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/feature.properties (rev 0)
+++ trunk/forge/features/org.jboss.tools.forge.feature/feature.properties 2011-06-14 21:53:11 UTC (rev 32105)
@@ -0,0 +1,25 @@
+featureName=Forge Tools
+featureProvider=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+# "description" property - description of the feature
+description=Plugins for using Seam Forge from within Eclipse.
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# START NON-TRANSLATABLE
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=Red Hat, Inc. licenses these features and plugins to you under \
+certain open source licenses (or aggregations of such licenses), which \
+in a particular case may include the Eclipse Public License, the GNU \
+Lesser General Public License, and/or certain other open source \
+licenses. For precise licensing details, consult the corresponding \
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, \
+Raleigh NC 27606 USA.
+# END NON-TRANSLATABLE
+########### end of license property ##########################################
\ No newline at end of file
Modified: trunk/forge/features/org.jboss.tools.forge.feature/feature.xml
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/feature.xml 2011-06-14 21:19:32 UTC (rev 32104)
+++ trunk/forge/features/org.jboss.tools.forge.feature/feature.xml 2011-06-14 21:53:11 UTC (rev 32105)
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.jboss.tools.forge.feature"
- label="Forge Tools"
+ label="%featureName"
version="1.0.0.qualifier">
<description url="http://www.example.com/description">
- [Enter Feature Description here.]
+ %description
</description>
<copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ JBoss, Home of Professional Open Source
+Copyright (c) 2006-2011 Red Hat, Inc., and individual contributors
+as indicated
+by the @authors tag. See the copyright.txt in the distribution
+for a full listing of individual contributors.
</copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
+ <license url="%licenseURL">
+ %license
</license>
<plugin
Added: trunk/forge/features/org.jboss.tools.forge.feature/license.html
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/license.html (rev 0)
+++ trunk/forge/features/org.jboss.tools.forge.feature/license.html 2011-06-14 21:53:11 UTC (rev 32105)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
14 years, 10 months
JBoss Tools SVN: r32104 - trunk/as/tests.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-06-14 17:19:32 -0400 (Tue, 14 Jun 2011)
New Revision: 32104
Modified:
trunk/as/tests/pom.xml
Log:
[JBIDE-9137]
Modified: trunk/as/tests/pom.xml
===================================================================
--- trunk/as/tests/pom.xml 2011-06-14 21:09:38 UTC (rev 32103)
+++ trunk/as/tests/pom.xml 2011-06-14 21:19:32 UTC (rev 32104)
@@ -15,6 +15,7 @@
<module>org.jboss.ide.eclipse.as.archives.integration.test</module>
<module>org.jboss.ide.eclipse.as.test</module>
<module>org.jboss.ide.eclipse.as.ui.test</module>
+ <module>org.jboss.ide.eclipse.as.management.as7.tests</module>
</modules>
</project>
14 years, 10 months
JBoss Tools SVN: r32103 - trunk/seam/tests.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2011-06-14 17:09:38 -0400 (Tue, 14 Jun 2011)
New Revision: 32103
Modified:
trunk/seam/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8777 Fixed seam-bootstrap test configuration.
Modified: trunk/seam/tests/pom.xml
===================================================================
--- trunk/seam/tests/pom.xml 2011-06-14 21:00:31 UTC (rev 32102)
+++ trunk/seam/tests/pom.xml 2011-06-14 21:09:38 UTC (rev 32103)
@@ -42,5 +42,27 @@
<module>org.jboss.tools.seam.ui.bot.test</module>
<module>org.jboss.tools.seam.xml.test</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-test-plugin</artifactId>
+ <configuration>
+ <product>org.jboss.tools.tests.product</product>
+ <!-- default is 1800 sec = 30 min -->
+ <surefire.timeout>1800</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+
+ <explodedBundles>
+ <bundle>org.jboss.tools.vpe</bundle>
+ <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86</bundle>
+ <bundle>org.mozilla.xulrunner.gtk.linux.x86_64</bundle>
+ <bundle>org.mozilla.xulrunner.win32.win32.x86</bundle>
+ </explodedBundles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 10 months