xlawrence 2004/12/17 16:47:26 CET
Modified files:
. build.xml project.xml
Log:
updated build files
Revision Changes Path
1.13 +82 -11 uwcal_JSR168/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/build.xml.diff?r1=1.12&r2=1.13&f=h
1.5 +74 -131 uwcal_JSR168/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.xml.diff?r1=1.4&r2=1.5&f=h
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 8 Dec 2004 16:02:59 -0000 1.12
+++ build.xml 17 Dec 2004 15:47:25 -0000 1.13
@@ -14,7 +14,7 @@
<property name="package_name" value="/org/jahia/suite/calendar"/>
<property name="package_dir" value="${src_dir}/${package_name}"/>
<property name="lib_dir" value="${basedir}/lib"/>
- <property name="bin_dir" value="${basedir}/bin"/>
+ <property name="bin_dir" value="${basedir}/bin/classes"/>
<property name="conf_dir" value="${basedir}/conf"/>
<property name="run_dir" value="${basedir}/run"/>
<property name="dist_dir" value="${basedir}/dist"/>
@@ -50,8 +50,8 @@
</path>
<!-- PROPERTIES for CLASS names -->
- <property name="JORAM_ADMIN"
value="org.jahia.suite.calendar.JORAMAdmin"/>
- <property name="CLIENT"
value="org.jahia.suite.calendar.syncClients.SyncClient"/>
+ <property name="JORAM_ADMIN"
value="org.jahia.suite.calendar.JORAMAdmin"/>
+ <property name="CLIENT"
value="org.jahia.suite.calendar.syncClients.SyncClient"/>
<property name="DUMMY_SERVER"
value="org.jahia.suite.calendar.test.DummyCalendarServer"/>
</target>
@@ -107,20 +107,19 @@
<!-- #################################################################### -->
- <target name="jar" depends="init" description="makes a jar archive of the
- compiled classes">
+ <target name="jar" depends="init"
+ description="makes a jar archive of the compiled classes">
<mkdir dir="${dist_dir}" />
- <jar destfile="uwCalSync.jar">
+ <jar destfile="${dist_dir}/uwCalSync4jSync.jar">
<fileset dir="${bin_dir}"/>
- <fileset dir="${src_dir}"/>
</jar>
</target>
<!-- #################################################################### -->
- <target name="s4j" depends="init" description="makes a jar archive of the
- Calendar SyncSource module for the Sync Server">
+ <target name="s4j" depends="init"
+ description="makes a jar archive of the Calendar SyncSource module for
the sync4j Sync Server">
<mkdir dir="${dist_dir}" />
<property name="dir.module" value="${dist_dir}/calModule"/>
@@ -187,6 +186,75 @@
<!-- #################################################################### -->
+ <target name="s4j.outlook" depends="init"
+ description="makes a jar archive of the Calendar SyncSource module for
the sync4j Sync Server (MS-Outlook)">
+ <mkdir dir="${dist_dir}" />
+ <property name="dir.module" value="${dist_dir}/calModuleOutlook"/>
+
+ <!-- Create the package directory structure -->
+ <mkdir dir="${dir.module}/config"/>
+ <mkdir dir="${dir.module}/sql"/>
+ <mkdir dir="${dir.module}/lib"/>
+
+ <!-- Add the SQL scripts for the sync4j DB configuration -->
+ <copy todir = "${dir.module}/sql" preservelastmodified="true">
+ <fileset dir="${conf_dir}/sync4j/sql/outlook"/>
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package_name}/framework">
+ <fileset dir="${bin_dir}/${package_name}/framework" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package_name}/util">
+ <fileset dir="${bin_dir}/${package_name}/util" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package_name}/syncServer">
+ <fileset dir="${bin_dir}/${package_name}/syncServer" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package_name}/sync4jModule">
+ <fileset dir="${bin_dir}/${package_name}/sync4jModule" />
+ </copy>
+
+ <copy file="${src_dir}/log4j.properties"
todir="${dir.module}/lib" />
+ <copy file="${lib_dir}/jms-1.1.jar"
todir="${dir.module}/lib" />
+ <copy file="${lib_dir}/jndi-1.2.1.jar"
todir="${dir.module}/lib" />
+ <copy file="${lib_dir}/log4j-1.2.8.jar"
todir="${dir.module}/lib" />
+ <copy file="${lib_dir}/cal4j-0.1.jar"
todir="${dir.module}/lib" />
+
+ <copy todir="${dir.module}/lib">
+ <fileset dir="${lib_dir}/joram" />
+ </copy>
+
+ <!-- The classes jar -->
+ <jar jarfile = "${dir.module}/lib/calModuleOutlook.jar"
+ compress = "true"
+ update = "true"
+ >
+ <fileset dir="${dir.module}/lib">
+ <include name="**/*" />
+ <exclude name="**/*.jar" />
+ </fileset>
+ </jar>
+
+ <delete dir="${dir.module}/lib/org"/>
+
+ <!-- The module jar -->
+ <jar jarfile = "${dist_dir}/calModuleOutlook.s4j"
+ compress = "true"
+ update = "true"
+ >
+ <fileset dir="${dir.module}">
+ <include name="**/*" />
+ </fileset>
+ </jar>
+
+ <delete dir="${dir.module}"/>
+ </target>
+
+<!-- #################################################################### -->
+
<!-- Starts a JORAM server agent -->
<target name="server" depends="init">
<mkdir dir="${run_dir}"/>
@@ -200,14 +268,15 @@
</target>
<!-- Start a persistent server JMS -->
- <target name="jmsServer" description="Starts a persistent single server">
+ <target name="jmsServer" description="Starts a persistent single JMS
server">
<antcall target="server">
<param name="sid" value="0"/>
</antcall>
</target>
<!-- Configures a JMS server -->
- <target name="jmsServer.config" description="Configures a JMS server"
+ <target name="jmsServer.config"
+ description="Configures a JMS server (only needed for the 1st launch)"
depends="init">
<java classname="${JORAM_ADMIN}"
failonerror="no"
@@ -239,4 +308,6 @@
</java>
</target>
+<!-- #################################################################### -->
+
</project>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 8 Dec 2004 16:02:59 -0000 1.4
+++ project.xml 17 Dec 2004 15:47:25 -0000 1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 The Apache Software Foundation
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: project.xml,v 1.4 2004/12/08 16:02:59 xlawrence Exp $
+ $Id: project.xml,v 1.5 2004/12/17 15:47:25 xlawrence Exp $
-->
<project>
<pomVersion>3</pomVersion>
@@ -51,141 +51,84 @@
</developer>
</developers>
- <dependencies>
- <dependency>
- <id>servletapi</id>
- <version>2.3</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>dom4j</id>
- <version>1.5</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>ehcache</id>
- <version>0.9</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>jta</id>
- <version>1.0.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- <version>2.0.1</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.8</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.6.1</version>
- <url>http://jakarta.apache.org/commons/beanutils.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.5</version>
- <url>http://jakarta.apache.org/commons/digester.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons/fileupload/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- <url>http://jakarta.apache.org/commons/lang.html</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.1.3</version>
- <url>http://jakarta.apache.org/commons/validator/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.7</version>
- <url>http://jakarta.apache.org/oro/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.4</version>
- <url>http://jakarta.apache.org/struts/</url>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>ical4j</groupId>
+ <artifactId>ical4j</artifactId>
+ <version>0.9.9</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jndi</groupId>
+ <artifactId>jndi</artifactId>
+ <version>1.2.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <url>http://jakarta.apache.org/struts/</url>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ <version>1.2.4</version>
+ <url>http://jakarta.apache.org/struts/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
+ <resource>
<directory>src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
+ <includes>
+ <include>*.properties</include>
+ </includes>
</resource>
</resources>
</build>
