xlawrence 2004/12/20 12:11:28 CET
Modified files:
. project.properties project.xml
src/java log4j.properties
Added files:
. maven.xml
Log:
updated build scripts and properties
Revision Changes Path
1.1 +89 -0 uwcal_JSR168/maven.xml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/maven.xml?rev=1.1&content-type=text/plain
1.2 +10 -1 uwcal_JSR168/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.properties.diff?r1=1.1&r2=1.2&f=h
1.7 +21 -12 uwcal_JSR168/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/project.xml.diff?r1=1.6&r2=1.7&f=h
1.6 +1 -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.5&r2=1.6&f=h
Index: maven.xml
====================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
BEGIN LICENSE BLOCK
Version: JCSL 1.0
The contents of this file are subject to the Jahia Community Source License
1.0 or later (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
http://www.jahia.org/license
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the rights, obligations and limitations governing use of the contents
of the file. The Original and Upgraded Code is the Jahia CMS and Portal
Server. The developer of the Original and Upgraded Code is JAHIA Ltd. JAHIA
Ltd. owns the copyrights in the portions it created. All Rights Reserved.
The Shared Modifications are Jahia View Helper.
The Developer of the Shared Modifications is Jahia Solution Sarl.
Portions created by the Initial Developer are Copyright (C) 2002 by the
Initial Developer. All Rights Reserved.
END LICENSE BLOCK
Author: Xavier Lawrence @ jahia . com
-->
<project default="jar:jar"
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
<goal name="dummy">
<echo message="===================================" />
<echo message=" DummyCalendarServer " />
<echo message="===================================" />
<java classname="org.jahia.suite.calendar.test.DummyCalendarServer"
fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
</classpath>
</java>
</goal>
<goal name="client">
<echo message="===================================" />
<echo message=" ICalendarSyncClient " />
<echo message="===================================" />
<java classname="org.jahia.suite.calendar.syncClients.SyncClient"
fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
</classpath>
</java>
</goal>
<goal name="jmsServer.config">
<echo message="===================================" />
<echo message=" Configure JMS Server " />
<echo message="===================================" />
<java classname="org.jahia.suite.calendar.JORAMAdmin"
fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
</classpath>
</java>
</goal>
<goal name="start.jmsServer">
<echo message="===================================" />
<echo message=" JORAM JMS Server " />
<echo message="===================================" />
<mkdir dir="${basedir}/run"/>
<delete file="${basedir}/run/s${sid}/lock"/>
<java classname="fr.dyade.aaa.agent.AgentServer"
dir="${basedir}/run"
fork="yes">
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
<pathelement path="${conf.dir}"/>
</classpath>
<arg line="${sid} ./s${sid}"/>
</java>
</goal>
</project>
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 20 Dec 2004 09:47:58 -0000 1.1
+++ project.properties 20 Dec 2004 11:11:27 -0000 1.2
@@ -1 +1,10 @@
-maven.repo.remote=http://maven.jahia.org, http://www.bluesunrise.com/maven/,
http://www.ibiblio.org/maven/
\ No newline at end of file
+maven.repo.remote=http://maven.jahia.org, http://www.bluesunrise.com/maven/,
http://www.ibiblio.org/maven/
+
+#----------------------------------------------------------------------------
+# Project properties
+conf.dir=${basedir}/conf
+lib.dir=${basedir}/lib
+
+#----------------------------------------------------------------------------
+# Project internal properties (JORAM)
+sid=0
\ No newline at end of file
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 20 Dec 2004 09:47:58 -0000 1.6
+++ project.xml 20 Dec 2004 11:11:27 -0000 1.7
@@ -1,20 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2004 The Apache Software Foundation
+ BEGIN LICENSE BLOCK
+ Version: JCSL 1.0
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ The contents of this file are subject to the Jahia Community Source License
+ 1.0 or later (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.jahia.org/license
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the rights, obligations and limitations governing use of the contents
+ of the file. The Original and Upgraded Code is the Jahia CMS and Portal
+ Server. The developer of the Original and Upgraded Code is JAHIA Ltd. JAHIA
+ Ltd. owns the copyrights in the portions it created. All Rights Reserved.
+
+ The Shared Modifications are Jahia View Helper.
+
+ The Developer of the Shared Modifications is Jahia Solution Sarl.
+ Portions created by the Initial Developer are Copyright (C) 2002 by the
+ Initial Developer. All Rights Reserved.
- http://www.apache.org/licenses/LICENSE-2.0
+ END LICENSE BLOCK
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
- $Id: project.xml,v 1.6 2004/12/20 09:47:58 xlawrence Exp $
+ Author: Xavier Lawrence @ jahia . com
-->
<project>
<pomVersion>3</pomVersion>
Index: log4j.properties
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/src/java/log4j.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- log4j.properties 17 Dec 2004 15:46:59 -0000 1.5
+++ log4j.properties 20 Dec 2004 11:11:28 -0000 1.6
@@ -1,7 +1,7 @@
# For the general syntax of property based configuration files see the
# documenation of org.apache.log4j.PropertyConfigurator.
-log4j.rootLogger=INFO, A1
+log4j.rootLogger=WARN, A1
# A1 is set to be a ConsoleAppender which outputs to System.out.
log4j.appender.A1=org.apache.log4j.ConsoleAppender
