portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r386378 - /portals/jetspeed-2/trunk/settings.xml.sample
Date Thu, 16 Mar 2006 16:52:28 GMT
Author: rwatler
Date: Thu Mar 16 08:52:26 2006
New Revision: 386378

URL: http://svn.apache.org/viewcvs?rev=386378&view=rev
Log:
Derby should now be the default DB configuration as with M1 build

Modified:
    portals/jetspeed-2/trunk/settings.xml.sample

Modified: portals/jetspeed-2/trunk/settings.xml.sample
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/settings.xml.sample?rev=386378&r1=386377&r2=386378&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/settings.xml.sample (original)
+++ portals/jetspeed-2/trunk/settings.xml.sample Thu Mar 16 08:52:26 2006
@@ -36,24 +36,17 @@
             </activation>
             <properties>
     
-                <!-- MSSQL database properties -->
-
-                <org.apache.jetspeed.test.jdbc.drivers.path>${org.apache.jetspeed.server.home}/shared/lib/jtds-1.2.jar</org.apache.jetspeed.test.jdbc.drivers.path>
-                <org.apache.jetspeed.test.database.default.name>mssql</org.apache.jetspeed.test.database.default.name>
-                <org.apache.jetspeed.test.database.url>jdbc:jtds:sqlserver://localhost:1433/j2test</org.apache.jetspeed.test.database.url>
-                <org.apache.jetspeed.test.database.driver>net.sourceforge.jtds.jdbc.Driver</org.apache.jetspeed.test.database.driver>
-                <org.apache.jetspeed.test.database.user>sa</org.apache.jetspeed.test.database.user>
-                <org.apache.jetspeed.test.database.password>sa</org.apache.jetspeed.test.database.password>
-                <org.apache.jetspeed.production.jdbc.drivers.path>${org.apache.jetspeed.server.home}/shared/lib/jtds-1.2.jar</org.apache.jetspeed.production.jdbc.drivers.path>
-                <org.apache.jetspeed.production.database.default.name>mssql</org.apache.jetspeed.production.database.default.name>
-                <org.apache.jetspeed.production.database.url>jdbc:jtds:sqlserver://localhost:1433/j2</org.apache.jetspeed.production.database.url>
-                <org.apache.jetspeed.production.database.driver>net.sourceforge.jtds.jdbc.Driver</org.apache.jetspeed.production.database.driver>
-                <org.apache.jetspeed.production.database.user>sa</org.apache.jetspeed.production.database.user>
-                <org.apache.jetspeed.production.database.password>sa</org.apache.jetspeed.production.database.password>
+                <!-- Jetspeed-2 deployment properties -->
 
+                <org.apache.jetspeed.server.home>c:/Program Files/Apache Software Foundation/Tomcat
5.5</org.apache.jetspeed.server.home>
+                <org.apache.jetspeed.catalina.version.major>5.5</org.apache.jetspeed.catalina.version.major>
+                <org.apache.jetspeed.services.autodeployment.server>localhost</org.apache.jetspeed.services.autodeployment.server>
+                <org.apache.jetspeed.services.autodeployment.port>8080</org.apache.jetspeed.services.autodeployment.port>
+                <org.apache.jetspeed.services.autodeployment.user>j2deployer</org.apache.jetspeed.services.autodeployment.user>
+                <org.apache.jetspeed.services.autodeployment.password>j2deployer</org.apache.jetspeed.services.autodeployment.password>
+    
                 <!-- Derby embedded database properties -->
 
-                <!--
                 <org.apache.jetspeed.test.jdbc.drivers.path></org.apache.jetspeed.test.jdbc.drivers.path>
                 <org.apache.jetspeed.test.database.default.name>derby</org.apache.jetspeed.test.database.default.name>
                 <org.apache.jetspeed.test.database.url>jdbc:derby:/tmp/j2test</org.apache.jetspeed.test.database.url>
