[jboss-svn-commits] JBL Code SVN: r14245 - in labs/shotoku/trunk/shotoku-cache: cache-base and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 15 06:24:06 EDT 2007
Author: adamw
Date: 2007-08-15 06:24:06 -0400 (Wed, 15 Aug 2007)
New Revision: 14245
Removed:
labs/shotoku/trunk/shotoku-cache/lib/
Modified:
labs/shotoku/trunk/shotoku-cache/build.xml
labs/shotoku/trunk/shotoku-cache/cache-base/
labs/shotoku/trunk/shotoku-cache/cache-base/build.xml
labs/shotoku/trunk/shotoku-cache/cache-service/
labs/shotoku/trunk/shotoku-cache/cache-service/build.xml
Log:
Modularazing step 5
Modified: labs/shotoku/trunk/shotoku-cache/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/build.xml 2007-08-15 09:46:09 UTC (rev 14244)
+++ labs/shotoku/trunk/shotoku-cache/build.xml 2007-08-15 10:24:06 UTC (rev 14245)
@@ -1,57 +1,29 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="JBoss Blog" default="build" basedir=".">
+<project name="Shotoku Cache" default="build" basedir=".">
<!-- Configuration of deployment -->
- <property name="jboss.home" value="/home/adamw/jboss/jboss-blog" />
+ <property name="jboss.home" value="/home/adamw/jboss/jboss-cache" />
<property name="jboss.conf" value="default" />
- <!-- Unset this property if jboss portal is deployed -->
- <property name="jboss.portal.present" value="true" />
+ <property name="jboss.lib" value="${jboss.home}/server/${jboss.conf}/lib" />
+ <property name="jboss.deploy" value="${jboss.home}/server/${jboss.conf}/deploy" />
- <!-- Name of the service archive which will contain the blog application -->
- <property name="sar.name" value="portal-blog.sar" />
-
<!-- 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="${basedir}/dist"/>
+ <property name="dist" value="dist"/>
- <!-- Helper properties: built using the above ones -->
- <property name="dist.main.dir" value="${dist}/${sar.name}" />
- <property name="dist.lib.dir" value="${dist.main.dir}/lib" />
- <property name="deploy.dir" value="${jboss.home}/server/${jboss.conf}/deploy" />
-
<!-- Dependency jars filesets definitions -->
- <fileset id="rome.jars" dir="lib/rome"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.jars" dir="lib/jboss"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.portal.jars" dir="lib/jboss-portal"><include name="**/*.jar"/></fileset>
- <fileset id="jboss.jaae.jars" dir="lib/jboss-jaae"><include name="**/*.jar"/></fileset>
- <fileset id="portlet.jars" dir="lib/portlet"><include name="**/*.jar"/></fileset>
- <fileset id="facelets.jars" dir="lib/facelets"><include name="**/*.jar"/></fileset>
- <fileset id="myfaces.jars" dir="lib/myfaces"><include name="**/*.jar"/></fileset>
- <fileset id="jstl.jars" dir="lib/jstl"><include name="**/*.jar"/></fileset>
- <fileset id="hibernate.jars" dir="lib/hibernate"><include name="**/*.jar"/></fileset>
- <fileset id="servlet.jars" dir="lib/servlet"><include name="**/*.jar"/></fileset>
- <fileset id="jexl.jars" dir="lib/jexl"><include name="**/*.jar"/></fileset>
- <fileset id="log4j.jars" dir="lib/log4j"><include name="**/*.jar"/></fileset>
+ <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>
- <fileset id="jboss.portal.identity.jars" dir="lib/jboss-portal">
- <include name="**/portal-identity-lib.jar"/>
- </fileset>
-
- <fileset id="jboss.portal.jems.jars" dir="lib/jboss-portal">
- <include name="**/portal-jems-lib.jar"/>
- <include name="**/portal-common-lib.jar"/>
- </fileset>
-
<!-- Helper tasks -->
<target name="each-module">
- <ant dir="blog-common" inheritrefs="true" target="${target.name}" />
- <ant dir="blog-services" inheritrefs="true" target="${target.name}" />
- <ant dir="blog-view" inheritrefs="true" target="${target.name}" />
- <ant dir="blog-feeds" inheritrefs="true" target="${target.name}" />
+ <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 -->
@@ -69,7 +41,11 @@
</target>
<target name="dist" depends="build">
- <!-- Copying the meta information -->
+ <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>
@@ -77,7 +53,7 @@
<antcall target="each-module">
<param name="target.name" value="dist" />
- </antcall>
+ </antcall>-->
</target>
<target name="deploy" depends="dist,undeploy">
Property changes on: labs/shotoku/trunk/shotoku-cache/cache-base
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
bin
dist
+ .classpath
.project
.settings
build
target
bin
dist
Modified: labs/shotoku/trunk/shotoku-cache/cache-base/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-base/build.xml 2007-08-15 09:46:09 UTC (rev 14244)
+++ labs/shotoku/trunk/shotoku-cache/cache-base/build.xml 2007-08-15 10:24:06 UTC (rev 14245)
@@ -1,11 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="JBoss Blog Common">
+<project name="Shotoku Cache Base">
<!-- Classpath for building the application: includes all dependency jars -->
<path id="base.jars">
- <fileset refid="rome.jars" />
- <fileset refid="jboss.jars" />
- <fileset refid="portlet.jars" />
+ <fileset refid="jboss.lib.1" />
+ <fileset refid="jboss.lib.2" />
</path>
<!-- BUILD TARGETS -->
@@ -16,6 +15,7 @@
<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" />
@@ -23,13 +23,14 @@
</target>
<target name="dist">
- <mkdir dir="${dist.lib.dir}" />
+ <mkdir dir="${dist}" />
<!-- Creating the jar with the classes -->
- <jar destfile="${dist.lib.dir}/jboss-blog-common.jar" basedir="${build}" />
+ <jar destfile="${dist}/shotoku-cache.jar" basedir="${build}" />
</target>
<target name="clean">
<delete dir="${build}" />
+ <delete dir="${dist}" />
</target>
</project>
Property changes on: labs/shotoku/trunk/shotoku-cache/cache-service
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
build
dist
bin
target
Modified: labs/shotoku/trunk/shotoku-cache/cache-service/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-service/build.xml 2007-08-15 09:46:09 UTC (rev 14244)
+++ labs/shotoku/trunk/shotoku-cache/cache-service/build.xml 2007-08-15 10:24:06 UTC (rev 14245)
@@ -1,55 +1,49 @@
<?xml version='1.0' encoding='UTF-8'?>
<project name="JBoss Blog Services">
- <!-- Classpath for building the application: includes all dependency jars -->
- <path id="base.jars">
- <fileset refid="rome.jars" />
- <fileset refid="jboss.jars" />
- <fileset refid="jboss.portal.jars" />
- <fileset refid="portlet.jars" />
- <fileset refid="log4j.jars" />
- </path>
+ <!-- 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 -->
+ <!-- BUILD TARGETS -->
- <target name="init">
+ <target name="init">
- </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}" />
+
+ <!-- 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="../cache-base/${build}" />
+ </javac>
+ </target>
- <target name="dist">
- <mkdir dir="${dist.lib.dir}" />
+ <property name="sar.dir" value="${dist}/shotoku-cache-service.sar" />
+
+ <target name="dist">
+ <mkdir dir="${dist}" />
- <!-- Copying the meta information -->
- <mkdir dir="${dist.main.dir}/jboss-blog-services.sar" />
- <copy todir="${dist.main.dir}/jboss-blog-services.sar">
- <fileset dir="${src.meta}"><include name="**/*" /></fileset>
- </copy>
+ <!-- Copying the meta information -->
+ <mkdir dir="${sar.dir}" />
+ <copy todir="${sar.dir}">
+ <fileset dir="${src.meta}">
+ <include name="**/*" />
+ </fileset>
+ </copy>
- <!-- Creating the jar with the classes -->
- <jar destfile="${dist.lib.dir}/jboss-blog-services.jar" basedir="${build}" />
+ <!-- Creating the jar with the classes -->
+ <mkdir dir="${sar.dir}/lib" />
+ <jar destfile="${sar.dir}/lib/shotoku-cache-service.jar" basedir="${build}" />
+ </target>
- <!-- Copying dependency jars -->
- <copy todir="${dist.lib.dir}"><fileset refid="rome.jars"/></copy>
- <!-- <copy todir="${dist.lib.dir}"><fileset refid="jboss.portal.jems.jars"/></copy> -->
- </target>
-
- <target name="clean">
- <delete dir="${build}" />
- </target>
+ <target name="clean">
+ <delete dir="${build}" />
+ <delete dir="${dist}" />
+ </target>
</project>
More information about the jboss-svn-commits
mailing list