xlawrence 2005/05/12 11:50:30 CEST
Modified files:
. maven.xml
Added files:
conf calApp.xml ucalApp.xml uwCalContext.xml
Removed files:
. calApp.xml ucalApp.xml uwCalContext.xml
Log:
move
Revision Changes Path
1.3 +0 -68 uwcal_JSR168/calApp.xml (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calApp.xml?rev=1.2&content-type=text/plain
1.1 +68 -0 uwcal_JSR168/conf/calApp.xml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/conf/calApp.xml?rev=1.1&content-type=text/plain
1.1 +68 -0 uwcal_JSR168/conf/ucalApp.xml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/conf/ucalApp.xml?rev=1.1&content-type=text/plain
1.1 +31 -0 uwcal_JSR168/conf/uwCalContext.xml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/conf/uwCalContext.xml?rev=1.1&content-type=text/plain
1.24 +2 -2 uwcal_JSR168/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/maven.xml.diff?r1=1.23&r2=1.24&f=h
1.3 +0 -68 uwcal_JSR168/ucalApp.xml (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/ucalApp.xml?rev=1.2&content-type=text/plain
1.2 +0 -31 uwcal_JSR168/uwCalContext.xml (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/uwCalContext.xml?rev=1.1&content-type=text/plain
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/maven.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maven.xml 10 May 2005 10:00:37 -0000 1.23
+++ maven.xml 12 May 2005 09:50:29 -0000 1.24
@@ -33,8 +33,8 @@
<!-- Should only be executed after the wars were undeployed and Tomcat is
not running -->
<goal name="tomcat.context.setup" description="Sets up the tomcat context
for the webApps">
<echo message="Warning: Should only be executed after the wars were
undeployed and Tomcat is not running !" />
- <copy file="${basedir}/calApp.xml"
todir="${tomcat.dir}/conf/Catalina/localhost"/>
- <copy file="${basedir}/ucalApp.xml"
todir="${tomcat.dir}/conf/Catalina/localhost"/>
+ <copy file="${basedir}/conf/calApp.xml"
todir="${tomcat.dir}/conf/Catalina/localhost"/>
+ <copy file="${basedir}/conf/ucalApp.xml"
todir="${tomcat.dir}/conf/Catalina/localhost"/>
</goal>
<goal name="server.dummy" description="Launches the dummy calendar server">
Index: calApp.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
-->
<Context path="/calApp" docBase="calApp">
<Resource name="jdbc/uwcalSynch" scope="Shareable"
type="javax.sql.DataSource"/>
<ResourceParams name="jdbc/uwcalSynch">
<parameter>
<name>factory</name>
<value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
</parameter>
<!-- DBCP database connection settings -->
<parameter>
<name>url</name>
<value>jdbc:hsqldb:hsql://127.0.0.1:8889</value>
</parameter>
<parameter>
<name>driverClassName</name>
<value>org.hsqldb.jdbcDriver</value>
</parameter>
<parameter>
<name>username</name>
<value>sa</value>
</parameter>
<parameter>
<name>password</name>
<value></value>
</parameter>
<!-- DBCP connection pooling options -->
<parameter>
<name>maxWait</name>
<value>3000</value>
</parameter>
<parameter>
<name>maxIdle</name>
<value>100</value>
</parameter>
<parameter>
<name>maxActive</name>
<value>10</value>
</parameter>
</ResourceParams>
</Context>
Index: ucalApp.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
-->
<Context path="/ucalApp" docBase="ucalApp">
<Resource name="jdbc/uwcalSynch" scope="Shareable"
type="javax.sql.DataSource"/>
<ResourceParams name="jdbc/uwcalSynch">
<parameter>
<name>factory</name>
<value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
</parameter>
<!-- DBCP database connection settings -->
<parameter>
<name>url</name>
<value>jdbc:hsqldb:hsql://127.0.0.1:8889</value>
</parameter>
<parameter>
<name>driverClassName</name>
<value>org.hsqldb.jdbcDriver</value>
</parameter>
<parameter>
<name>username</name>
<value>sa</value>
</parameter>
<parameter>
<name>password</name>
<value></value>
</parameter>
<!-- DBCP connection pooling options -->
<parameter>
<name>maxWait</name>
<value>3000</value>
</parameter>
<parameter>
<name>maxIdle</name>
<value>100</value>
</parameter>
<parameter>
<name>maxActive</name>
<value>10</value>
</parameter>
</ResourceParams>
</Context>
Index: uwCalContext.xml
====================================================================
<!-- make the cal DataSource available in all contexts -->
<DefaultContext>
<Resource name="jdbc/calDB" auth="Container"
type="javax.sql.DataSource"/>
<ResourceParams name="jdbc/calDB">
<parameter>
<name>username</name>
<value>sa</value>
</parameter>
<parameter>
<name>password</name>
<value></value>
</parameter>
<parameter>
<name>driverClassName</name>
<value>org.hsqldb.jdbcDriver</value>
</parameter>
<parameter>
<name>url</name>
<value>jdbc:hsqldb:hsql://localhost:8887</value>
</parameter>
<parameter>
<name>maxActive</name>
<value>8</value>
</parameter>
<parameter>
<name>maxIdle</name>
<value>4</value>
</parameter>
</ResourceParams>
</DefaultContext>
