[seam-commits] Seam SVN: r7828 - branches/Seam_2_0/build and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Apr 7 10:08:06 EDT 2008
Author: pete.muir at jboss.org
Date: 2008-04-07 10:08:06 -0400 (Mon, 07 Apr 2008)
New Revision: 7828
Modified:
branches/Seam_2_0/build.xml
branches/Seam_2_0/build/common.build.xml
branches/Seam_2_0/build/core.pom.xml
branches/Seam_2_0/build/utilities.build.xml
trunk/build.xml
trunk/build/common.build.xml
trunk/build/core.pom.xml
trunk/build/utilities.build.xml
Log:
Generate a jboss-seam-wls-compatible.jar that excludes TimerServiceDispatcher
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build/common.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -92,7 +92,8 @@
<install pom="${root.pom}" />
<pomfile name="parent.pom" value="${build.dir}/parent.pom.xml" />
<install pom="${parent.pom}" />
- <pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
+ <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" />
@@ -108,7 +109,6 @@
<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
Modified: branches/Seam_2_0/build/core.pom.xml
===================================================================
--- branches/Seam_2_0/build/core.pom.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build/core.pom.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -4,7 +4,7 @@
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</artifactId>
+ <artifactId>@artifact.name@</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>parent</artifactId>
Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build/utilities.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -11,6 +11,7 @@
<macrodef name="pomfile">
<attribute name="name" />
<attribute name="value" />
+ <attribute name="artifactName" default=""/>
<attribute name="todir" default="${tmp.dir}/poms" />
<attribute name="tofile" default="@{todir}/@{name}" />
<sequential>
@@ -18,6 +19,7 @@
<copy file="@{value}" tofile="@{tofile}" overwrite="on" verbose="false">
<filterset>
<filter token="seam.version" value="${complete.version}" />
+ <filter token="artifact.name" value="@{artifactName}" />
</filterset>
</copy>
<property name="@{name}" value="@{tofile}" />
Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ branches/Seam_2_0/build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -185,6 +185,11 @@
<target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management">
<archive classesdir="${classes.core.dir}" module="jboss-seam" pom="${core.pom}" srcdir="${src.core.dir}" />
+ <archive classesdir="${classes.core.dir}" module="jboss-seam-wls-compatible" pom="${core.wls.pom}" srcdir="${src.core.dir}" outputdir="${lib.dir}/interop">
+ <excludes>
+ <exclude name="org/jboss/seam/async/TimerServiceDispatcher*" />
+ </excludes>
+ </archive>
</target>
<!-- ########################### PDF TARGETS ###########################-->
@@ -752,6 +757,7 @@
<attribute name="pom" />
<attribute name="srcdir" />
<attribute name="outputdir" default="${lib.dir}" />
+ <element name="excludes" optional="true"/>
<sequential>
<mkdir dir="@{outputdir}" />
<mkdir dir="@{outputdir}/src" />
@@ -759,6 +765,7 @@
<include name="**/*.class" />
<exclude name="**/test/*.class" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
@@ -768,6 +775,7 @@
<include name="**/*.java" />
<exclude name="**/test/*.java" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build/common.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -93,6 +93,7 @@
<pomfile name="parent.pom" value="${build.dir}/parent.pom.xml" />
<install pom="${parent.pom}" />
<pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
+ <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="wicket.pom" value="${build.dir}/wicket.pom.xml" />
<pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" />
@@ -111,7 +112,6 @@
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
@@ -120,7 +120,6 @@
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build/core.pom.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -4,7 +4,7 @@
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</artifactId>
+ <artifactId>@artifact.name@</artifactId>
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>parent</artifactId>
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build/utilities.build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -11,6 +11,7 @@
<macrodef name="pomfile">
<attribute name="name" />
<attribute name="value" />
+ <attribute name="artifactName" default=""/>
<attribute name="todir" default="${tmp.dir}/poms" />
<attribute name="tofile" default="@{todir}/@{name}" />
<sequential>
@@ -18,6 +19,7 @@
<copy file="@{value}" tofile="@{tofile}" overwrite="on" verbose="false">
<filterset>
<filter token="seam.version" value="${complete.version}" />
+ <filter token="artifact.name" value="@{artifactName}" />
</filterset>
</copy>
<property name="@{name}" value="@{tofile}" />
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-04-07 12:48:53 UTC (rev 7827)
+++ trunk/build.xml 2008-04-07 14:08:06 UTC (rev 7828)
@@ -189,6 +189,11 @@
<target name="jarcore" depends="compilecore" description="Build the distribution .jar file using M2 dependency management">
<archive classesdir="${classes.core.dir}" module="jboss-seam" pom="${core.pom}" srcdir="${src.core.dir}" />
+ <archive classesdir="${classes.core.dir}" module="jboss-seam-wls-compatible" pom="${core.wls.pom}" srcdir="${src.core.dir}" outputdir="${lib.dir}/interop">
+ <excludes>
+ <exclude name="org/jboss/seam/async/TimerServiceDispatcher*" />
+ </excludes>
+ </archive>
</target>
<!-- ########################### PDF TARGETS ###########################-->
@@ -798,6 +803,7 @@
<attribute name="pom" />
<attribute name="srcdir" />
<attribute name="outputdir" default="${lib.dir}" />
+ <element name="excludes" optional="true"/>
<sequential>
<mkdir dir="@{outputdir}" />
<mkdir dir="@{outputdir}/src" />
@@ -805,6 +811,7 @@
<include name="**/*.class" />
<exclude name="**/test/*.class" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
@@ -814,6 +821,7 @@
<include name="**/*.java" />
<exclude name="**/test/*.java" />
<patternset refid="meta.files" />
+ <excludes />
<manifest>
<attribute name="Seam-Version" value="${complete.version}" />
<attribute name="Implementation-Version" value="${complete.version}" />
More information about the seam-commits
mailing list