[jboss-cvs] jboss-seam/build ...
Peter Muir
peter at bleepbleep.org.uk
Thu Dec 6 08:06:35 EST 2007
User: pmuir
Date: 07/12/06 08:06:35
Modified: build core.pom.xml common.build.xml root.pom.xml
build.xml
Log:
Seam specific build of embedded that incorporates hsearch and restores name to jboss-embedded-api.jar for Tools compatibility
Revision Changes Path
1.33 +2 -2 jboss-seam/build/core.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: core.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/core.pom.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- core.pom.xml 5 Dec 2007 16:37:17 -0000 1.32
+++ core.pom.xml 6 Dec 2007 13:06:35 -0000 1.33
@@ -260,8 +260,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded</artifactId>
+ <groupId>org.jboss.seam.embedded</groupId>
+ <artifactId>jboss-embedded-api</artifactId>
<optional>true</optional>
</dependency>
1.16 +2 -2 jboss-seam/build/common.build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: common.build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- common.build.xml 5 Dec 2007 16:37:17 -0000 1.15
+++ common.build.xml 6 Dec 2007 13:06:35 -0000 1.16
@@ -144,8 +144,8 @@
<!-- Exclude the embedded api, its a dep of Seam core -->
<exclusion groupId="org.jboss.embedded" artifactId="jboss-embedded" />
</dependency>
- <dependency groupId="org.jboss.embedded" artifactId="thirdparty-all" version="${embedded.version}" />
- <dependency groupId="org.jboss.embedded" artifactId="hibernate-all" version="${embedded.version}" />
+ <dependency groupId="org.jboss.seam.embedded" artifactId="thirdparty-all" version="${embedded.version}" />
+ <dependency groupId="org.jboss.seam.embedded" artifactId="hibernate-all" version="${embedded.version}" />
<remoteRepository refId="repository.jboss.org" />
<remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
</artifact:dependencies>
1.47 +2 -2 jboss-seam/build/root.pom.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: root.pom.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/root.pom.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- root.pom.xml 5 Dec 2007 16:37:17 -0000 1.46
+++ root.pom.xml 6 Dec 2007 13:06:35 -0000 1.47
@@ -655,8 +655,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded</artifactId>
+ <groupId>org.jboss.seam.embedded</groupId>
+ <artifactId>jboss-embedded-api</artifactId>
<version>beta3-SNAPSHOT</version>
</dependency>
1.19 +24 -8 jboss-seam/build/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/build/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- build.xml 5 Dec 2007 16:32:22 -0000 1.18
+++ build.xml 6 Dec 2007 13:06:35 -0000 1.19
@@ -4,11 +4,12 @@
<property file="default.build.properties" />
<property file="build.properties" />
- <property name="embedded.jars.dir" value="${embedded.dir}/output/lib/embedded-jboss/lib"/>
-
<property name="seam.dir" value="${basedir}/../" />
<import file="common.build.xml" />
+ <property name="embedded.jars.dir" value="${tmp.dir}/embedded"/>
+ <property name="original.embedded.jars.dir" value="${embedded.dir}/output/lib/embedded-jboss/lib" />
+
<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
<artifact:remoteRepository id="offline.repository.jboss.org" url="file:///${offline.repository.jboss.org}" />
@@ -125,30 +126,45 @@
<offline pom="debug.pom" repository="${offline.repository.jboss.org}" />
</target>
- <target name="installEmbedded">
+ <target name="shadeEmbedded">
+ <delete dir="${embedded.jars.dir}" failonerror="off"/>
+ <mkdir dir="${embedded.jars.dir}" />
+ <jar destfile="${embedded.jars.dir}/hibernate-all.jar" >
+ <zipfileset src="${original.embedded.jars.dir}/hibernate-all.jar" />
+ <zipfileset src="${lib.dir}/hibernate-search.jar" />
+ </jar>
+ <jar destfile="${embedded.jars.dir}/thirdparty-all.jar">
+ <zipfileset src="${original.embedded.jars.dir}/thirdparty-all.jar" />
+ <zipfileset src="${lib.dir}/lucene-core.jar"/>
+ </jar>
+ <copy file="${original.embedded.jars.dir}/jboss-embedded.jar" todir="${embedded.jars.dir}" />
+ <copy file="${original.embedded.jars.dir}/jboss-embedded-all.jar" todir="${embedded.jars.dir}" />
+ </target>
+
+ <target name="installEmbedded" depends="shadeEmbedded">
<install pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" />
<install pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" />
<install pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" />
<install pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" />
</target>
- <target name="deployEmbeddedSnapshot" depends="initdav">
+ <target name="deployEmbeddedSnapshot" depends="initdav, shadeEmbedded">
<input addproperty="username"
message="JBoss.org username:" />
<input addproperty="password"
message="JBoss.org password:" />
- <!--<deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="snapshots.jboss.org" attachment="${embedded.dir}/embedded-jboss-${embedded.version}.zip" unique="false">
+ <deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="snapshots.jboss.org" attachment="${embedded.dir}/embedded-jboss-${embedded.version}.zip" unique="false">
<authentication username="${username}" password="${password}" />
- </deployWithAttachment>-->
+ </deployWithAttachment>
<deploy pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="snapshots.jboss.org" unique="false">
<authentication username="${username}" password="${password}" />
</deploy>
- <!--<deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="snapshots.jboss.org" unique="false">
+ <deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="snapshots.jboss.org" unique="false">
<authentication username="${username}" password="${password}" />
</deploy>
<deploy pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" repositoryId="snapshots.jboss.org" unique="false">
<authentication username="${username}" password="${password}" />
- </deploy>-->
+ </deploy>
</target>
<macrodef name="offline">
More information about the jboss-cvs-commits
mailing list