[seam-commits] Seam SVN: r8360 - in branches/Seam_2_0: doc/Seam_Reference_Guide/en-US and 4 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Jun 9 13:22:02 EDT 2008
Author: jbalunas at redhat.com
Date: 2008-06-09 13:22:02 -0400 (Mon, 09 Jun 2008)
New Revision: 8360
Modified:
branches/Seam_2_0/build/root.pom.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml
branches/Seam_2_0/examples/build.xml
branches/Seam_2_0/examples/hibernate/build-glassfish.xml
branches/Seam_2_0/examples/hibernate/build-websphere61.xml
branches/Seam_2_0/examples/jpa/build-glassfish.xml
branches/Seam_2_0/seam-gen/build.xml
Log:
JBSEAM-2833 - updated handling of jboss-common-core.jar and concurrent.jar. This also included updating the interop reference guides to match, and the changing some of the example build files to remove duplicate entries.
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/build/root.pom.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -713,6 +713,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>
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Oc4j.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -199,6 +199,11 @@
</simpara>
</listitem>
<listitem>
+ <simpara>
+ <literal>concurrent.jar</literal>
+ </simpara>
+ </listitem>
+ <listitem>
<simpara><literal>log4j.jar</literal>
— 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: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Weblogic.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -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 — 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 — can
- be found in the
- <literal>@SEAM_DIST/examples/wiki/lib</literal>
- directory. </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
<para>build.xml — 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: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Websphere.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -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: branches/Seam_2_0/examples/build.xml
===================================================================
--- branches/Seam_2_0/examples/build.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/build.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -310,6 +310,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 ############################ -->
@@ -472,7 +473,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}">
@@ -500,18 +501,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: branches/Seam_2_0/examples/hibernate/build-glassfish.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-glassfish.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/hibernate/build-glassfish.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -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: branches/Seam_2_0/examples/hibernate/build-websphere61.xml
===================================================================
--- branches/Seam_2_0/examples/hibernate/build-websphere61.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/hibernate/build-websphere61.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -29,7 +29,8 @@
<!-- Misc -->
<include name="lib/commons-beanutils.jar"/>
<include name="lib/commons-digester.jar"/>
- <include name="lib/commons-collections.jar"/>
+ <include name="lib/commons-collections.jar"/>
+
<!-- JSF (and related) implementation -->
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
Modified: branches/Seam_2_0/examples/jpa/build-glassfish.xml
===================================================================
--- branches/Seam_2_0/examples/jpa/build-glassfish.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/examples/jpa/build-glassfish.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -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: branches/Seam_2_0/seam-gen/build.xml
===================================================================
--- branches/Seam_2_0/seam-gen/build.xml 2008-06-09 16:59:59 UTC (rev 8359)
+++ branches/Seam_2_0/seam-gen/build.xml 2008-06-09 17:22:02 UTC (rev 8360)
@@ -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>
More information about the seam-commits
mailing list