xlawrence 2004/12/20 14:55:09 CET
Modified files:
. build.xml maven.xml project.properties
project.xml
Log:
updated build scripts and properties
Revision Changes Path
1.17 +2 -0 uwcal_JSR168/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/build.xml.diff?r1=1.16&r2=1.17&f=h
1.4 +153 -2 uwcal_JSR168/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/maven.xml.diff?r1=1.3&r2=1.4&f=h
1.5 +1 -1 uwcal_JSR168/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.properties.diff?r1=1.4&r2=1.5&f=h
1.8 +1 -1 uwcal_JSR168/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.xml.diff?r1=1.7&r2=1.8&f=h
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 20 Dec 2004 12:50:14 -0000 1.16
+++ build.xml 20 Dec 2004 13:55:08 -0000 1.17
@@ -150,6 +150,7 @@
<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}/jakarta-regexp-1.2.jar"
todir="${dir.module}/lib" />
<copy todir="${dir.module}/lib">
<fileset dir="${lib_dir}/joram" />
@@ -218,6 +219,7 @@
<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}/jakarta-regexp-1.2.jar"
todir="${dir.module}/lib" />
<copy file="${lib_dir}/sync4j/foundation-1.4.jar"
todir="${dir.module}/lib" />
<copy todir="${dir.module}/lib">
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 20 Dec 2004 12:50:14 -0000 1.3
+++ maven.xml 20 Dec 2004 13:55:08 -0000 1.4
@@ -83,15 +83,166 @@
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
- <pathelement path="${conf.dir}"/>
+ <pathelement path="${maven.conf.dir}"/>
</classpath>
<arg line="${sid} ./s${sid}"/>
</java>
</goal>
+ <goal name="s4j"
+ description="makes a jar archive of the Calendar SyncSource module for
the sync4j Sync Server">
+ <property name="dir.module" value="${maven.build.dir}/calModule"/>
+
+ <!-- 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="${maven.conf.dir}/sync4j/sql"/>
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/framework">
+ <fileset dir="${maven.build.dest}/${package}/framework" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/util">
+ <fileset dir="${maven.build.dest}/${package}/util" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/syncServer">
+ <fileset dir="${maven.build.dest}/${package}/syncServer" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/sync4jModule">
+ <fileset dir="${maven.build.dest}/${package}/sync4jModule" />
+ </copy>
+
+ <echo message="${pom.getDependencyPath('joram:joram-client')}" />
+
+ <copy file="${maven.build.dest}/log4j.properties"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('jms')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('jndi')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('log4j')}"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('activation')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('jcup')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-client')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:ow_monolog')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-connector')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-mom')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-shared')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('jta')}"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('jakarta-regexp')}"
todir="${dir.module}/lib" />
+
+ <!-- The classes jar -->
+ <jar jarfile = "${dir.module}/lib/calModule.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 = "${maven.build.dir}/calModule.s4j"
+ compress = "true"
+ update = "true"
+ >
+ <fileset dir="${dir.module}">
+ <include name="**/*" />
+ </fileset>
+ </jar>
+
+ <delete dir="${dir.module}"/>>
+ </goal>
+
+ <goal name="s4j.outlook"
+ description="makes a jar archive of the Calendar SyncSource module for
the sync4j Sync Server (MS-Outlook)">
+ <property name="dir.module"
value="${maven.build.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="${maven.conf.dir}/sync4j/sql/outlook"/>
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/framework">
+ <fileset dir="${maven.build.dest}/${package}/framework" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/util">
+ <fileset dir="${maven.build.dest}/${package}/util" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/syncServer">
+ <fileset dir="${maven.build.dest}/${package}/syncServer" />
+ </copy>
+
+ <copy todir="${dir.module}/lib/${package}/sync4jModule">
+ <fileset dir="${maven.build.dest}/${package}/sync4jModule" />
+ </copy>
+
+ <echo message="${pom.getDependencyPath('joram:joram-client')}" />
+
+ <copy file="${maven.build.dest}/log4j.properties"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('jms')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('jndi')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('log4j')}"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('activation')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('jcup')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-client')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:ow_monolog')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-connector')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-mom')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('joram:joram-shared')}"
todir="${dir.module}/lib" />
+ <copy file="${pom.getDependencyPath('jta')}"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('jakarta-regexp')}"
todir="${dir.module}/lib" />
+
+ <copy file="${pom.getDependencyPath('sync4j:foundation')}"
todir="${dir.module}/lib" />
+
+ <!-- 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 = "${maven.build.dir}/calModuleOutlook.s4j"
+ compress = "true"
+ update = "true"
+ >
+ <fileset dir="${dir.module}">
+ <include name="**/*" />
+ </fileset>
+ </jar>
+
+ <delete dir="${dir.module}"/>>
+ </goal>
+
<postGoal name="clean">
<delete dir="${basedir}/run"/>
<delete dir="${basedir}/db"/>
- <delete dir="${dist.dir}"/>
</postGoal>
</project>
\ No newline at end of file
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 20 Dec 2004 12:50:14 -0000 1.4
+++ project.properties 20 Dec 2004 13:55:08 -0000 1.5
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# Project properties
-conf.dir=${basedir}/conf
+package=/org/jahia/suite/calendar
#----------------------------------------------------------------------------
# Project internal properties (JORAM)
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 20 Dec 2004 11:11:27 -0000 1.7
+++ project.xml 20 Dec 2004 13:55:08 -0000 1.8
@@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>jcup</groupId>
- <artifactId>JCup</artifactId>
+ <artifactId>jcup</artifactId>
<version>1.0</version>
<properties>
<war.bundle>true</war.bundle>
