Seam SVN: r8211 - trunk/examples/wiki.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 14:19:16 -0400 (Fri, 16 May 2008)
New Revision: 8211
Modified:
trunk/examples/wiki/build.xml
Log:
need to exclude ehcache.jar from seam lib dir
Modified: trunk/examples/wiki/build.xml
===================================================================
--- trunk/examples/wiki/build.xml 2008-05-16 17:56:15 UTC (rev 8210)
+++ trunk/examples/wiki/build.xml 2008-05-16 18:19:16 UTC (rev 8211)
@@ -73,6 +73,7 @@
<exclude name="hibernate*.jar"/>
<exclude name="jboss-seam-jbas5.jar" />
<exclude name="jboss-seam-wicket.jar" />
+ <exclude name="ehcache.jar" />
</fileset>
<fileset dir="${local.lib.dir}">
<!-- This has the Hibernate we want -->
17 years, 11 months
Seam SVN: r8210 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 13:56:15 -0400 (Fri, 16 May 2008)
New Revision: 8210
Modified:
trunk/build/ci.build.xml
Log:
oops
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-16 17:53:04 UTC (rev 8209)
+++ trunk/build/ci.build.xml 2008-05-16 17:56:15 UTC (rev 8210)
@@ -81,7 +81,7 @@
</target>
<target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}">
<pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refId="snapshots.jboss.org" />
<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
17 years, 11 months
Seam SVN: r8209 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 13:53:04 -0400 (Fri, 16 May 2008)
New Revision: 8209
Modified:
trunk/build/ci.build.xml
Log:
need to use local
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-16 17:43:09 UTC (rev 8208)
+++ trunk/build/ci.build.xml 2008-05-16 17:53:04 UTC (rev 8209)
@@ -107,7 +107,7 @@
<macrodef name="deploySnapshotPom">
<attribute name="pom" />
<sequential>
- <artifact:deploy uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <artifact:deploy uniqueVersion="true">
<pom file="@{pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
@@ -119,7 +119,7 @@
<attribute name="jar" />
<attribute name="srcjar" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <artifact:deploy file="@{jar}" uniqueVersion="true">
<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<attach file="@{srcjar}" classifier="sources" />
<remoteRepository refid="snapshots.jboss.org" />
17 years, 11 months
Seam SVN: r8208 - in trunk/examples: wiki and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 13:43:09 -0400 (Fri, 16 May 2008)
New Revision: 8208
Modified:
trunk/examples/build.xml
trunk/examples/wiki/build.xml
Log:
Use line not value
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-05-16 17:31:05 UTC (rev 8207)
+++ trunk/examples/build.xml 2008-05-16 17:43:09 UTC (rev 8208)
@@ -951,17 +951,17 @@
</target>
<target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests">
- <taskdef resource="testngtasks" classpathref="build.classpath" />
+ <taskdef resource="testngtasks" classpathref="test.classpath" />
<testng outputdir="${test-report.dir}">
- <jvmarg value="-Xmx800M" />
- <jvmarg value="-Djava.awt.headless=true" />
- <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
- <jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" />
- <jvmarg value="${testng.jvmargs}" />
+ <jvmarg line="-Xmx800M" />
+ <jvmarg line="-Djava.awt.headless=true" />
+ <jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir}" />
+ <jvmarg line="${testng.jvmargs}" />
<classpath>
- <path refid="test.classpath" />
- <path refid="runtime.emma.path" />
- </classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
</testng>
<echo>You can increase the logging by editing bootstrap/log4j.xml</echo>
Modified: trunk/examples/wiki/build.xml
===================================================================
--- trunk/examples/wiki/build.xml 2008-05-16 17:31:05 UTC (rev 8207)
+++ trunk/examples/wiki/build.xml 2008-05-16 17:43:09 UTC (rev 8208)
@@ -494,9 +494,9 @@
</classpath>
<xmlfileset dir="${src.test.dir}" includes="*.tng.xml" />
<jvmarg line="${testng.jvmargs}"/>
- <jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
+ <jvmarg line="-Demma.coverage.out.file=${coverage.ec}" />
<!-- Needed for running Embedded JBoss under JDK 6 -->
- <jvmarg value="-Djava.endorsed.dirs=${seam.dir}/classes/endorsed" />
+ <jvmarg line="-Djava.endorsed.dirs=${seam.dir}/classes/endorsed" />
</testng>
<echo message="Please read the test output in directory: ${test.output.dir}"/>
</target>
17 years, 11 months
Seam SVN: r8207 - in branches/Seam_2_0: build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-05-16 13:31:05 -0400 (Fri, 16 May 2008)
New Revision: 8207
Modified:
branches/Seam_2_0/build.xml
branches/Seam_2_0/build/ci.build.xml
branches/Seam_2_0/build/utilities.build.xml
Log:
Back port of changes to fix hudson/maven build issues.
Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml 2008-05-16 16:19:49 UTC (rev 8206)
+++ branches/Seam_2_0/build/ci.build.xml 2008-05-16 17:31:05 UTC (rev 8207)
@@ -79,8 +79,8 @@
</target>
<target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}">
- <pom file="${docs.pom}" />
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
+ <pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refId="snapshots.jboss.org" />
<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
</artifact:deploy>
@@ -105,8 +105,8 @@
<macrodef name="deploySnapshotPom">
<attribute name="pom" />
<sequential>
- <artifact:deploy uniqueVersion="true">
- <pom file="@{pom}" />
+ <artifact:deploy uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
</sequential>
@@ -117,8 +117,8 @@
<attribute name="jar" />
<attribute name="srcjar" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="true">
- <pom file="@{pom}" />
+ <artifact:deploy file="@{jar}" uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<attach file="@{srcjar}" classifier="sources" />
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml 2008-05-16 16:19:49 UTC (rev 8206)
+++ branches/Seam_2_0/build/utilities.build.xml 2008-05-16 17:31:05 UTC (rev 8207)
@@ -32,11 +32,11 @@
<attribute name="pom" />
<sequential>
<artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
</artifact:dependencies>
</sequential>
</macrodef>
-
+
<macrodef name="inlineDependencies">
<attribute name="id" />
<attribute name="scope" />
@@ -54,18 +54,18 @@
<attribute name="pom" />
<sequential>
<artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
</artifact:dependencies>
</sequential>
</macrodef>
-
+
<macrodef name="install">
<attribute name="pom" default="" />
<attribute name="jar" default="" />
<element name="args" implicit="true" optional="true" />
<sequential>
<artifact:install file="@{jar}" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<args />
</artifact:install>
</sequential>
@@ -79,7 +79,7 @@
<element name="credentials" implicit="true" optional="true" />
<sequential>
<artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
</remoteRepository>
@@ -94,8 +94,8 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}">
- <pom file="@{pom}" />
+ <artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
</remoteRepository>
@@ -112,8 +112,8 @@
<attribute name="repositoryId" default="" />
<element name="credentials" implicit="true" optional="true" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
- <pom file="@{pom}" />
+ <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
</remoteRepository>
Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml 2008-05-16 16:19:49 UTC (rev 8206)
+++ branches/Seam_2_0/build.xml 2008-05-16 17:31:05 UTC (rev 8207)
@@ -615,13 +615,13 @@
<copy todir="${classes.test.core.dir}">
<fileset dir="${classes.core.dir}" includes="**/*.*" />
</copy>
- <artifact:dependencies pathId="remoting.path">
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
- </artifact:dependencies>
+ <inlineDependencies scope="compile" id="remoting">
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
+ </inlineDependencies>
<path id="test.compile.path">
<path refid="test.core.path" />
<path path="${classes.test.core.dir}" />
- <path refid="remoting.path" />
+ <path refid="compile.remoting.path" />
</path>
</target>
17 years, 11 months
Seam SVN: r8206 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 12:19:49 -0400 (Fri, 16 May 2008)
New Revision: 8206
Modified:
trunk/build/ci.build.xml
Log:
specify settings.xml
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-16 15:06:21 UTC (rev 8205)
+++ trunk/build/ci.build.xml 2008-05-16 16:19:49 UTC (rev 8206)
@@ -81,8 +81,8 @@
</target>
<target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}">
- <pom file="${docs.pom}" />
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
+ <pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refId="snapshots.jboss.org" />
<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
</artifact:deploy>
@@ -107,8 +107,8 @@
<macrodef name="deploySnapshotPom">
<attribute name="pom" />
<sequential>
- <artifact:deploy uniqueVersion="true">
- <pom file="@{pom}" />
+ <artifact:deploy uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}"/>
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
</sequential>
@@ -119,8 +119,8 @@
<attribute name="jar" />
<attribute name="srcjar" />
<sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="true">
- <pom file="@{pom}" />
+ <artifact:deploy file="@{jar}" uniqueVersion="true" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<attach file="@{srcjar}" classifier="sources" />
<remoteRepository refid="snapshots.jboss.org" />
</artifact:deploy>
17 years, 11 months
Seam SVN: r8205 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 11:06:21 -0400 (Fri, 16 May 2008)
New Revision: 8205
Modified:
trunk/build/ci.settings.xml
Log:
oops
Modified: trunk/build/ci.settings.xml
===================================================================
--- trunk/build/ci.settings.xml 2008-05-16 15:04:01 UTC (rev 8204)
+++ trunk/build/ci.settings.xml 2008-05-16 15:06:21 UTC (rev 8205)
@@ -49,7 +49,7 @@
<localRepository>/path/to/local/repo</localRepository>
-->
- <localRepository>/Users/pmuir/tmp/m2/repository</localRepository>
+ <localRepository>${env.WORKSPACE}/m2/repository</localRepository>
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
17 years, 11 months
Seam SVN: r8204 - in trunk: build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 11:04:01 -0400 (Fri, 16 May 2008)
New Revision: 8204
Modified:
trunk/build.xml
trunk/build/ci.build.xml
trunk/build/ci.settings.xml
trunk/build/utilities.build.xml
Log:
Fixes for ci
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-05-16 14:58:43 UTC (rev 8203)
+++ trunk/build/ci.build.xml 2008-05-16 15:04:01 UTC (rev 8204)
@@ -21,7 +21,7 @@
<deploySnapshotPom pom="${parent.pom}" />
<deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" />
<deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/>
- <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/>
+ <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/>
<deploySnapshot pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/>
<deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar"/>
<deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar"/>
Modified: trunk/build/ci.settings.xml
===================================================================
--- trunk/build/ci.settings.xml 2008-05-16 14:58:43 UTC (rev 8203)
+++ trunk/build/ci.settings.xml 2008-05-16 15:04:01 UTC (rev 8204)
@@ -49,7 +49,7 @@
<localRepository>/path/to/local/repo</localRepository>
-->
- <localRepository>${env.WORKSPACE}/m2/repository</localRepository>
+ <localRepository>/Users/pmuir/tmp/m2/repository</localRepository>
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-05-16 14:58:43 UTC (rev 8203)
+++ trunk/build/utilities.build.xml 2008-05-16 15:04:01 UTC (rev 8204)
@@ -32,7 +32,7 @@
<attribute name="pom" />
<sequential>
<artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
</artifact:dependencies>
</sequential>
</macrodef>
@@ -54,7 +54,7 @@
<attribute name="pom" />
<sequential>
<artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
</artifact:dependencies>
</sequential>
</macrodef>
@@ -76,7 +76,7 @@
<element name="args" implicit="true" optional="true" />
<sequential>
<artifact:install file="@{jar}" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<args />
</artifact:install>
</sequential>
@@ -90,7 +90,7 @@
<element name="credentials" implicit="true" optional="true" />
<sequential>
<artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
</remoteRepository>
@@ -106,7 +106,7 @@
<element name="credentials" implicit="true" optional="true" />
<sequential>
<artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
</remoteRepository>
@@ -124,7 +124,7 @@
<element name="credentials" implicit="true" optional="true" />
<sequential>
<artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.xml}">
- <pom file="@{pom}" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<remoteRepository refId="@{repositoryId}">
<credentials />
</remoteRepository>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-05-16 14:58:43 UTC (rev 8203)
+++ trunk/build.xml 2008-05-16 15:04:01 UTC (rev 8204)
@@ -652,13 +652,13 @@
<copy todir="${classes.test.core.dir}">
<fileset dir="${classes.core.dir}" includes="**/*.*" />
</copy>
- <artifact:dependencies pathId="remoting.path">
+ <inlineDependencies scope="compile" id="remoting">
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
- </artifact:dependencies>
+ </inlineDependencies>
<path id="test.compile.path">
<path refid="test.core.path" />
<path path="${classes.test.core.dir}" />
- <path refid="remoting.path" />
+ <path refid="compile.remoting.path" />
</path>
</target>
17 years, 11 months
Seam SVN: r8203 - trunk/build/lib.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-05-16 10:58:43 -0400 (Fri, 16 May 2008)
New Revision: 8203
Modified:
trunk/build/lib/maven-ant-tasks.jar
Log:
properties
Modified: trunk/build/lib/maven-ant-tasks.jar
===================================================================
(Binary files differ)
Property changes on: trunk/build/lib/maven-ant-tasks.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 11 months
Seam SVN: r8201 - branches.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2008-05-16 10:08:19 -0400 (Fri, 16 May 2008)
New Revision: 8201
Added:
branches/Seam_2_0_FP/
Log:
created branch for Seam 2.0 FP
Copied: branches/Seam_2_0_FP (from rev 8200, branches/Seam_2_0)
17 years, 11 months