Author: jbalunas(a)redhat.com Date: 2008-06-09 14:18:26 -0400 (Mon, 09 Jun 2008) New Revision: 8364 Modified: trunk/build/core.pom.xml trunk/build/root.pom.xml trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml trunk/examples/build.xml trunk/examples/hibernate/build-glassfish.xml trunk/examples/jpa/build-glassfish.xml trunk/examples/jpa/build.xml trunk/seam-gen/build.xml Log: port of JBSEAM-2833 to trunk Modified: trunk/build/core.pom.xml =================================================================== --- trunk/build/core.pom.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/build/core.pom.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -306,6 +306,12 @@ <artifactId>jboss-vfs</artifactId> <optional>true</optional> </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <optional>true</optional> + </dependency> </dependencies> Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/build/root.pom.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -783,6 +783,12 @@ <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> <version>2.0.0.Beta11</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -790,6 +796,12 @@ <artifactId>jboss-common-logging-spi</artifactId> <version>2.0.4.GA</version> </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.0.4.GA</version> + </dependency> <dependency> <groupId>com.lowagie</groupId> Modified: trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -199,6 +199,11 @@ </simpara> </listitem> <listitem> + <simpara> + <literal>concurrent.jar</literal> + </simpara> + </listitem> + <listitem> <simpara><literal>log4j.jar</literal> &#8212; This can be left out if you are not going to configure log4j. If it is packaged but not @@ -915,6 +920,7 @@ <include name="lib/asm.jar"/> <include name="lib/commons-beanutils.jar"/> <include name="lib/commons-digester.jar"/> +<include name="lib/concurrent.jar"/> <include name="lib/antlr.jar"/>]]></programlisting> </listitem> </itemizedlist> @@ -950,6 +956,7 @@ <include name="lib/asm.jar"/> <include name="lib/commons-beanutils.jar"/> <include name="lib/commons-digester.jar"/> + <include name="lib/concurrent.jar"/> <include name="lib/antlr.jar"/> </fileset>]]></programlisting> </section> Modified: trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -823,20 +823,7 @@ <include name="*.cfg.xml" /> <include name="*.xsd" /> </fileset>]]></programlisting> - </listitem> - <listitem> - <para> - Then finally we need to add two jars to - the - <literal>EAR</literal> - . Add these two lines to the - <literal>ear.lib.extras</literal> - fileset. - </para> - <programlisting role="XML"><![CDATA[ - <include name="examples/wiki/lib/jboss-archive-browsing.jar" /> - <include name="lib/concurrent.jar" />]]></programlisting> - </listitem> + </listitem> </itemizedlist> </listitem> </varlistentry> @@ -985,7 +972,7 @@ command: <programlisting> - ant -f build-weblogic10.xml + ant weblogic10.xml </programlisting> This will create a container specific distribution and exploded archive directories. @@ -1162,7 +1149,7 @@ </listitem> <listitem> <simpara> - <literal>jboss-archive-browsing.jar</literal> + <literal>jboss-common-core.jar</literal> </simpara> </listitem> </itemizedlist> @@ -1202,6 +1189,11 @@ <literal>javassist.jar</literal> </simpara> </listitem> + <listitem> + <simpara> + <literal>concurrent.jar</literal> + </simpara> + </listitem> </itemizedlist> </listitem> </itemizedlist> @@ -1477,23 +1469,7 @@ application.</para> <itemizedlist> - <listitem> - <para>Missing jar &#8212; There is one library that - <literal>seam-gen</literal> does not provide by - default. This needs to be copied into your projects - <literal>/lib</literal> directory manually. - </para> - <itemizedlist> - <listitem> - <para>jboss-archive-browsing.jar &#8212; can - be found in the - <literal>@SEAM_DIST/examples/wiki/lib</literal> - directory. </para> - </listitem> - </itemizedlist> - </listitem> - <listitem> <para>build.xml &#8212; Now we need to adjust the <literal>build.xml</literal>. Find the target <literal>war</literal> and add the following to the end @@ -1514,7 +1490,8 @@ <include name="hibernate-annotations.jar" /> <include name="hibernate-entitymanager.jar" /> <include name="hibernate-validator.jar" /> - <include name="jboss-archive-browsing.jar" /> + <include name="jboss-common-core.jar" /> + <include name="concurrent.jar" /> </fileset> </copy>]]></programlisting> </listitem> Modified: trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml =================================================================== --- trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -897,7 +897,7 @@ </listitem> <listitem> <simpara> - <literal>jboss-archive-browsing.jar</literal> + <literal>jboss-common-core.jar</literal> </simpara> </listitem> </itemizedlist> </para> @@ -951,6 +951,11 @@ <literal>javassist.jar</literal> </simpara> </listitem> + <listitem> + <simpara> + <literal>concurrent.jar</literal> + </simpara> + </listitem> </itemizedlist> </para> </listitem> </itemizedlist> </para> @@ -1433,19 +1438,12 @@ <include name="lib/el-ri.jar"/>]]></programlisting> </listitem> <listitem> - <para> Third party dependencies. You will need to copy the - <literal>jboss-archive-browsing.jar</literal> from the - <literal>$SEAM/examples/jpa/lib</literal> directory into the - the projects <literal>/lib</literal> directory. You will - also need to acquire the <literal>concurrent.jar</literal> - and place it in the same directory. You can get this from - any jboss distribution or just search for it.</para> + <para> Third party dependencies.</para> <programlisting role="XML"><![CDATA[ <!-- 3rd party and supporting jars --> <!--<include name="lib/log4j.jar" />--> <include name="lib/javassist.jar"/> <include name="lib/dom4j.jar" /> - <include name="lib/jboss-archive-browsing.jar" /> <include name="lib/concurrent.jar" /> <include name="lib/cglib.jar"/> <include name="lib/asm.jar"/> @@ -1494,7 +1492,6 @@ <!--<include name="lib/log4j.jar" />--> <include name="lib/javassist.jar"/> <include name="lib/dom4j.jar" /> - <include name="lib/jboss-archive-browsing.jar" /> <include name="lib/concurrent.jar" /> <include name="lib/cglib.jar"/> <include name="lib/asm.jar"/> Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/examples/build.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -331,6 +331,7 @@ <fileset id="jboss-common-core.jar" dir="${lib.dir}"> <include name="jboss-common-core.jar" if="jboss-common-core.lib" /> + <include name="concurrent.jar" if="jboss-common-core.lib" /> </fileset> <!-- ############################ MELDWARE ############################ --> @@ -500,7 +501,7 @@ <mkdir dir="${dist.dir}" /> </target> - <target name="copyextradependencies" depends="gettrinidad, getelri, getjbosscommoncore"/> + <target name="copyextradependencies" depends="gettrinidad, getelri"/> <target name="gettrinidad" if="trinidad.lib"> <copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}"> @@ -528,18 +529,6 @@ <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"> Modified: trunk/examples/hibernate/build-glassfish.xml =================================================================== --- trunk/examples/hibernate/build-glassfish.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/examples/hibernate/build-glassfish.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -33,7 +33,6 @@ <include name="lib/hibernate-validator.jar"/> <include name="lib/asm.jar" /> - <include name="lib/jboss-common-core.jar" /> <include name="lib/cglib.jar"/> <include name="lib/antlr.jar" /> <include name="lib/commons-logging.jar" /> Modified: trunk/examples/jpa/build-glassfish.xml =================================================================== --- trunk/examples/jpa/build-glassfish.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/examples/jpa/build-glassfish.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -32,7 +32,6 @@ <include name="lib/hibernate-entitymanager.jar"/> <include name="lib/hibernate-validator.jar"/> <include name="lib/asm.jar" /> - <include name="lib/jboss-common-core.jar" /> <include name="lib/cglib.jar"/> <include name="lib/antlr.jar" /> <include name="lib/commons-logging.jar" /> Modified: trunk/examples/jpa/build.xml =================================================================== --- trunk/examples/jpa/build.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/examples/jpa/build.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -25,6 +25,10 @@ <target name="weblogic92" description="Build the JPA artifacts, suitable for deployment to WebLogic 9.2"> <ant antfile="build-weblogic92.xml"/> </target> + + <target name="weblogic10" description="Build the JPA artifacts, suitable for deployment to WebLogic 10"> + <ant antfile="build-weblogic10.xml"/> + </target> <target name="websphere61" description="Build the JPA artifacts, suitable for deployment to WebSphere 6.1.0.13 + EJB3 FP"> <ant antfile="build-websphere61.xml"/> @@ -43,13 +47,14 @@ <ant antfile="build-jboss405.xml" target="clean" /> <ant antfile="build-glassfish.xml" target="clean" /> <ant antfile="build-weblogic92.xml" target="clean" /> + <ant antfile="build-weblogic10.xml" target="clean" /> <ant antfile="build-websphere61.xml" target="clean" /> <ant antfile="build-tomcat55.xml" target="clean" /> <ant antfile="build-tomcat6.xml" target="clean" /> <ant antfile="build-jboss-embedded.xml" target="clean" /> </target> - <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat55, tomcat6"/> + <target name="all" depends="jboss, jboss405, glassfish, weblogic92,weblogic10, websphere61, tomcat55, tomcat6"/> <target name="test"> <ant antfile="build-jboss.xml" target="test" /> Modified: trunk/seam-gen/build.xml =================================================================== --- trunk/seam-gen/build.xml 2008-06-09 18:17:03 UTC (rev 8363) +++ trunk/seam-gen/build.xml 2008-06-09 18:18:26 UTC (rev 8364) @@ -1079,6 +1079,7 @@ <pathelement path="../lib/asm.jar" /> <pathelement path="../lib/core.jar" /> <pathelement path="../lib/jboss-common-core.jar" /> + <pathelement path="../lib/concurrent.jar"/> <pathelement path="${driver.jar}"/> <pathelement path="../lib/jboss-seam-gen.jar"/> </path>