May 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r21974 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 12:25:36 -0400 (Sat, 08 May 2010) New Revision: 21974 Added: branches/modular_build/build/svnant.jar branches/modular_build/build/svnant.jar.README.txt Log: implement workaround for 302 redirect issues when building on Windows: cache a copy of svnant.jar locally Added: branches/modular_build/build/svnant.jar =================================================================== (Binary files differ) Property changes on: branches/modular_build/build/svnant.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/modular_build/build/svnant.jar.README.txt =================================================================== --- branches/modular_build/build/svnant.jar.README.txt (rev 0) +++ branches/modular_build/build/svnant.jar.README.txt 2010-05-08 16:25:36 UTC (rev 21974) @@ -0,0 +1,3 @@ +Fetched from http://www.tigris.org/files/documents/906/46267/svnant-1.3.0.zip +Cannot simply fetch file using <get> because Ant get stuck in infinite redirection loop (200 -> 302 -> 200 -> ...) + Property changes on: branches/modular_build/build/svnant.jar.README.txt ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21973 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 12:25:00 -0400 (Sat, 08 May 2010) New Revision: 21973 Modified: branches/modular_build/build/build.xml Log: remove modeshape (test issues?) and implement workaround for 302 redirect issues when building on Windows Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-08 14:54:29 UTC (rev 21972) +++ branches/modular_build/build/build.xml 2010-05-08 16:25:00 UTC (rev 21973) @@ -8,7 +8,7 @@ value="tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + drools,bpel,smooks,freemarker,profiler,portlet; xulrunner,jst,vpe,jsf; esb,tptp,ws; cdi,struts,hibernatetools,seam; @@ -162,15 +162,23 @@ <target name="get.svnant" unless="svnant.jar.exists"> <property name="SVNANT_MIRROR" value="http://www.tigris.org/files/documents/906/46267" /> -  <if> <os family="windows" /> <then> - <get src="${SVNANT_MIRROR}/svnant-1.3.0.zip" - dest="${COMMON_TOOLS}/svnant-1.3.0.zip" - verbose="true" - usetimestamp="true" - /> + <if> + <available file="${WORKINGDIR}/svnant.jar" type="file" /> + <then> + <copy file="${WORKINGDIR}/svnant.jar" todir="${COMMON_TOOLS}" failonerror="true" /> + </then> + <else> +  + <get src="${SVNANT_MIRROR}/svnant-1.3.0.zip" + dest="${COMMON_TOOLS}/svnant-1.3.0.zip" + verbose="true" + usetimestamp="true" + /> + </else> + </if> </then> <else> <exec executable="wget" dir="${COMMON_TOOLS}"> @@ -178,13 +186,31 @@ </exec> </else> </if> - <touch file="${COMMON_TOOLS}/svnant-1.3.0.zip" /> - <mkdir dir="${java.io.tmpdir}/svnant-1.3.0.zip_" /> - <unzip src="${COMMON_TOOLS}/svnant-1.3.0.zip" dest="${java.io.tmpdir}/svnant-1.3.0.zip_" overwrite="true" /> - <copy todir="${COMMON_TOOLS}" failonerror="true"> - <fileset dir="${java.io.tmpdir}/svnant-1.3.0.zip_/svnant-1.3.0/lib/" includes="*.jar" /> - </copy> - <delete dir="${java.io.tmpdir}/svnant-1.3.0.zip_" includeemptydirs="true" quiet="true" /> + <if> + <available file="${COMMON_TOOLS}/svnant-1.3.0.zip" type="file" /> + <then> + <touch file="${COMMON_TOOLS}/svnant-1.3.0.zip" /> + <mkdir dir="${java.io.tmpdir}/svnant-1.3.0.zip_" /> + <unzip src="${COMMON_TOOLS}/svnant-1.3.0.zip" + dest="${java.io.tmpdir}/svnant-1.3.0.zip_" + overwrite="true" + /> + <copy todir="${COMMON_TOOLS}" failonerror="true"> + <fileset dir="${java.io.tmpdir}/svnant-1.3.0.zip_/svnant-1.3.0/lib/" includes="*.jar" /> + </copy> + <delete dir="${java.io.tmpdir}/svnant-1.3.0.zip_" includeemptydirs="true" quiet="true" /> + </then> + <elseif> + <not> + <available file="${COMMON_TOOLS}/svnant.jar" type="file" /> + </not> + <then> + <fail>Error! +Cannot proceed - must install svnant.jar from ${SVNANT_MIRROR}/svnant-1.3.0.zip into ${COMMON_TOOLS}/. +</fail> + </then> + </elseif> + </if> </target> <target name="get.maven" unless="maven.exists">

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21972 - in branches/modular_build/modeshape: features/org.jboss.tools.modeshape.rest.test.feature and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 10:54:29 -0400 (Sat, 08 May 2010) New Revision: 21972 Modified: branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/feature.xml branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF Log: add qualifiers Modified: branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml =================================================================== --- branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.feature/feature.xml 2010-05-08 14:54:29 UTC (rev 21972) @@ -13,7 +13,7 @@ <feature id="org.jboss.tools.modeshape.rest.feature" label="%featureName" - version="1.0.0" + version="1.0.0.qualifier" provider-name="%featureProvider" plugin="org.jboss.tools.modeshape.rest" image="feature.png"> Modified: branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml =================================================================== --- branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/feature.xml 2010-05-08 14:54:29 UTC (rev 21972) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.modeshape.rest.test.feature" label="ModeShape Tests Feature" - version="1.0.0" + version="1.0.0.qualifier" provider-name="JBoss by Red Hat"> <description url="http://www.example.com/description"> Modified: branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/feature.xml =================================================================== --- branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/feature.xml 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/feature.xml 2010-05-08 14:54:29 UTC (rev 21972) @@ -2,7 +2,7 @@ <feature id="org.jboss.tools.modeshape.rest.test.sdk.feature" label="ModeShape Tests SDK Feature" - version="1.0.0" + version="1.0.0.qualifier" provider-name="JBoss by Red Hat"> <description url="http://www.example.com/description"> Modified: branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2010-05-08 14:54:29 UTC (rev 21972) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.jboss.tools.modeshape.rest;singleton:=true -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.modeshape.rest.Activator Bundle-Vendor: %bundleVendor Bundle-Localization: plugin

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21971 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 10:52:00 -0400 (Sat, 08 May 2010) New Revision: 21971 Modified: branches/modular_build/build/build.xml Log: better approach: if no features/ or plugins/ found in target/site, delete the site.zip and report a warning/error Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-08 14:49:16 UTC (rev 21970) +++ branches/modular_build/build/build.xml 2010-05-08 14:52:00 UTC (rev 21971) @@ -880,30 +880,59 @@ </else> </if> -  - <move file="${WORKINGDIR}/${update.site.path}/target/site.zip" - tofile="${destinationZip}" - overwrite="true" - preservelastmodified="false" - /> - -  <if> - <not> - <equals arg1="${basedir}" arg2="${WORKINGDIR}" /> - </not> + <and> + <available file="${WORKINGDIR}/${update.site.path}/target/site/plugins" type="dir" /> + <available file="${WORKINGDIR}/${update.site.path}/target/site/features" type="dir" /> + </and> <then> - <mkdir dir="${basedir}/${update.site.path}/target" /> - <copy todir="${basedir}/${update.site.path}/target" - flatten="true" - preservelastmodified="true" +  + <move file="${WORKINGDIR}/${update.site.path}/target/site.zip" + tofile="${destinationZip}" overwrite="true" - > - <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" /> + preservelastmodified="false" + /> + +  + <copy todir="${WORKINGDIR}/${update.site.path}/target/site"> + <fileset dir="${WORKINGDIR}/${update.site.path}" includes="web/*, index.html" /> </copy> + <zip destfile="${destinationZip}" + basedir="${WORKINGDIR}/${update.site.path}/target/site" + update="true" + includes="web/*, index.html" + /> + +  + <if> + <not> + <equals arg1="${basedir}" arg2="${WORKINGDIR}" /> + </not> + <then> + <mkdir dir="${basedir}/${update.site.path}/target" /> + <copy todir="${basedir}/${update.site.path}/target" + flatten="true" + preservelastmodified="true" + overwrite="true" + > + <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" /> + </copy> + </then> + </if> </then> + <else> + <delete file="${WORKINGDIR}/${update.site.path}/target/site.zip" quiet="true" /> + <if> + <equals arg1="${update.site.path}" arg2="site" /> + <then> + <fail>Overall update site zip contains no features!</fail> + </then> + <else> + <echo level="info">Update site zip for ${COMPONENTS.to.build} contains no features!</echo> + </else> + </if> + </else> </if> - </target>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21970 - in branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest: test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 10:49:16 -0400 (Sat, 08 May 2010) New Revision: 21970 Added: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/test/ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/test/AllTests.java Log: add src/org/jboss/tools/modeshape/rest/test/AllTests.java from trunk Added: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/test/AllTests.java =================================================================== --- branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/test/AllTests.java (rev 0) +++ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/test/AllTests.java 2010-05-08 14:49:16 UTC (rev 21970) @@ -0,0 +1,13 @@ +package org.jboss.tools.modeshape.rest.test; + +import org.jboss.tools.modeshape.rest.PersistedServerTest; +import org.jboss.tools.modeshape.rest.ServerManagerTest; +import org.jboss.tools.modeshape.rest.ServerRegistryEventTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith( Suite.class ) +(a)Suite.SuiteClasses( {PersistedServerTest.class, ServerManagerTest.class, ServerRegistryEventTest.class} ) +public class AllTests { + // nothing to do +}

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21969 - branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 10:48:41 -0400 (Sat, 08 May 2010) New Revision: 21969 Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF Log: add qualifier Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2010-05-08 14:39:41 UTC (rev 21968) +++ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2010-05-08 14:48:41 UTC (rev 21969) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Test Plug-in Bundle-SymbolicName: org.jboss.tools.modeshape.rest.test -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version="1.0.0", org.junit4

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21968 - branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 10:39:41 -0400 (Sat, 08 May 2010) New Revision: 21968 Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF Log: add junit4 to manifest Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2010-05-08 14:00:39 UTC (rev 21967) +++ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2010-05-08 14:39:41 UTC (rev 21968) @@ -4,7 +4,8 @@ Bundle-SymbolicName: org.jboss.tools.modeshape.rest.test Bundle-Version: 1.0.0 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version="1.0.0" +Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version="1.0.0", + org.junit4 Bundle-ClassPath: hamcrest-core-1.1.jar, ., junit-4.4.jar

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21967 - branches/modular_build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 10:00:39 -0400 (Sat, 08 May 2010) New Revision: 21967 Modified: branches/modular_build/parent-pom.xml Log: remove osx 64 Modified: branches/modular_build/parent-pom.xml =================================================================== --- branches/modular_build/parent-pom.xml 2010-05-08 13:59:22 UTC (rev 21966) +++ branches/modular_build/parent-pom.xml 2010-05-08 14:00:39 UTC (rev 21967) @@ -50,11 +50,11 @@ <configuration> <resolver>p2</resolver> <environments> - <environment> +  <environment> <os>macosx</os> <ws>cocoa</ws>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21966 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 09:59:22 -0400 (Sat, 08 May 2010) New Revision: 21966 Modified: branches/modular_build/build/build.xml Log: JBDS-486 JBDS-1210 can now use Tycho to generate update site zip, so no need to do custom packaging -- just need a site.xml and a pom.xml and `mvn3 clean verify` will produce target/site.zip Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-08 13:54:53 UTC (rev 21965) +++ branches/modular_build/build/build.xml 2010-05-08 13:59:22 UTC (rev 21966) @@ -880,53 +880,30 @@ </else> </if> -  - <delete file="${WORKINGDIR}/${update.site.path}/target/site.zip" /> +  + <move file="${WORKINGDIR}/${update.site.path}/target/site.zip" + tofile="${destinationZip}" + overwrite="true" + preservelastmodified="false" + /> +  <if> - <and> - <available file="${WORKINGDIR}/${update.site.path}/target/site/plugins" type="dir" /> - <available file="${WORKINGDIR}/${update.site.path}/target/site/features" type="dir" /> - </and> + <not> + <equals arg1="${basedir}" arg2="${WORKINGDIR}" /> + </not> <then> -  - <copy todir="${WORKINGDIR}/${update.site.path}/target/site"> - <fileset dir="${WORKINGDIR}/${update.site.path}" includes="web/*, index.html" /> + <mkdir dir="${basedir}/${update.site.path}/target" /> + <copy todir="${basedir}/${update.site.path}/target" + flatten="true" + preservelastmodified="true" + overwrite="true" + > + <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" /> </copy> - <zip destfile="${destinationZip}" - basedir="${WORKINGDIR}/${update.site.path}/target/site" - update="false" - /> - -  - <if> - <not> - <equals arg1="${basedir}" arg2="${WORKINGDIR}" /> - </not> - <then> - <mkdir dir="${basedir}/${update.site.path}/target" /> - <copy todir="${basedir}/${update.site.path}/target" - flatten="true" - preservelastmodified="true" - overwrite="true" - > - <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" /> - </copy> - </then> - </if> </then> - <else> - <if> - <equals arg1="${update.site.path}" arg2="site" /> - <then> - <fail>Overall update site zip is empty!</fail> - </then> - <else> - <echo level="info">Update site zip for ${COMPONENTS.to.build} is empty!</echo> - </else> - </if> - </else> </if> + </target>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21965 - branches/modular_build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-08 09:54:53 -0400 (Sat, 08 May 2010) New Revision: 21965 Modified: branches/modular_build/parent-pom.xml Log: make generated update site contain artifacts, not just site.xml Modified: branches/modular_build/parent-pom.xml =================================================================== --- branches/modular_build/parent-pom.xml 2010-05-07 21:22:31 UTC (rev 21964) +++ branches/modular_build/parent-pom.xml 2010-05-08 13:54:53 UTC (rev 21965) @@ -21,6 +21,7 @@ <version>${tychoVersion}</version> <configuration> <format>'v'yyyyMMdd-HHmm</format> + <archiveSite>true</archiveSite> </configuration> </plugin>

15 years, 11 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 May 2010