xlawrence 2004/12/08 17:03:00 CET
Modified files:
. build.xml project.xml
src/java log4j.properties
Revision Changes Path
1.12 +35 -1 uwcal_JSR168/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/build.xml.diff?r1=1.11&r2=1.12&f=h
1.4 +2 -2 uwcal_JSR168/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.xml.diff?r1=1.3&r2=1.4&f=h
1.3 +2 -1 uwcal_JSR168/src/java/log4j.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/log4j.properties.diff?r1=1.2&r2=1.3&f=h
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 3 Dec 2004 11:12:26 -0000 1.11
+++ build.xml 8 Dec 2004 16:02:59 -0000 1.12
@@ -52,6 +52,7 @@
<!-- 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="DUMMY_SERVER"
value="org.jahia.suite.calendar.test.DummyCalendarServer"/>
</target>
@@ -133,8 +134,29 @@
<fileset dir="${conf_dir}/sync4j/sql"/>
</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"/>
+ <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 todir="${dir.module}/lib">
+ <fileset dir="${lib_dir}/joram" />
</copy>
<!-- The classes jar -->
@@ -144,6 +166,7 @@
>
<fileset dir="${dir.module}/lib">
<include name="**/*" />
+ <exclude name="**/*.jar" />
</fileset>
</jar>
@@ -205,4 +228,15 @@
</java>
</target>
+<!-- #################################################################### -->
+
+ <target name="dummy" description="Launches the dummy calendar server"
+ depends="init">
+ <java classname="${DUMMY_SERVER}"
+ failonerror="no"
+ fork="yes"
+ classpathref="classpath">
+ </java>
+ </target>
+
</project>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 30 Nov 2004 17:05:05 -0000 1.3
+++ project.xml 8 Dec 2004 16:02:59 -0000 1.4
@@ -14,12 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: project.xml,v 1.3 2004/11/30 17:05:05 xlawrence Exp $
+ $Id: project.xml,v 1.4 2004/12/08 16:02:59 xlawrence Exp $
-->
<project>
<pomVersion>3</pomVersion>
<id>calendarWebApp</id>
- <name>Collaboration Suite Calendar</name>
+ <name>Calendar Server Synchronization</name>
<currentVersion>1.0</currentVersion>
<organization>
Index: log4j.properties
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/src/java/log4j.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4j.properties 6 Dec 2004 14:38:07 -0000 1.2
+++ log4j.properties 8 Dec 2004 16:03:00 -0000 1.3
@@ -15,4 +15,5 @@
#log4j.appender.A1.layout.ConversionPattern=%-4r %-5p [%t] %37c %3x - %m%n
#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p: %m%n
-log4j.logger.org.jahia.suite.calendar.sync4jModule=DEBUG
\ No newline at end of file
+log4j.logger.org.jahia.suite.calendar.sync4jModule=DEBUG
+log4j.logger.org.jahia.suite.calendar.syncServer=DEBUG
\ No newline at end of file
