[seam-commits] Seam SVN: r8213 - in branches/Seam_2_0: examples and 1 other directories.

[seam-commits at lists.jboss.org]

Author: jbalunas at redhat.com
Date: 2008-05-16 15:22:43 -0400 (Fri, 16 May 2008)
New Revision: 8213

Modified:
   branches/Seam_2_0/build/ci.build.xml
   branches/Seam_2_0/examples/build.xml
   branches/Seam_2_0/examples/wiki/build.xml
Log:
more back port changes for hudson/maven build issues.

Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml	2008-05-16 18:59:01 UTC (rev 8212)
+++ branches/Seam_2_0/build/ci.build.xml	2008-05-16 19:22:43 UTC (rev 8213)
@@ -14,8 +14,10 @@
 
 	<import file="common.build.xml" />
 	
-	<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
-
+	<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2">
+		<authentication username="hudson-services" password="${snapshots.password}" />
+	</artifact:remoteRepository>
+	
 	<target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
 		<deploySnapshotPom pom="${root.pom}" />
 		<deploySnapshotPom pom="${parent.pom}" />
@@ -79,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" />
@@ -105,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>
@@ -117,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" />

Modified: branches/Seam_2_0/examples/build.xml
===================================================================
--- branches/Seam_2_0/examples/build.xml	2008-05-16 18:59:01 UTC (rev 8212)
+++ branches/Seam_2_0/examples/build.xml	2008-05-16 19:22:43 UTC (rev 8213)
@@ -930,16 +930,16 @@
 	</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" />
+			   <path refid="test.classpath" />
+		       <path refid="runtime.emma.path" />
 			</classpath>
 			<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
 		</testng>

Modified: branches/Seam_2_0/examples/wiki/build.xml
===================================================================
--- branches/Seam_2_0/examples/wiki/build.xml	2008-05-16 18:59:01 UTC (rev 8212)
+++ branches/Seam_2_0/examples/wiki/build.xml	2008-05-16 19:22:43 UTC (rev 8213)
@@ -48,7 +48,7 @@
         <exclude name="hibernate*"/>
         <exclude name="ejb3-persistence*"/>
     	<exclude name="jboss-seam-gen.jar" />
-    </fileset>
+    </fileset> 
 
     <path id="build.classpath">
         <fileset refid="globallibs" />
@@ -72,6 +72,7 @@
         	<!-- Don't use that Hibernate either... -->
             <exclude name="hibernate*.jar"/>
         	<exclude name="jboss-seam-jbas5.jar" />
+            <exclude name="ehcache.jar" />
         </fileset>
         <fileset dir="${local.lib.dir}">
             <!-- This has the Hibernate we want -->
@@ -534,9 +535,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>