svn commit: r1648472 - in /portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE: components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/ jetspeed-installer/etc/ant-installer/ jetspeed-installer/etc/database/

Author: taylor
Date: Tue Dec 30 02:44:53 2014
New Revision: 1648472

URL: http://svn.apache.org/r1648472
Log:
syncing up with latest from 2.3.0 trunk

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
    portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/ant-installer/antinstall-config.xml
    portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/database/build.xml

Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java?rev=1648472&r1=1648471&r2=1648472&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java Tue Dec 30 02:44:53 2014
@@ -16,16 +16,6 @@
  */
 package org.apache.jetspeed.components.datasource;
 
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import javax.sql.DataSource;
-
 import org.apache.commons.dbcp.ConnectionFactory;
 import org.apache.commons.dbcp.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp.PoolableConnectionFactory;
@@ -35,6 +25,15 @@ import org.apache.commons.pool.impl.Gene
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.sql.DataSource;
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
 /**
  * <p>
  * DBCPDatasourceComponent
@@ -151,7 +150,15 @@ public class DBCPDatasourceComponent imp
             // Validate the connection before we go any further
             try
             {
-                Connection conn = DriverManager.getConnection(connectURI, user, password);
+                Connection conn = null;
+                if (user == null || user.trim().isEmpty()) {
+                    conn = DriverManager.getConnection(connectURI);
+                }
+                else {
+                    if (password == null)
+                        password = "";
+                    conn = DriverManager.getConnection(connectURI, user, password);
+                }
                 conn.close();
             }
             catch(Exception e)
@@ -161,9 +168,16 @@ public class DBCPDatasourceComponent imp
             }
             
             ObjectPool connectionPool = new GenericObjectPool(null, maxActive, whenExhausted, maxWait);
-            
-            ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(connectURI, user, password);
-            
+
+            ConnectionFactory connectionFactory = null;
+            if (user == null || user.trim().isEmpty()) {
+                connectionFactory = new DriverManagerConnectionFactory(connectURI, new Properties());
+            }
+            else {
+                if (password == null)
+                    password = "";
+                connectionFactory = new DriverManagerConnectionFactory(connectURI, user, password);
+            }
             dsConnectionFactory = new PoolableConnectionFactory(connectionFactory, connectionPool, null, null, false, autoCommit);
             
             dataSource = new PoolingDataSource(connectionPool);            

Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/ant-installer/antinstall-config.xml?rev=1648472&r1=1648471&r2=1648472&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/ant-installer/antinstall-config.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/ant-installer/antinstall-config.xml Tue Dec 30 02:44:53 2014
@@ -137,6 +137,7 @@
       <option text="Oracle 9" value="oracle9" />
       <option text="Oracle 10 or higher" value="oracle10" />
       <option text="SapDB" value="sapdb" />
+      <option text="Derby" value="derby2" />
     </select>
   </page>
 
@@ -273,6 +274,26 @@
           displayText="JDBC driver" checkExists="true" />
   </page>
 
+    <page type="input" name="sourceDerby" displayText="Derby Database connection parameters"
+          ifProperty="(${operation}=migratedb) AND (${source.dbName}=derby2)">
+        <hidden property="source.checkdb" value="true" />
+        <hidden property="source.dbvalid" value="true" />
+        <hidden property="source.dbDisplayName" value="Derby"/>
+
+        <comment displayText="Please fill in the fields below for connecting to the Derby network database." />
+
+        <text property="source.dbUser" displayText="Database User Name" defaultValue="" />
+        <text property="source.dbPassword" displayText="Database Password" defaultValue="" />
+
+        <text property="source.jdbcUrl" displayText="JDBC Connection String"
+              defaultValue="jdbc:derby://localhost/productiondb" />
+        <text property="source.jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="org.apache.derby.jdbc.ClientDriver" />
+
+        <file property="source.jdbcDriverJar"
+              defaultValue="${java.user.home}${java.file.separator}derbyclient.jar" displayText="JDBC driver"
+              checkExists="true" />
+    </page>
+
   <page type="input" name="sourceNoDBCheck" displayText="Skipping source database connection check"
     ifProperty="(${operation}=migratedb) AND (${source.checkdb}=false)">
     <hidden property="abort" value="false" />

Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/database/build.xml?rev=1648472&r1=1648471&r2=1648472&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-installer/etc/database/build.xml Tue Dec 30 02:44:53 2014
@@ -217,7 +217,7 @@
 
     </target>
 
-    <target name="migrateDB" depends="checkSourceOrTargetDerby" unless="_derby" >
+    <target name="migrateDB" >
 
         <echo>Migrate Jetspeed database from ${_source.jdbc.url} to ${_jdbc.url}</echo>
         <java classname="org.apache.jetspeed.tools.migration.JetspeedMigrationApplication" fork="yes" maxmemory="${jvmMaxMemory}" failonerror="yes">