[jboss-svn-commits] JBL Code SVN: r14243 - in labs/shotoku/trunk/shotoku-cache: cache-base and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 15 05:38:01 EDT 2007
Author: adamw
Date: 2007-08-15 05:38:01 -0400 (Wed, 15 Aug 2007)
New Revision: 14243
Added:
labs/shotoku/trunk/shotoku-cache/cache-service/build.xml
labs/shotoku/trunk/shotoku-cache/cache-test/build.xml
labs/shotoku/trunk/shotoku-cache/cache-test/src/
labs/shotoku/trunk/shotoku-cache/cache-web/build.xml
Removed:
labs/shotoku/trunk/shotoku-cache/cache-test/test/build.xml
labs/shotoku/trunk/shotoku-cache/cache-test/test/src/
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-test/
labs/shotoku/trunk/shotoku-cache/cache-web/
Log:
Modularazing step 3
Modified: labs/shotoku/trunk/shotoku-cache/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/build.xml 2007-08-15 09:22:54 UTC (rev 14242)
+++ labs/shotoku/trunk/shotoku-cache/build.xml 2007-08-15 09:38:01 UTC (rev 14243)
@@ -1,97 +1,96 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="Shotoku Renewable Cache" default="build" basedir=".">
- <!-- Configuration of deployment -->
- <property name="jboss.home" value="/home/adamw/jboss/jboss-cache" />
- <property name="jboss.conf" value="default" />
+<project name="JBoss Blog" default="build" basedir=".">
+ <!-- Configuration of deployment -->
+ <property name="jboss.home" value="/home/adamw/jboss/jboss-blog" />
+ <property name="jboss.conf" value="default" />
+ <!-- Unset this property if jboss portal is deployed -->
+ <property name="jboss.portal.present" value="true" />
- <!-- Name of the service archive which will contain the blog application -->
- <property name="jar.lib.name" value="shotoku-cache.jar" />
- <property name="jar.service.name" value="shotoku-cache-service.jar" />
- <property name="sar.name" value="shotoku-cache-service.sar" />
+ <!-- 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="build" value="build"/>
- <property name="dist" value="${basedir}/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="${basedir}/dist"/>
- <!-- Helper properties: built using the above ones -->
- <property name="dist.sar.dir" value="${dist}/${sar.name}" />
- <property name="dist.sar.lib.dir" value="${dist.sar.dir}/lib" />
- <property name="dist.lib.dir" 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" />
- <property name="deploy.sar.dir" value="${jboss.home}/server/${jboss.conf}/deploy" />
- <property name="deploy.lib.dir" value="${jboss.home}/server/${jboss.conf}/lib" />
+ <!-- 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>
- <!-- Dependency jars filesets definitions -->
- <fileset id="classpath" dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- <path id="classpath.jars">
- <fileset refid="classpath" />
- </path>
+ <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>
- <!-- Main tasks -->
- <target name="clean">
- <delete dir="${dist}" />
- <delete dir="${build}" />
- </target>
+ <!-- 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}" />
+ </target>
- <target name="build" depends="clean">
- <mkdir dir="${build}" />
+ <!-- Main tasks -->
+ <target name="clean">
+ <delete dir="${dist}" />
+ <antcall target="each-module">
+ <param name="target.name" value="clean" />
+ </antcall>
+ </target>
- <!-- Compiling the source -->
- <javac srcdir="${src.java}" destdir="${build}" target="1.5" source="1.5">
- <classpath refid="classpath.jars" />
- </javac>
- </target>
+ <target name="build" depends="clean">
+ <antcall target="each-module">
+ <param name="target.name" value="build" />
+ </antcall>
+ </target>
- <target name="dist" depends="build">
- <mkdir dir="${dist.sar.dir}" />
- <mkdir dir="${dist.sar.lib.dir}" />
- <mkdir dir="${dist.lib.dir}" />
+ <target name="dist" depends="build">
+ <!-- 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>
- <!-- Copying the meta information -->
- <copy todir="${dist.sar.dir}">
- <fileset dir="${src.meta}">
- <include name="**/*" />
- </fileset>
- </copy>
+ <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>
- <!-- Creating the jars with the classes -->
- <jar destfile="${dist.sar.lib.dir}/${jar.service.name}"
- basedir="${build}"
- includes="**/*ServiceImpl*" />
-
- <jar destfile="${dist.lib.dir}/${jar.lib.name}"
- basedir="${build}"
- excludes="**/*ServiceImpl*" />
- </target>
-
- <target name="deploy" depends="dist,undeploy">
- <!-- Copying the sar directory to the jboss deploy dir -->
- <copy todir="${deploy.sar.dir}">
- <fileset dir="${dist}">
- <include name="${sar.name}/**" />
- </fileset>
- </copy>
-
- <copy todir="${deploy.lib.dir}">
- <fileset dir="${dist}">
- <include name="${jar.lib.name}" />
- </fileset>
- </copy>
- </target>
-
- <target name="undeploy">
- <!-- Deleting old deployment -->
- <delete dir="${deploy.sar.dir}/${sar.name}" />
- <delete dir="${deploy.lib.dir}/${jar.lib.name}" />
- </target>
-
- <target name="test" depends="dist">
- <ant dir="test" inheritrefs="true" target="all" />
- </target>
+ <target name="undeploy">
+ <!-- Deleting old deployment -->
+ <delete dir="${deploy.dir}/${sar.name}" />
+ </target>
</project>
Property changes on: labs/shotoku/trunk/shotoku-cache/cache-base
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
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:22:54 UTC (rev 14242)
+++ labs/shotoku/trunk/shotoku-cache/cache-base/build.xml 2007-08-15 09:38:01 UTC (rev 14243)
@@ -1,97 +1,35 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project name="Shotoku Renewable Cache" default="build" basedir=".">
- <!-- Configuration of deployment -->
- <property name="jboss.home" value="/home/adamw/jboss/jboss-cache" />
- <property name="jboss.conf" value="default" />
+<project name="JBoss Blog Common">
+ <!-- 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" />
+ </path>
- <!-- Name of the service archive which will contain the blog application -->
- <property name="jar.lib.name" value="shotoku-cache.jar" />
- <property name="jar.service.name" value="shotoku-cache-service.jar" />
- <property name="sar.name" value="shotoku-cache-service.sar" />
+ <!-- BUILD TARGETS -->
- <!-- 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="build" value="build"/>
- <property name="dist" value="${basedir}/dist"/>
+ <target name="init">
- <!-- Helper properties: built using the above ones -->
- <property name="dist.sar.dir" value="${dist}/${sar.name}" />
- <property name="dist.sar.lib.dir" value="${dist.sar.dir}/lib" />
- <property name="dist.lib.dir" value="${dist}" />
+ </target>
- <property name="deploy.sar.dir" value="${jboss.home}/server/${jboss.conf}/deploy" />
- <property name="deploy.lib.dir" value="${jboss.home}/server/${jboss.conf}/lib" />
+ <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" />
+ </javac>
+ </target>
- <!-- Dependency jars filesets definitions -->
- <fileset id="classpath" dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- <path id="classpath.jars">
- <fileset refid="classpath" />
- </path>
+ <target name="dist">
+ <mkdir dir="${dist.lib.dir}" />
- <!-- Main tasks -->
- <target name="clean">
- <delete dir="${dist}" />
- <delete dir="${build}" />
- </target>
+ <!-- Creating the jar with the classes -->
+ <jar destfile="${dist.lib.dir}/jboss-blog-common.jar" basedir="${build}" />
+ </target>
- <target name="build" depends="clean">
- <mkdir dir="${build}" />
-
- <!-- Compiling the source -->
- <javac srcdir="${src.java}" destdir="${build}" target="1.5" source="1.5">
- <classpath refid="classpath.jars" />
- </javac>
- </target>
-
- <target name="dist" depends="build">
- <mkdir dir="${dist.sar.dir}" />
- <mkdir dir="${dist.sar.lib.dir}" />
- <mkdir dir="${dist.lib.dir}" />
-
- <!-- Copying the meta information -->
- <copy todir="${dist.sar.dir}">
- <fileset dir="${src.meta}">
- <include name="**/*" />
- </fileset>
- </copy>
-
- <!-- Creating the jars with the classes -->
- <jar destfile="${dist.sar.lib.dir}/${jar.service.name}"
- basedir="${build}"
- includes="**/*ServiceImpl*" />
-
- <jar destfile="${dist.lib.dir}/${jar.lib.name}"
- basedir="${build}"
- excludes="**/*ServiceImpl*" />
- </target>
-
- <target name="deploy" depends="dist,undeploy">
- <!-- Copying the sar directory to the jboss deploy dir -->
- <copy todir="${deploy.sar.dir}">
- <fileset dir="${dist}">
- <include name="${sar.name}/**" />
- </fileset>
- </copy>
-
- <copy todir="${deploy.lib.dir}">
- <fileset dir="${dist}">
- <include name="${jar.lib.name}" />
- </fileset>
- </copy>
- </target>
-
- <target name="undeploy">
- <!-- Deleting old deployment -->
- <delete dir="${deploy.sar.dir}/${sar.name}" />
- <delete dir="${deploy.lib.dir}/${jar.lib.name}" />
- </target>
-
- <target name="test" depends="dist">
- <ant dir="test" inheritrefs="true" target="all" />
- </target>
+ <target name="clean">
+ <delete dir="${build}" />
+ </target>
</project>
Added: labs/shotoku/trunk/shotoku-cache/cache-service/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-service/build.xml (rev 0)
+++ labs/shotoku/trunk/shotoku-cache/cache-service/build.xml 2007-08-15 09:38:01 UTC (rev 14243)
@@ -0,0 +1,55 @@
+<?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>
+
+ <!-- BUILD TARGETS -->
+
+ <target name="init">
+
+ </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="dist">
+ <mkdir dir="${dist.lib.dir}" />
+
+ <!-- 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>
+
+ <!-- Creating the jar with the classes -->
+ <jar destfile="${dist.lib.dir}/jboss-blog-services.jar" basedir="${build}" />
+
+ <!-- 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>
+</project>
Property changes on: labs/shotoku/trunk/shotoku-cache/cache-test
___________________________________________________________________
Name: svn:ignore
+ .project
.settings
.classpath
bin
target
dist
Added: labs/shotoku/trunk/shotoku-cache/cache-test/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-test/build.xml (rev 0)
+++ labs/shotoku/trunk/shotoku-cache/cache-test/build.xml 2007-08-15 09:38:01 UTC (rev 14243)
@@ -0,0 +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>
+
+ <!-- BUILD TARGETS -->
+
+ <target name="init">
+
+ </target>
+
+ <!--<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 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="dist">
+ <mkdir dir="${dist.lib.dir}" />
+
+ <!-- Creating the jar with the classes -->
+ <jar destfile="${dist.lib.dir}/jboss-blog-view.jar" basedir="${build}" />
+
+ <!-- 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>
+
+ <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}" />
+ </target>
+</project>
Copied: labs/shotoku/trunk/shotoku-cache/cache-test/src (from rev 14242, labs/shotoku/trunk/shotoku-cache/cache-test/test/src)
Deleted: labs/shotoku/trunk/shotoku-cache/cache-test/test/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-test/test/build.xml 2007-08-15 09:22:54 UTC (rev 14242)
+++ labs/shotoku/trunk/shotoku-cache/cache-test/test/build.xml 2007-08-15 09:38:01 UTC (rev 14243)
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<project name="Shotoku Renewable Cache Test" default="all" basedir=".">
- <path id="classpath.test.jars">
- <fileset refid="classpath" />
- <fileset dir="../dist">
- <include name="shotoku-cache.jar"/>
- </fileset>
- </path>
-
- <target name="all">
- <delete dir="dist" />
- <delete dir="build" />
-
- <!-- -->
-
- <mkdir dir="build" />
-
- <javac srcdir="src/java" destdir="build" target="1.5" source="1.5">
- <classpath refid="classpath.test.jars" />
- </javac>
-
- <!-- -->
-
- <copy todir="build">
- <fileset dir="src/web">
- <include name="**/*" />
- </fileset>
- </copy>
-
- <!-- -->
-
- <mkdir dir="dist" />
-
- <jar destfile="dist/shotoku-cache-test.war" basedir="build" />
-
- <!-- -->
-
- <copy todir="${deploy.sar.dir}">
- <fileset dir="dist">
- <include name="shotoku-cache-test.war" />
- </fileset>
- </copy>
- </target>
-</project>
Property changes on: labs/shotoku/trunk/shotoku-cache/cache-web
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
.classpath
target
bin
dist
Added: labs/shotoku/trunk/shotoku-cache/cache-web/build.xml
===================================================================
--- labs/shotoku/trunk/shotoku-cache/cache-web/build.xml (rev 0)
+++ labs/shotoku/trunk/shotoku-cache/cache-web/build.xml 2007-08-15 09:38:01 UTC (rev 14243)
@@ -0,0 +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>
+
+ <!-- BUILD TARGETS -->
+
+ <target name="init">
+
+ </target>
+
+ <!--<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 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="dist">
+ <mkdir dir="${dist.lib.dir}" />
+
+ <!-- Creating the jar with the classes -->
+ <jar destfile="${dist.lib.dir}/jboss-blog-view.jar" basedir="${build}" />
+
+ <!-- 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>
+
+ <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}" />
+ </target>
+</project>
More information about the jboss-svn-commits
mailing list