@@ -66,6 +59,22 @@
                 <org.apache.jetspeed.production.database.driver>org.apache.derby.jdbc.EmbeddedDriver</org.apache.jetspeed.production.database.driver>
                 <org.apache.jetspeed.production.database.user></org.apache.jetspeed.production.database.user>
                 <org.apache.jetspeed.production.database.password></org.apache.jetspeed.production.database.password>
+
+                <!-- MSSQL database properties -->
+
+                <!--
+                <org.apache.jetspeed.test.jdbc.drivers.path>${org.apache.jetspeed.server.home}/shared/lib/jtds-1.2.jar</org.apache.jetspeed.test.jdbc.drivers.path>
+                <org.apache.jetspeed.test.database.default.name>mssql</org.apache.jetspeed.test.database.default.name>
+                <org.apache.jetspeed.test.database.url>jdbc:jtds:sqlserver://localhost:1433/j2test</org.apache.jetspeed.test.database.url>
+                <org.apache.jetspeed.test.database.driver>net.sourceforge.jtds.jdbc.Driver</org.apache.jetspeed.test.database.driver>
+                <org.apache.jetspeed.test.database.user>sa</org.apache.jetspeed.test.database.user>
+                <org.apache.jetspeed.test.database.password>sa</org.apache.jetspeed.test.database.password>
+                <org.apache.jetspeed.production.jdbc.drivers.path>${org.apache.jetspeed.server.home}/shared/lib/jtds-1.2.jar</org.apache.jetspeed.production.jdbc.drivers.path>
+                <org.apache.jetspeed.production.database.default.name>mssql</org.apache.jetspeed.production.database.default.name>
+                <org.apache.jetspeed.production.database.url>jdbc:jtds:sqlserver://localhost:1433/j2</org.apache.jetspeed.production.database.url>
+                <org.apache.jetspeed.production.database.driver>net.sourceforge.jtds.jdbc.Driver</org.apache.jetspeed.production.database.driver>
+                <org.apache.jetspeed.production.database.user>sa</org.apache.jetspeed.production.database.user>
+                <org.apache.jetspeed.production.database.password>sa</org.apache.jetspeed.production.database.password>
                 -->
 
                 <!-- HSQLDB embedded database properties -->
@@ -85,15 +94,6 @@
                 <org.apache.jetspeed.production.database.password></org.apache.jetspeed.production.database.password>
                 -->
     
-                <!-- Jetspeed-2 deployment properties -->
-
-                <org.apache.jetspeed.server.home>c:/Program Files/Apache Software Foundation/Tomcat
5.5</org.apache.jetspeed.server.home>
-                <org.apache.jetspeed.catalina.version.major>5.5</org.apache.jetspeed.catalina.version.major>
-                <org.apache.jetspeed.services.autodeployment.server>localhost</org.apache.jetspeed.services.autodeployment.server>
-                <org.apache.jetspeed.services.autodeployment.port>8080</org.apache.jetspeed.services.autodeployment.port>
-                <org.apache.jetspeed.services.autodeployment.user>j2deployer</org.apache.jetspeed.services.autodeployment.user>
-                <org.apache.jetspeed.services.autodeployment.password>j2deployer</org.apache.jetspeed.services.autodeployment.password>
-    
             </properties>
         </profile>
 
@@ -101,14 +101,14 @@
 
     <activeProfiles>
 
-        <!-- Drivers path configured database profile -->
+        <!-- Derby embedded database properties -->
 
-        <activeProfile>jetspeed-db-drivers-path</activeProfile>
+        <activeProfile>jetspeed-db-embedded-derby</activeProfile>
 
-        <!-- Derby embedded database properties -->
+        <!-- Drivers path configured database profile -->
 
         <!--
-        <activeProfile>jetspeed-db-embedded-derby</activeProfile>
+        <activeProfile>jetspeed-db-drivers-path</activeProfile>
         -->
 
         <!-- HSQLDB embedded database profile -->



---------------------------------------------------------------------
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