Author: pete.muir(a)jboss.org Date: 2008-04-25 10:25:28 -0400 (Fri, 25 Apr 2008) New Revision: 8024 Removed: trunk/examples/jpa/lib/ Modified: trunk/build/ci.build.xml trunk/build/common.build.xml trunk/build/maven/conf/settings.xml trunk/build/utilities.build.xml trunk/examples/build.xml trunk/examples/hibernate/build-glassfish.xml trunk/examples/hibernate/build-jboss405.xml trunk/examples/hibernate/build-tomcat55.xml trunk/examples/hibernate/build-weblogic92.xml trunk/examples/hibernate/build-websphere61.xml trunk/examples/jee5/booking/build.xml trunk/examples/jpa/build-glassfish.xml trunk/examples/jpa/build-jboss405.xml trunk/examples/jpa/build-tomcat55.xml trunk/examples/jpa/build-tomcat6.xml trunk/examples/jpa/build-weblogic10.xml trunk/examples/jpa/build-weblogic92.xml trunk/examples/jpa/build-websphere61.xml trunk/examples/seamdiscs/build.xml Log: JBSEAM-2909 and JBSEAM-2919 (first attempt) Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/build/ci.build.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -40,16 +40,12 @@ <target name="tests-java16"> <build target="cleanall" /> - <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions"> + <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}"> <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1"> <exclusion groupId="javax.xml.stream" artifactId="stax-api" /> <exclusion groupId="javax.activation" artifactId="activation" /> </dependency> - </artifact:dependencies> - <copy todir="${endorsed.dir}"> - <fileset refid="endorsed.fileset" /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten" /> - </copy> + </copyInlineDependencies> <build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true"/> <build target="copytestoutput" /> <build target="testreport" /> Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/build/common.build.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -129,7 +129,7 @@ </target> <target name="copyseam" if="mavenized.property" unless="copyseamdone" depends="initcopy, initpoms"> - <artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions"> + <copyInlineDependencies id="seam" scope="compile" todir="${lib.dir}"> <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-wicket" version="${complete.version}" /> @@ -138,16 +138,12 @@ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" /> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" /> - </artifact:dependencies> - <copy todir="${lib.dir}"> - <fileset refid="seam.fileset" /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${seam.versions}" to="flatten" /> - </copy> + </copyInlineDependencies> <property name="copyseamdone" value="true" /> </target> <target name="copyjbossembedded" if="mavenized.property" unless="copyjbossembeddeddone" depends="initpoms, initcopy"> - <artifact:dependencies filesetId="embeddedjboss.fileset" versionsId="embeddedjboss.versions"> + <copyInlineDependencies id="embeddedjboss" scope="compile" todir="${lib.dir}/test"> <dependency groupId="org.jboss.seam.embedded" artifactId="jboss-embedded-all" version="${embedded.version}"> <!-- Exclude the embedded api, its a dep of Seam core --> <exclusion groupId="org.jboss.seam.embedded" artifactId="jboss-embedded-api" /> @@ -157,11 +153,7 @@ <remoteRepository refId="repository.jboss.org" /> <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" /> - </artifact:dependencies> - <copy todir="${lib.dir}/test"> - <fileset refid="embeddedjboss.fileset" /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${embeddedjboss.versions}" to="flatten" /> - </copy> + </copyInlineDependencies> <property name="copyjbossembeddeddone" value="true" /> </target> Modified: trunk/build/maven/conf/settings.xml =================================================================== --- trunk/build/maven/conf/settings.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/build/maven/conf/settings.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -140,6 +140,12 @@ <url>http://my.repository.com/repo/path</url> </mirror> --> + <mirror> + <id>fake.mirror.of.central</id> + <mirrorOf>central</mirrorOf> + <name>Fake mirror of central - reroutes central to repository.jboss.org</name> + <url>http://repository.jboss.org/maven2</url> + </mirror> </mirrors> <!-- profiles Modified: trunk/build/utilities.build.xml =================================================================== --- trunk/build/utilities.build.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/build/utilities.build.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -31,18 +31,29 @@ <attribute name="scope" /> <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}"> + <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.dir}/conf/settings.xml"> <pom file="@{pom}" /> </artifact:dependencies> </sequential> </macrodef> + <macrodef name="inlineDependencies"> + <attribute name="id" /> + <attribute name="scope" /> + <element name="inline" implicit="true"/> + <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.dir}/conf/settings.xml"> + <inline /> + </artifact:dependencies> + </sequential> + </macrodef> + <macrodef name="dependenciesWithSources"> <attribute name="id" /> <attribute name="scope" /> <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;&gt; + <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.dir}/conf/settings.xml"> <pom file="@{pom}" /> </artifact:dependencies> </sequential> @@ -144,6 +155,31 @@ </copy> </sequential> </macrodef> + + <!-- Copy dependencies from a given pom/scope to a directory, flattening + the directory structure and version information --> + <macrodef name="copyInlineDependencies"> + <attribute name="id" /> + <attribute name="scope" /> + <element name="inline" implicit="true"/> + <attribute name="todir" /> + <sequential> + <inlineDependencies id="@{id}" scope="@{scope}"> + <inline /> + </inlineDependencies> + <copy todir="@{todir}"> + <fileset refid=&quot;@{scope}.(a){id}.fileset&quot; /> + <chainedmapper> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from=&quot;${@{scope}.(a){id}.versions}&quot; to="flatten" /> + <flattenmapper /> + <compositemapper> + <identitymapper /> + <globmapper from="mvel.jar" to="mvel14.jar"/> + </compositemapper> + </chainedmapper> + </copy> + </sequential> + </macrodef> <macrodef name="maven"> <attribute name="target" /> Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/build.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -301,6 +301,8 @@ <include name="jboss-embedded-api.jar" if="jboss-embedded-api.lib" /> </fileset> + <!-- Dependencies for wicket --> + <fileset id="wicket-extensions.jar" dir="${lib.dir}"> <include name="wicket-extensions.jar" if="wicket-extensions.lib" /> </fileset> @@ -310,6 +312,27 @@ <include name="joda-time.jar" if="wicket-datetime.lib" /> </fileset> + + <!-- Dependencies for Trinidad --> + + <fileset id="trinidad-api.jar" dir="${lib.dir}"> + <include name="trinidad-api.jar" if="trinidad.lib" /> + </fileset> + + <fileset id="trinidad-impl.jar" dir="${lib.dir}"> + <include name="trinidad-impl.jar" if="trinidad.lib" /> + </fileset> + + <!-- Dependencies if el-ri is needed --> + + <fileset id="el-ri.jar" dir="${lib.dir}"> + <include name="el-ri.jar" if="el-ri.lib" /> + </fileset> + + <fileset id="jboss-common-core.jar" dir="${lib.dir}"> + <include name="jboss-common-core.jar" if="jboss-common-core.lib" /> + </fileset> + <!-- ############################ MELDWARE ############################ --> <!-- Meldware from buni.org provides a java based mail server which Seam uses @@ -479,7 +502,46 @@ <mkdir dir="${dist.dir}" /> </target> - <target name="copyextradependencies" /> + <target name="copyextradependencies" depends="gettrinidad, getelri, getjbosscommoncore"/> + + <target name="gettrinidad" if="trinidad.lib"> + <copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}"> + <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.5"> + <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" /> + <exclusion groupId="javax.servlet" artifactId="servlet-api" /> + <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/> + <exclusion groupId="javax.faces" artifactId="jsf-api"/> + </dependency> + <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.5"> + <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" /> + <exclusion groupId="javax.servlet" artifactId="servlet-api" /> + <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/> + <exclusion groupId="portlet-api" artifactId="portlet-api"/> + <exclusion groupId="jstl" artifactId="jstl"/> + <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/> + <exclusion groupId="javax.faces" artifactId="jsf-api"/> + <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/> + </dependency> + </copyInlineDependencies> + </target> + + <target name="getelri" if="el-ri.lib"> + <copyInlineDependencies id="elri" scope="runtime" todir="${lib.dir}"> + <dependency groupId="javax.el" artifactId="el-ri" version="1.2" /> + </copyInlineDependencies> + </target> + + <target name="getjbosscommoncore" if="jboss-common-core.lib"> + <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${lib.dir}"> + <dependency groupId="jboss" artifactId="jboss-common-core" version="2.0.2.GA"> + <exclusion groupId="apache-xerces" artifactId="xml-apis" /> + <exclusion groupId="apache-httpclient" artifactId="commons-httpclient" /> + <exclusion groupId="oswego-concurrent" artifactId="concurrent" /> + <exclusion groupId="apache-slide" artifactId="webdavlib" /> + <exclusion groupId="jboss" artifactId="jboss-logging-spi" /> + </dependency> + </copyInlineDependencies> + </target> <!-- Use the Eclipse compiler, if it is available --> <target name="select-compiler"> @@ -523,6 +585,8 @@ <fileset refid="facelets.jar" /> <fileset refid="urlrewrite.jar" /> <fileset refid="richfaces-impl.jar" /> + <fileset refid="trinidad-impl.jar" /> + <fileset refid="jboss-common-core.jar" /> <fileset refid="war.lib.extras" /> <mapper type="flatten" /> </copy> @@ -588,7 +652,10 @@ <fileset refid="wicket-extensions.jar" /> <fileset refid="wicket-datetime.jar" /> <fileset refid="seam.wicket.jar" /> - <fileset refid="seam.remoting.jar" /> + <fileset refid="seam.remoting.jar" /> + <fileset refid="el-ri.jar" /> + <fileset refid="trinidad-api.jar" /> + <fileset refid="jboss-common-core.jar" /> <mapper type="flatten" /> </copy> </target> @@ -780,6 +847,8 @@ <fileset refid="wicket-extensions.jar" /> <fileset refid="wicket-datetime.jar" /> <fileset refid="seam.wicket.jar" /> + <fileset refid="trinidad-api.jar" /> + <fileset refid="el-ri.jar"/> <mapper type="flatten" /> </copy> <copy todir="${war.dir}"> Modified: trunk/examples/hibernate/build-glassfish.xml =================================================================== --- trunk/examples/hibernate/build-glassfish.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/hibernate/build-glassfish.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -16,6 +16,7 @@ <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> <property name="richfaces.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml"/> @@ -30,7 +31,7 @@ <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> + <include name="lib/asm.jar" /> <include name="lib/jboss-common-core.jar" /> <include name="lib/cglib.jar"/> Modified: trunk/examples/hibernate/build-jboss405.xml =================================================================== --- trunk/examples/hibernate/build-jboss405.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/hibernate/build-jboss405.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -15,7 +15,8 @@ <property name="seam.ui.lib" value="true"/> <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> <import file="../build.xml"/> @@ -29,7 +30,6 @@ <include name="lib/jsf-impl.jar"/> <include name="lib/jstl.jar"/> <include name="lib/el-api.jar"/> - <include name="examples/jpa/lib/el-ri.jar" /> </fileset> </project> Modified: trunk/examples/hibernate/build-tomcat55.xml =================================================================== --- trunk/examples/hibernate/build-tomcat55.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/hibernate/build-tomcat55.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -15,7 +15,8 @@ <property name="seam.ui.lib" value="true"/> <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> <import file="../build.xml"/> @@ -36,7 +37,6 @@ <include name="lib/hibernate-validator.jar"/> <include name="lib/javassist.jar"/> <include name="lib/persistence-api.jar" /> - <include name="examples/jpa/lib/el-ri.jar"/> <include name="lib/el-api.jar" /> <include name="lib/cglib.jar"/> <include name="lib/jta.jar"/> Modified: trunk/examples/hibernate/build-weblogic92.xml =================================================================== --- trunk/examples/hibernate/build-weblogic92.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/hibernate/build-weblogic92.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -15,7 +15,9 @@ <property name="seam.ui.lib" value="true"/> <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml"/> @@ -34,7 +36,6 @@ <include name="lib/jsf-api.jar" /> <include name="lib/jsf-impl.jar" /> <include name="lib/jstl.jar" /> - <include name="examples/jpa/lib/el-ri.jar" /> <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> @@ -43,7 +44,6 @@ <include name="lib/hibernate-annotations.jar" /> <include name="lib/hibernate-entitymanager.jar" /> <include name="lib/hibernate-validator.jar" /> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/persistence-api.jar" /> <include name="lib/cglib.jar" /> <include name="lib/antlr.jar" /> Modified: trunk/examples/hibernate/build-websphere61.xml =================================================================== --- trunk/examples/hibernate/build-websphere61.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/hibernate/build-websphere61.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -12,10 +12,12 @@ <property name="exploded-archives.dir" value="exploded-archives-websphere61" /> <!-- Libraries to include --> - <property name="seam.ui.lib" value="true" /> + <property name="seam.ui.lib" value="true" /> <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml" /> @@ -32,7 +34,6 @@ <include name="lib/jsf-api.jar"/> <include name="lib/jsf-impl.jar"/> <include name="lib/jstl.jar"/> - <include name="examples/jpa/lib/el-ri.jar"/> <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> @@ -41,7 +42,6 @@ <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/persistence-api.jar" /> <include name="lib/cglib.jar"/> <include name="lib/antlr.jar" /> Modified: trunk/examples/jee5/booking/build.xml =================================================================== --- trunk/examples/jee5/booking/build.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jee5/booking/build.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -16,6 +16,7 @@ <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> <property name="richfaces.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <!-- add libs for oc4j (broken classloading) --> <!-- <property name="jbpm.lib" value="true"/> @@ -39,7 +40,6 @@ <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/cglib.jar"/> <include name="lib/asm.jar"/> <include name="lib/antlr.jar" /> Modified: trunk/examples/jpa/build-glassfish.xml =================================================================== --- trunk/examples/jpa/build-glassfish.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-glassfish.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -16,6 +16,7 @@ <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> <property name="richfaces.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml"/> @@ -30,7 +31,6 @@ <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/asm.jar" /> <include name="lib/jboss-common-core.jar" /> <include name="lib/cglib.jar"/> Modified: trunk/examples/jpa/build-jboss405.xml =================================================================== --- trunk/examples/jpa/build-jboss405.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-jboss405.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -15,7 +15,8 @@ <property name="seam.ui.lib" value="true"/> <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> <import file="../build.xml"/> @@ -28,7 +29,6 @@ <include name="lib/jsf-impl.jar"/> <include name="lib/jsf-api.jar"/> <include name="lib/jstl.jar"/> - <include name="examples/jpa/lib/el-ri.jar"/> <include name="lib/el-api.jar"/> </fileset> Modified: trunk/examples/jpa/build-tomcat55.xml =================================================================== --- trunk/examples/jpa/build-tomcat55.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-tomcat55.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -15,7 +15,9 @@ <property name="seam.ui.lib" value="true"/> <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml"/> @@ -36,7 +38,6 @@ <include name="lib/jsf-api.jar"/> <include name="lib/jsf-impl.jar"/> <include name="lib/jstl.jar"/> - <include name="examples/jpa/lib/el-ri.jar"/> <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> @@ -45,7 +46,6 @@ <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/persistence-api.jar" /> <include name="lib/asm.jar" /> <include name="lib/cglib.jar"/> Modified: trunk/examples/jpa/build-tomcat6.xml =================================================================== --- trunk/examples/jpa/build-tomcat6.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-tomcat6.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -16,6 +16,7 @@ <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> <property name="richfaces.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml"/> @@ -40,7 +41,6 @@ <include name="lib/jta.jar" /> <include name="lib/antlr.jar" /> <include name="lib/asm.jar" /> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> </fileset> <fileset id="noejb.war.extras" dir="${resources.dir}"> Modified: trunk/examples/jpa/build-weblogic10.xml =================================================================== --- trunk/examples/jpa/build-weblogic10.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-weblogic10.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -13,10 +13,12 @@ value="exploded-archives-weblogic10" /> <!-- Libraries to include --> - <property name="seam.ui.lib" value="true" /> + <property name="seam.ui.lib" value="true" /> <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml" /> @@ -33,7 +35,6 @@ <!-- JSF (and related) implementation --> <include name="lib/jsf-api.jar" /> <include name="lib/jsf-impl.jar" /> - <include name="examples/jpa/lib/el-ri.jar" /> <!-- Hibernate and deps --> <include name="lib/hibernate.jar" /> @@ -41,7 +42,6 @@ <include name="lib/hibernate-annotations.jar" /> <include name="lib/hibernate-entitymanager.jar" /> <include name="lib/hibernate-validator.jar" /> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/cglib.jar" /> <include name="lib/asm.jar"/> <include name="lib/antlr.jar" /> Modified: trunk/examples/jpa/build-weblogic92.xml =================================================================== --- trunk/examples/jpa/build-weblogic92.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-weblogic92.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -13,10 +13,12 @@ value="exploded-archives-weblogic92" /> <!-- Libraries to include --> - <property name="seam.ui.lib" value="true" /> + <property name="seam.ui.lib" value="true" /> <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml" /> @@ -36,7 +38,6 @@ <include name="lib/jsf-api.jar" /> <include name="lib/jsf-impl.jar" /> <include name="lib/jstl.jar" /> - <include name="examples/jpa/lib/el-ri.jar" /> <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> @@ -45,7 +46,6 @@ <include name="lib/hibernate-annotations.jar" /> <include name="lib/hibernate-entitymanager.jar" /> <include name="lib/hibernate-validator.jar" /> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/persistence-api.jar" /> <include name="lib/cglib.jar" /> <include name="lib/antlr.jar" /> Modified: trunk/examples/jpa/build-websphere61.xml =================================================================== --- trunk/examples/jpa/build-websphere61.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/jpa/build-websphere61.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -15,7 +15,9 @@ <property name="seam.ui.lib" value="true"/> <property name="seam.debug.lib" value="true"/> <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> <import file="../build.xml"/> @@ -31,7 +33,6 @@ <!-- JSF (and related) implementation --> <include name="lib/jsf-api.jar"/> <include name="lib/jsf-impl.jar"/> - <include name="examples/jpa/lib/el-ri.jar"/> <include name="lib/el-api.jar" /> <!-- Hibernate and deps --> @@ -40,7 +41,6 @@ <include name="lib/hibernate-annotations.jar"/> <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> - <include name="examples/jpa/lib/jboss-archive-browsing.jar" /> <include name="lib/cglib.jar"/> <include name="lib/asm.jar"/> <include name="lib/antlr.jar" /> Modified: trunk/examples/seamdiscs/build.xml =================================================================== --- trunk/examples/seamdiscs/build.xml 2008-04-25 14:22:28 UTC (rev 8023) +++ trunk/examples/seamdiscs/build.xml 2008-04-25 14:25:28 UTC (rev 8024) @@ -10,59 +10,20 @@ <property name="seam.ui.lib" value="yes"/> <property name="seam.debug.lib" value="yes"/> <property name="facelets.lib" value="yes"/> - <property name="richfaces.lib" value="yes"/> + <property name="richfaces.lib" value="yes"/> + <property name="trinidad.lib" value="yes"/> <import file="../build.xml"/> <property name="example.tmp.lib.dir" value="${basedir}/lib" /> - <fileset id="ear.lib.extras" dir="${example.tmp.lib.dir}"> - <include name="trinidad-api.jar"/> - </fileset> - - <fileset id="war.lib.extras" dir="${example.tmp.lib.dir}"> - <include name="trinidad-impl.jar"/> - </fileset> - <fileset id="war.extras" dir="${resources.dir}"> <include name="WEB-INF/lib/*.jar"/> </fileset> - <path id="build.classpath.extras"> - <fileset dir="${example.tmp.lib.dir}"> - <include name="trinidad-api.jar"/> - </fileset> - </path> - <patternset id="test.resources.files"> <exclude name="import.sql" /> </patternset> - - <target name="copyextradependencies"> - - <artifact:dependencies filesetId="trinidad.fileset" versionsId="trinidad.versions" sourcesfilesetid="trinidad.sources"> - <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.5"> - <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" /> - <exclusion groupId="javax.servlet" artifactId="servlet-api" /> - <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/> - <exclusion groupId="javax.faces" artifactId="jsf-api"/> - </dependency> - <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.5"> - <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" /> - <exclusion groupId="javax.servlet" artifactId="servlet-api" /> - <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/> - <exclusion groupId="portlet-api" artifactId="portlet-api"/> - <exclusion groupId="jstl" artifactId="jstl"/> - <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/> - <exclusion groupId="javax.faces" artifactId="jsf-api"/> - <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/> - </dependency> - </artifact:dependencies> - <copy todir="${example.tmp.lib.dir}"> - <fileset refid="trinidad.fileset" /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${trinidad.versions}" to="flatten" /> - </copy> - </target> </project>