[jboss-svn-commits] JBL Code SVN: r14248 - in labs/shotoku/trunk: lib and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 15 08:00:04 EDT 2007
Author: adamw
Date: 2007-08-15 08:00:04 -0400 (Wed, 15 Aug 2007)
New Revision: 14248
Added:
labs/shotoku/trunk/lib/jboss-cache/
labs/shotoku/trunk/lib/jboss-cache/jboss-cache.jar
labs/shotoku/trunk/lib/jboss-cache/jgroups.jar
labs/shotoku/trunk/shotoku-cache/lib/
labs/shotoku/trunk/shotoku-cache/lib/ant-contrib/
labs/shotoku/trunk/shotoku-cache/lib/ant-contrib/ant-contrib-1.0b3.jar
Modified:
labs/shotoku/trunk/maven.xml
labs/shotoku/trunk/project.properties
labs/shotoku/trunk/shotoku-cache/build.xml
labs/shotoku/trunk/shotoku-cache/cache-base/build.xml
labs/shotoku/trunk/shotoku-cache/cache-service/build.xml
labs/shotoku/trunk/shotoku-cache/cache-test/
labs/shotoku/trunk/shotoku-cache/cache-test/build.xml
Log:
Fixing build
Added: labs/shotoku/trunk/lib/jboss-cache/jboss-cache.jar
===================================================================
(Binary files differ)
Property changes on: labs/shotoku/trunk/lib/jboss-cache/jboss-cache.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: labs/shotoku/trunk/lib/jboss-cache/jgroups.jar
===================================================================
(Binary files differ)
Property changes on: labs/shotoku/trunk/lib/jboss-cache/jgroups.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: labs/shotoku/trunk/maven.xml
===================================================================
--- labs/shotoku/trunk/maven.xml 2007-08-15 10:44:49 UTC (rev 14247)
+++ labs/shotoku/trunk/maven.xml 2007-08-15 12:00:04 UTC (rev 14248)
@@ -29,14 +29,22 @@
<!-- Main goals -->
<goal name="shotoku:build">
- <ant:ant dir="shotoku-cache" inheritrefs="false" target="dist" />
+ <ant:exec dir="${shotoku.root.dir}/shotoku-cache" executable="ant">
+ <ant:arg line="dist" />
+ <ant:arg line="-Dmodules.list=cache-base,cache-service" />
+ <ant:arg line="-Djboss.home=${local.server.dir}" />
+ </ant:exec>
+
<j:set var="goal" value="build" />
<attainGoal name="shotoku-all-projects" />
</goal>
<goal name="shotoku:deploy">
- <j:set var="jboss.home" value="${local.server.dir}" />
- <ant:ant dir="shotoku-cache" inheritAll="true" target="deploy" />
+ <ant:exec dir="${shotoku.root.dir}/shotoku-cache" executable="ant">
+ <ant:arg line="deploy" />
+ <ant:arg line="-Dmodules.list=cache-base,cache-service" />
+ <ant:arg line="-Djboss.home=${local.server.dir}" />
+ </ant:exec>
<!-- -->
Modified: labs/shotoku/trunk/project.properties
===================================================================
--- labs/shotoku/trunk/project.properties 2007-08-15 10:44:49 UTC (rev 14247)
+++ labs/shotoku/trunk/project.properties 2007-08-15 12:00:04 UTC (rev 14248)
@@ -43,6 +43,6 @@
maven.jar.jboss-blog-common=${shotoku.root.dir}/lib/jboss-blog/jboss-blog-common.jar
-maven.jar.shotoku-cache=${shotoku.root.dir}/shotoku-cache/dist/shotoku-cache.jar
-maven.jar.jboss-cache=${shotoku.root.dir}/shotoku-cache/lib/jboss-cache.jar
-maven.jar.jgroups=${shotoku.root.dir}/shotoku-cache/lib/jgroups.jar
+maven.jar.shotoku-cache=${shotoku.root.dir}/shotoku-cache/cache-base/dist/shotoku-cache.jar
+maven.jar.jboss-cache=${shotoku.root.dir}/lib/jboss-cache/jboss-cache.jar
+maven.jar.jgroups=${shotoku.root.dir}/lib/jboss-cache/jgroups.jar
Modified: labs/shotoku/trunk/shotoku-cache/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/build.xml 2007-08-15 10:44:49 UTC (rev 14247)
+++ labs/shotoku/trunk/shotoku-cache/build.xml 2007-08-15 12:00:04 UTC (rev 14248)
@@ -1,72 +1,74 @@
<?xml version='1.0' encoding='UTF-8'?>
<project name="Shotoku Cache" default="build" basedir=".">
- <!-- Configuration of deployment -->
- <property name="jboss.home" value="/home/adamw/jboss/jboss-cache" />
- <property name="jboss.conf" value="default" />
+ <!-- Configuration of deployment -->
+ <property name="jboss.home" value="/home/adamw/jboss/jboss-cache" />
+ <property name="jboss.conf" value="default" />
<property name="jboss.lib" value="${jboss.home}/server/${jboss.conf}/lib" />
<property name="jboss.deploy" value="${jboss.home}/server/${jboss.conf}/deploy" />
+
+ <property name="modules.list" value="cache-base,cache-service,cache-test" />
- <!-- Configuration of source/ target directories -->
- <property name="src" value="src"/>
- <property name="src.java" value="${src}/java"/>
- <property name="src.meta" value="${src}/etc"/>
- <property name="src.web" value="${src}/web"/>
- <property name="build" value="build"/>
- <property name="dist" value="dist"/>
+ <!-- Configuration of source/ target directories -->
+ <property name="src" value="src"/>
+ <property name="src.java" value="${src}/java"/>
+ <property name="src.meta" value="${src}/etc"/>
+ <property name="src.web" value="${src}/web"/>
+ <property name="build" value="build"/>
+ <property name="dist" value="dist"/>
- <!-- Dependency jars filesets definitions -->
- <fileset id="jboss.lib.1" dir="${jboss.lib}"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.lib.2" dir="${jboss.home}/lib"><include name="**/*.jar"/></fileset>
+ <!-- Dependency jars filesets definitions -->
+ <fileset id="jboss.lib.1" dir="${jboss.lib}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset id="jboss.lib.2" dir="${jboss.home}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+
+ <!-- Helper tasks -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="/home/adamw/shotoku/shotoku-cache/lib/ant-contrib/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+
+ <target name="each-module">
+ <for list="${modules.list}" param="module.name">
+ <sequential>
+ <ant dir="@{module.name}" inheritrefs="true" target="${target.name}" />
+ </sequential>
+ </for>
+ </target>
- <!-- Helper tasks -->
- <target name="each-module">
- <ant dir="cache-base" inheritrefs="true" target="${target.name}" />
- <ant dir="cache-service" inheritrefs="true" target="${target.name}" />
- <!--<ant dir="cache-test" inheritrefs="true" target="${target.name}" />-->
- </target>
+ <!-- Main tasks -->
+ <target name="clean">
+ <delete dir="${dist}" />
+ <antcall target="each-module">
+ <param name="target.name" value="clean" />
+ </antcall>
+ </target>
- <!-- Main tasks -->
- <target name="clean">
- <delete dir="${dist}" />
- <antcall target="each-module">
- <param name="target.name" value="clean" />
- </antcall>
- </target>
+ <target name="build" depends="clean">
+ <antcall target="each-module">
+ <param name="target.name" value="build" />
+ </antcall>
+ </target>
- <target name="build" depends="clean">
- <antcall target="each-module">
- <param name="target.name" value="build" />
- </antcall>
- </target>
+ <target name="dist" depends="build">
+ <antcall target="each-module">
+ <param name="target.name" value="dist" />
+ </antcall>
+ </target>
- <target name="dist" depends="build">
- <antcall target="each-module">
- <param name="target.name" value="dist" />
- </antcall>
-
- <!-- Copying the meta information
- <mkdir dir="${dist.main.dir}" />
- <copy todir="${dist.main.dir}">
- <fileset dir="${src.meta}"><include name="**/*" /></fileset>
- </copy>
-
- <antcall target="each-module">
- <param name="target.name" value="dist" />
- </antcall>-->
- </target>
+ <target name="deploy" depends="dist,undeploy">
+ <antcall target="each-module">
+ <param name="target.name" value="deploy" />
+ </antcall>
+ </target>
- <target name="deploy" depends="dist,undeploy">
- <!-- Copying the sar directory to the jboss deploy dir -->
- <copy todir="${deploy.dir}">
- <fileset dir="${dist}">
- <include name="${sar.name}/**" />
- </fileset>
- </copy>
- </target>
-
- <target name="undeploy">
- <!-- Deleting old deployment -->
- <delete dir="${deploy.dir}/${sar.name}" />
- </target>
+ <target name="undeploy">
+ <antcall target="each-module">
+ <param name="target.name" value="undeploy" />
+ </antcall>
+ </target>
</project>
Modified: labs/shotoku/trunk/shotoku-cache/cache-base/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-base/build.xml 2007-08-15 10:44:49 UTC (rev 14247)
+++ labs/shotoku/trunk/shotoku-cache/cache-base/build.xml 2007-08-15 12:00:04 UTC (rev 14248)
@@ -1,12 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<project name="Shotoku Cache Base">
+ <property name="jar.name" value="shotoku-cache.jar" />
+
<!-- Classpath for building the application: includes all dependency jars -->
<path id="base.jars">
<fileset refid="jboss.lib.1" />
<fileset refid="jboss.lib.2" />
</path>
-
+
<!-- BUILD TARGETS -->
<target name="init">
@@ -26,11 +28,23 @@
<mkdir dir="${dist}" />
<!-- Creating the jar with the classes -->
- <jar destfile="${dist}/shotoku-cache.jar" basedir="${build}" />
+ <jar destfile="${dist}/${jar.name}" basedir="${build}" />
</target>
<target name="clean">
<delete dir="${build}" />
<delete dir="${dist}" />
</target>
+
+ <target name="deploy">
+ <copy todir="${jboss.lib}">
+ <fileset dir="${dist}">
+ <include name="${jar.name}" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="undeploy">
+ <delete file="${jboss.lib}/${jar.name}" />
+ </target>
</project>
Modified: labs/shotoku/trunk/shotoku-cache/cache-service/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-service/build.xml 2007-08-15 10:44:49 UTC (rev 14247)
+++ labs/shotoku/trunk/shotoku-cache/cache-service/build.xml 2007-08-15 12:00:04 UTC (rev 14248)
@@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="JBoss Blog Services">
+<project name="Shotoku Cache Service">
+ <property name="sar.name" value="shotoku-cache-service.sar" />
+
<!-- Classpath for building the application: includes all dependency jars -->
<path id="base.jars">
<fileset refid="jboss.lib.1" />
@@ -23,27 +25,37 @@
<classpath path="../cache-base/${build}" />
</javac>
</target>
-
- <property name="sar.dir" value="${dist}/shotoku-cache-service.sar" />
<target name="dist">
<mkdir dir="${dist}" />
<!-- Copying the meta information -->
- <mkdir dir="${sar.dir}" />
- <copy todir="${sar.dir}">
+ <mkdir dir="${dist}/${sar.name}" />
+ <copy todir="${dist}/${sar.name}">
<fileset dir="${src.meta}">
<include name="**/*" />
</fileset>
</copy>
<!-- Creating the jar with the classes -->
- <mkdir dir="${sar.dir}/lib" />
- <jar destfile="${sar.dir}/lib/shotoku-cache-service.jar" basedir="${build}" />
+ <mkdir dir="${dist}/${sar.name}/lib" />
+ <jar destfile="${dist}/${sar.name}/lib/shotoku-cache-service.jar" basedir="${build}" />
</target>
<target name="clean">
<delete dir="${build}" />
<delete dir="${dist}" />
</target>
+
+ <target name="deploy">
+ <copy todir="${jboss.deploy}">
+ <fileset dir="${dist}">
+ <include name="${sar.name}/**" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="undeploy">
+ <delete dir="${jboss.deploy}/${sar.name}" />
+ </target>
</project>
Property changes on: labs/shotoku/trunk/shotoku-cache/cache-test
___________________________________________________________________
Name: svn:ignore
- .project
.settings
.classpath
bin
target
dist
+ .project
.settings
.classpath
bin
target
build
dist
Modified: labs/shotoku/trunk/shotoku-cache/cache-test/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-test/build.xml 2007-08-15 10:44:49 UTC (rev 14247)
+++ labs/shotoku/trunk/shotoku-cache/cache-test/build.xml 2007-08-15 12:00:04 UTC (rev 14248)
@@ -1,58 +1,58 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="JBoss Blog View">
- <!-- Classpath for building the application: includes all dependency jars -->
- <path id="base.jars">
- <fileset refid="portlet.jars" />
- <fileset refid="jstl.jars" />
- <fileset refid="jboss.jars" />
- </path>
+<project name="Shotoku Cache Test">
+ <property name="war.name" value="shotoku-cache-test.war" />
- <!-- BUILD TARGETS -->
+ <!-- Classpath for building the application: includes all dependency jars -->
+ <path id="base.jars">
+ <fileset refid="jboss.lib.1" />
+ <fileset refid="jboss.lib.2" />
+ </path>
- <target name="init">
+ <!-- BUILD TARGETS -->
- </target>
+ <target name="init">
- <!--<target name="copy-libs-for-servlet" unless="jboss.portal.present">
- <copy todir="${dist.lib.dir}"><fileset refid="myfaces.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="facelets.jars"/></copy>
- </target>-->
+ </target>
- <target name="build">
- <mkdir dir="${build}" />
- <!-- Compiling the source -->
- <javac srcdir="${src.java}" destdir="${build}" target="1.5" source="1.5">
- <classpath refid="base.jars" />
- <!-- Dependency on the blog-common classes -->
- <classpath path="../blog-common/${build}" />
- </javac>
- <!-- Copying any xmls -->
- <copy todir="${build}">
- <fileset dir="${src.java}">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
- </target>
+ <target name="build">
+ <mkdir dir="${build}" />
+ <mkdir dir="${build}/WEB-INF" />
+ <mkdir dir="${build}/WEB-INF/classes" />
- <target name="dist">
- <mkdir dir="${dist.lib.dir}" />
+ <!-- Compiling the source -->
+ <javac srcdir="${src.java}" destdir="${build}/WEB-INF/classes" target="1.5" source="1.5">
+ <classpath refid="base.jars" />
+ <!-- Dependency on the blog-common classes -->
+ <classpath path="../cache-base/${build}" />
+ </javac>
- <!-- Creating the jar with the classes -->
- <jar destfile="${dist.lib.dir}/jboss-blog-view.jar" basedir="${build}" />
+ <copy todir="${build}">
+ <fileset dir="${src.web}">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
- <!-- Creating the web application -->
- <mkdir dir="${dist.main.dir}/jboss-blog-view.war" />
- <copy todir="${dist.main.dir}/jboss-blog-view.war">
- <fileset dir="${src.web}"><include name="**/*" /></fileset>
- </copy>
+ <target name="dist">
+ <mkdir dir="${dist}" />
+ <jar destfile="${dist}/${war.name}" basedir="${build}" />
+ </target>
- <copy todir="${dist.main.dir}/jboss-blog-view.war/WEB-INF/lib"><fileset refid="jstl.jars"/></copy>
-
- <!--<antcall target="copy-libs-for-servlet" />-->
- </target>
+ <target name="clean">
+ <delete dir="${build}" />
+ <delete dir="${dist}" />
+ </target>
- <target name="clean">
- <delete dir="${build}" />
- </target>
+ <target name="deploy">
+ <copy todir="${jboss.deploy}">
+ <fileset dir="${dist}">
+ <include name="${war.name}" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="undeploy">
+ <delete file="${jboss.deploy}/${war.name}" />
+ </target>
</project>
Added: labs/shotoku/trunk/shotoku-cache/lib/ant-contrib/ant-contrib-1.0b3.jar
===================================================================
(Binary files differ)
Property changes on: labs/shotoku/trunk/shotoku-cache/lib/ant-contrib/ant-contrib-1.0b3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-svn-commits
mailing list