portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r638194 - in /portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat: jetspeed-tomcat-5.5.xml jetspeed-tomcat-5.xml
Date Tue, 18 Mar 2008 03:38:55 GMT
Author: ate
Date: Mon Mar 17 20:38:54 2008
New Revision: 638194

URL: http://svn.apache.org/viewvc?rev=638194&view=rev
Log:
- dropping Tomcat 5 context descriptor
- replacing Ant filter style parameters with maven type ( ${} )

Removed:
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat/jetspeed-tomcat-5.xml
Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat/jetspeed-tomcat-5.5.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat/jetspeed-tomcat-5.5.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat/jetspeed-tomcat-5.5.xml?rev=638194&r1=638193&r2=638194&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat/jetspeed-tomcat-5.5.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/tomcat/jetspeed-tomcat-5.5.xml
Mon Mar 17 20:38:54 2008
@@ -27,8 +27,8 @@
 
 	<Resource name="jdbc/jetspeed" auth="Container"
             factory="org.apache.commons.dbcp.BasicDataSourceFactory"
-            type="javax.sql.DataSource" username="@USERNAME@" password="@PASSWORD@"
-            driverClassName="@DRIVER@" url="@URL@"
+	    type="javax.sql.DataSource" username="${org.apache.jetspeed.production.database.user}"
password="${org.apache.jetspeed.production.database.password}"
+	    driverClassName="${org.apache.jetspeed.production.database.driver}" url="${org.apache.jetspeed.production.database.url}"
             maxActive="100" maxIdle="30" maxWait="10000"/> 
 
 	<Valve className="org.apache.catalina.authenticator.FormAuthenticator" characterEncoding="UTF-8"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message