ate 2005/03/23 14:55:58
Modified: portal/src/resources jetspeed-tomcat-5.5.xml
Added: portal/src/resources jetspeed-oracle-ds.xml
jetspeed-tomcat-5.xml
Log:
Resolving http://issues.apache.org/jira/browse/JS2-210
Revision Changes Path
1.2 +3 -3
jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.5.xml
Index: jetspeed-tomcat-5.5.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.5.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetspeed-tomcat-5.5.xml 3 Dec 2004 04:30:46 -0000 1.1
+++ jetspeed-tomcat-5.5.xml 23 Mar 2005 22:55:58 -0000 1.2
@@ -20,13 +20,13 @@
userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
useContextClassLoader="false"
- debug="3"/>
+ debug="0"/>
<Resource name="jdbc/jetspeed" auth="Container"
factory="org.apache.commons.dbcp.BasicDataSourceFactory"
- type="javax.sql.DataSource" username="j2" password="digital"
- driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://j2-server/j2?autoReconnect=true"
+ type="javax.sql.DataSource" username="@USERNAME@"
password="@PASSWORD@"
+ driverClassName="@DRIVER@" url="@URL@"
maxActive="100" maxIdle="30" maxWait="10000"/>
</Context>
1.1
jakarta-jetspeed-2/portal/src/resources/jetspeed-oracle-ds.xml
Index: jetspeed-oracle-ds.xml
===================================================================
<!--
Copyright 2004 The Apache Software Foundation
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
http://www.apache.org/licenses/LICENSE-2.0
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.
-->
<datasources>
<local-tx-datasource>
<!-- The jndi name of the DataSource, it is prefixed with java:/ -->
<!-- Datasources are not available outside the virtual machine -->
<jndi-name>JetspeedDS</jndi-name>
<connection-url>jdbc:oracle:thin:@localhost:1521:orcl</connection-url>
<!-- The driver class -->
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<!-- The login and password -->
<user-name>jetspeed</user-name>
<password>jetspeed</password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
</local-tx-datasource>
</datasources>
1.2 +80 -0
jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
