Author: pete.muir(a)jboss.org Date: 2008-10-20 09:11:24 -0400 (Mon, 20 Oct 2008) New Revision: 9363 Added: trunk/examples/jpa/pom.xml Modified: trunk/build/ci.build.xml trunk/build/common.build.xml trunk/examples/jpa/build.xml Log: Add jpa example to deployed examples Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-10-20 10:47:32 UTC (rev 9362) +++ trunk/build/ci.build.xml 2008-10-20 13:11:24 UTC (rev 9363) @@ -73,6 +73,7 @@ <target name="deployExamplesSnapshot" depends="initdav"> <deployExample name="booking" repositoryId="snapshots.jboss.org" /> <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" /> + <deployExampleNoDs name="jpa" distdir="dist-jboss" repositoryId="snapshots.jboss.org" /> <deployExample name="dvd" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" /> </target> Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-10-20 10:47:32 UTC (rev 9362) +++ trunk/build/common.build.xml 2008-10-20 13:11:24 UTC (rev 9363) @@ -200,43 +200,46 @@ </macrodef> <macrodef name="deployExample"> - <attribute name="name" /> - <attribute name="path" default="${seam.dir}/examples/@{name}" /> - <attribute name="repositoryId" /> - <sequential> - <ant dir="@{path}" target="archive" inheritall="false"> - <propertyset> - <propertyref name="initpomsdone" /> - <propertyref name="copyseamdone" /> - <propertyref name="copyseamdependenciesdone" /> - <propertyref name="copyjbossembeddeddone" /> - <propertyref name="core.pom" /> - <propertyref name="root.pom" /> - <propertyref name="parent.pom" /> - <propertyref name="ui.pom" /> - <propertyref name="remoting.pom" /> - <propertyref name="resteasy.pom" /> - <propertyref name="pdf.pom" /> - <propertyref name="rss.pom" /> - <propertyref name="gen.pom" /> - <propertyref name="excel.pom" /> - <propertyref name="ioc.pom" /> - <propertyref name="mail.pom" /> - <propertyref name="debug.pom" /> - <propertyref name="wicket.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" 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> - </sequential> + <attribute name="name" /> + <attribute name="path" default="${seam.dir}/examples/@{name}" /> + <attribute name="repositoryId" /> + <attribute name="type" default="ear" /> + <sequential> + <ant dir="@{path}" target="archive" inheritall="false"> + <propertyset> + <propertyref name="initpomsdone" /> + <propertyref name="copyseamdone" /> + <propertyref name="copyseamdependenciesdone" /> + <propertyref name="copyjbossembeddeddone" /> + <propertyref name="core.pom" /> + <propertyref name="root.pom" /> + <propertyref name="parent.pom" /> + <propertyref name="ui.pom" /> + <propertyref name="remoting.pom" /> + <propertyref name="resteasy.pom" /> + <propertyref name="pdf.pom" /> + <propertyref name="rss.pom" /> + <propertyref name="gen.pom" /> + <propertyref name="excel.pom" /> + <propertyref name="ioc.pom" /> + <propertyref name="mail.pom" /> + <propertyref name="debug.pom" /> + <propertyref name="wicket.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" 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> + </sequential> </macrodef> - + <macrodef name="installExample"> <attribute name="name" /> <attribute name="path" default="${seam.dir}/examples/@{name}" /> @@ -272,42 +275,45 @@ </macrodef> <macrodef name="deployExampleNoDs"> - <attribute name="name" /> - <attribute name="path" default="${seam.dir}/examples/@{name}" /> - <attribute name="repositoryId" /> - <sequential> - <ant dir="@{path}" target="archive" inheritall="false"> - <propertyset> - <propertyref name="initpomsdone" /> - <propertyref name="copyseamdone" /> - <propertyref name="copyseamdependenciesdone" /> - <propertyref name="copyjbossembeddeddone" /> - <propertyref name="core.pom" /> - <propertyref name="root.pom" /> - <propertyref name="parent.pom" /> - <propertyref name="ui.pom" /> - <propertyref name="remoting.pom" /> - <propertyref name="resteasy.pom" /> - <propertyref name="gen.pom" /> - <propertyref name="pdf.pom" /> - <propertyref name="rss.pom" /> - <propertyref name="excel.pom" /> - <propertyref name="ioc.pom" /> - <propertyref name="mail.pom" /> - <propertyref name="debug.pom" /> - <propertyref name="wicket.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" settingsFile="${maven.settings.xml}"> - <pom file="${example.pom}" settingsFile="${maven.settings.xml}" /> - <remoteRepository refid="@{repositoryId}" /> - </artifact:deploy> - </sequential> - </macrodef> - + <attribute name="name" /> + <attribute name="path" default="${seam.dir}/examples/@{name}" /> + <attribute name="repositoryId" /> + <attribute name="type" default="ear" /> + <attribute name="distdir" default="dist" /> + <sequential> + <ant dir="@{path}" target="archive" inheritall="false"> + <propertyset> + <propertyref name="initpomsdone" /> + <propertyref name="copyseamdone" /> + <propertyref name="copyseamdependenciesdone" /> + <propertyref name="copyjbossembeddeddone" /> + <propertyref name="core.pom" /> + <propertyref name="root.pom" /> + <propertyref name="parent.pom" /> + <propertyref name="ui.pom" /> + <propertyref name="remoting.pom" /> + <propertyref name="resteasy.pom" /> + <propertyref name="gen.pom" /> + <propertyref name="pdf.pom" /> + <propertyref name="rss.pom" /> + <propertyref name="excel.pom" /> + <propertyref name="ioc.pom" /> + <propertyref name="mail.pom" /> + <propertyref name="debug.pom" /> + <propertyref name="wicket.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}/@{distdir}/jboss-seam-@{name}.(a){type}&quot; + uniqueVersion="false" settingsFile="${maven.settings.xml}"> + <pom file="${example.pom}" settingsFile="${maven.settings.xml}" /> + <remoteRepository refid="@{repositoryId}" /> + </artifact:deploy> + </sequential> + </macrodef> + <macrodef name="dependencyReport"> <attribute name="module" /> <attribute name="pom" default=&quot;${tmp.dir}/poms/(a){module}.pom&quot; /> Modified: trunk/examples/jpa/build.xml =================================================================== --- trunk/examples/jpa/build.xml 2008-10-20 10:47:32 UTC (rev 9362) +++ trunk/examples/jpa/build.xml 2008-10-20 13:11:24 UTC (rev 9363) @@ -59,6 +59,10 @@ <target name="test"> <ant antfile="build-jboss.xml" target="test" /> </target> + + <target name="archive"> + <ant antfile="build-jboss.xml" target="jbosswar" /> + </target> </project> Added: trunk/examples/jpa/pom.xml =================================================================== --- trunk/examples/jpa/pom.xml (rev 0) +++ trunk/examples/jpa/pom.xml 2008-10-20 13:11:24 UTC (rev 9363) @@ -0,0 +1,15 @@ +<?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.examples</groupId> + <artifactId>jboss-seam-jpa</artifactId> + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>parent</artifactId> + <version&gt;@seam.version(a)&lt;/version&gt; + </parent> + <packaging>war</packaging> + +</project> \ No newline at end of file Property changes on: trunk/examples/jpa/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain