Author: manaRH Date: 2008-06-09 09:07:25 -0400 (Mon, 09 Jun 2008) New Revision: 8351 Removed: branches/Seam_2_0_FP/build/jbas5.pom.xml Modified: branches/Seam_2_0_FP/build/ci.build.xml branches/Seam_2_0_FP/build/classpath.tmpl branches/Seam_2_0_FP/build/common.build.xml branches/Seam_2_0_FP/build/default.build.properties branches/Seam_2_0_FP/build/lib/maven-ant-tasks.jar branches/Seam_2_0_FP/build/readme.txt branches/Seam_2_0_FP/build/root.pom.xml branches/Seam_2_0_FP/build/sample.build.properties branches/Seam_2_0_FP/build/utilities.build.xml Log: merged from branch Seam_2_0 plus jbas5 deleted Modified: branches/Seam_2_0_FP/build/ci.build.xml =================================================================== --- branches/Seam_2_0_FP/build/ci.build.xml 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/ci.build.xml 2008-06-09 13:07:25 UTC (rev 8351) @@ -14,14 +14,15 @@ <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}" /> <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="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar" /> <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar" /> <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar" /> @@ -79,8 +80,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> @@ -106,7 +107,7 @@ <attribute name="pom" /> <sequential> <artifact:deploy uniqueVersion="true"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}"/> <remoteRepository refid="snapshots.jboss.org" /> </artifact:deploy> </sequential> @@ -118,7 +119,7 @@ <attribute name="srcjar" /> <sequential> <artifact:deploy file="@{jar}" uniqueVersion="true"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> <attach file="@{srcjar}" classifier="sources" /> <remoteRepository refid="snapshots.jboss.org" /> </artifact:deploy> Modified: branches/Seam_2_0_FP/build/classpath.tmpl =================================================================== (Binary files differ) Modified: branches/Seam_2_0_FP/build/common.build.xml =================================================================== --- branches/Seam_2_0_FP/build/common.build.xml 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/common.build.xml 2008-06-09 13:07:25 UTC (rev 8351) @@ -99,7 +99,6 @@ <pomfile name="core.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam" /> <pomfile name="core.wls.pom" value="${build.dir}/core.pom.xml" artifactName="jboss-seam-wls-compatible" /> <pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" /> - <pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" /> <pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" /> <pomfile name="ioc.pom" value="${build.dir}/ioc.pom.xml" /> <pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" /> @@ -118,6 +117,7 @@ <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="runtime" /> + <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}" scope="runtime" /> <copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" /> @@ -125,6 +125,7 @@ <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" /> + <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}" scope="compile" /> <property name="copyseamdependenciesdone" value="true" /> </target> @@ -200,13 +201,13 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> - <propertyref name="jbas5.pom" /> <propertyref name="testng.jvmargs"/> + <propertyref name="maven.settings.xml" /> </propertyset> </ant> <pomfile name="example.pom" value=&quot;(a){path}/pom.xml&quot; /> - <artifact:deploy file=&quot;@{path}/dist/jboss-seam-(a){name}.ear&quot; uniqueVersion="false"> - <pom file="${example.pom}" /> + <artifact:deploy file=&quot;@{path}/dist/jboss-seam-(a){name}.ear&quot; uniqueVersion="false" settingsFile="${maven.settings.xml}"> + <pom file="${example.pom}" settingsFile="${maven.settings.xml}"/> <attach file=&quot;@{path}/resources/jboss-seam-(a){name}-ds.xml&quot; classifier="ds" type="xml" /> <remoteRepository refid="@{repositoryId}" /> </artifact:deploy> @@ -233,7 +234,6 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> - <propertyref name="jbas5.pom" /> <propertyref name="testng.jvmargs"/> </propertyset> </ant> @@ -266,13 +266,13 @@ <propertyref name="ioc.pom" /> <propertyref name="mail.pom" /> <propertyref name="debug.pom" /> - <propertyref name="jbas5.pom" /> <propertyref name="testng.jvmargs"/> + <propertyref name="maven.settings.xml" /> </propertyset> </ant> <pomfile name="example.pom" value=&quot;(a){path}/pom.xml&quot; /> - <artifact:deploy file=&quot;@{path}/dist/jboss-seam-(a){name}.ear&quot; uniqueVersion="false"> - <pom file="${example.pom}" /> + <artifact:deploy file=&quot;@{path}/dist/jboss-seam-(a){name}.ear&quot; uniqueVersion="false" settingsFile="${maven.settings.xml}"> + <pom file="${example.pom}" settingsFile="${maven.settings.xml}"/> <remoteRepository refid="@{repositoryId}" /> </artifact:deploy> </sequential> @@ -326,7 +326,6 @@ <outputDependencyReport module="mail" /> <outputDependencyReport module="pdf" /> <outputDependencyReport module="ioc" /> - <outputDependencyReport module="jbas5" /> <echo>Dependency Report written to ${seam.dir}/dependency-report.txt</echo> </target> Modified: branches/Seam_2_0_FP/build/default.build.properties =================================================================== --- branches/Seam_2_0_FP/build/default.build.properties 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/default.build.properties 2008-06-09 13:07:25 UTC (rev 8351) @@ -7,10 +7,10 @@ # ------------ major.version 2 minor.version .0 -patchlevel .3 -qualifier -SNAPSHOT +patchlevel .2 +qualifier -FP # # Other program locations # ----------------------- -jboss.home /Applications/jboss-4.2.2.GA -tomcat.home /Applications/apache-tomcat-6.0 +jboss.home /var/lib/jboss +tomcat.home /var/lib/tomcat5 Deleted: branches/Seam_2_0_FP/build/jbas5.pom.xml =================================================================== --- branches/Seam_2_0_FP/build/jbas5.pom.xml 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/jbas5.pom.xml 2008-06-09 13:07:25 UTC (rev 8351) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jbas5</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>parent</artifactId> - <version&gt;@seam.version(a)&lt;/version&gt; - </parent> - <description>Seam integration with JBoss AS 5</description> - - <!-- See parent pom for notes on how to declare dependencies --> - - <dependencies> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - </dependency> - - </dependencies> - -</project> \ No newline at end of file Modified: branches/Seam_2_0_FP/build/lib/maven-ant-tasks.jar =================================================================== (Binary files differ) Modified: branches/Seam_2_0_FP/build/readme.txt =================================================================== --- branches/Seam_2_0_FP/build/readme.txt 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/readme.txt 2008-06-09 13:07:25 UTC (rev 8351) @@ -110,6 +110,3 @@ The examples assemble all the Seam dependencies into a staging directory (/lib). /lib/*.jar is used as the classpath to compile the examples, and the examples use pattern's to select the jars to put in their deployed archives. - -Some trickery (excluding jars) is required to get JBoss Embedded to run -currently - this should be improved. \ No newline at end of file Modified: branches/Seam_2_0_FP/build/root.pom.xml =================================================================== --- branches/Seam_2_0_FP/build/root.pom.xml 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/root.pom.xml 2008-06-09 13:07:25 UTC (rev 8351) @@ -28,12 +28,12 @@ <name>JBoss Repository</name> <url>http://repository.jboss.org/maven2</url> </repository> - <!-- <repository> + <repository> <snapshots /> <id>snapshots.jboss.org</id> <name>JBoss Snapshot Repository</name> <url>http://snapshots.jboss.org/maven2</url> - </repository>--> + </repository> </repositories> <!-- Externalize some version numbers here --> Modified: branches/Seam_2_0_FP/build/sample.build.properties =================================================================== --- branches/Seam_2_0_FP/build/sample.build.properties 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/sample.build.properties 2008-06-09 13:07:25 UTC (rev 8351) @@ -3,10 +3,8 @@ # # Location of JBoss AS and Tomcat # ------------------------------- -#jboss.home /Applications/jboss-4.2.2.GA # Default -#tomcat.home /Applications/apache-tomcat-6.0 # Default -#jboss.home C:\\jboss-4.2.2.GA -#tomcat.home C:\\Tomcat-6.0 +#jboss.home /var/lib/jboss-4.2.2.GA # Default +#tomcat.home /var/lib/tomcat6 # Default # # Misc Settings # ------------- Modified: branches/Seam_2_0_FP/build/utilities.build.xml =================================================================== --- branches/Seam_2_0_FP/build/utilities.build.xml 2008-06-09 13:04:24 UTC (rev 8350) +++ branches/Seam_2_0_FP/build/utilities.build.xml 2008-06-09 13:07:25 UTC (rev 8351) @@ -32,11 +32,11 @@ <attribute name="pom" /> <sequential> <artifact:dependencies pathId=&quot;@{scope}.(a){id}.path&quot; filesetId=&quot;@{scope}.(a){id}.fileset&quot; versionsId=&quot;@{scope}.(a){id}.versions&quot; 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=&quot;@{scope}.(a){id}.path&quot; filesetId=&quot;@{scope}.(a){id}.fileset&quot; versionsId=&quot;@{scope}.(a){id}.versions&quot; useScope="@{scope}" sourcesFilesetId=&quot;@{scope}.(a){id}.source.fileset&quot; 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>