svn commit: r1427047 - in /db/derby/code/trunk/java/engine/org/apache/derby/jdbc: EmbedPooledConnection.java EmbeddedDataSource.java EmbeddedDataSource40.java

[da...@apache.org]

Author: dag
Date: Mon Dec 31 07:02:09 2012
New Revision: 1427047

URL: http://svn.apache.org/viewvc?rev=1427047&view=rev
Log:
DERBY-4955 Prepare Derby to run with Compact Profiles (JEP 161) 

Patch derby-5955-embed-restructure-followup, some white space changes
plus a missed fix to EmbeddedDataSource40 which was in the original
proff-of-concept patch but fell through the cracks in the committed
patch derby-5955-embed-restructure-04.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java?rev=1427047&r1=1427046&r2=1427047&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java Mon Dec 31 07:02:09 2012
@@ -88,7 +88,7 @@ class EmbedPooledConnection implements j
 	BrokeredConnection currentConnectionHandle;
 
 	// set up once by the data source
-   final EmbeddedBaseDataSource dataSource;
+    final EmbeddedBaseDataSource dataSource;
 	private final String username;
 	private final String password;
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java?rev=1427047&r1=1427046&r2=1427047&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java Mon Dec 31 07:02:09 2012
@@ -225,18 +225,18 @@ public class EmbeddedDataSource extends 
      * @return the created reference object for this data source
      * @exception NamingException cannot find named object
      */
-   public final Reference getReference() throws NamingException
+    public final Reference getReference() throws NamingException
 	{
-       // These fields will be set by the JNDI server when it decides to
-       // materialize a data source.
-       Reference ref = new Reference(
-               this.getClass().getName(),
-               "org.apache.derby.jdbc.ReferenceableDataSource",
-               null);
+        // These fields will be set by the JNDI server when it decides to
+        // materialize a data source.
+        Reference ref = new Reference(
+            this.getClass().getName(),
+            "org.apache.derby.jdbc.ReferenceableDataSource",
+            null);
 
         addBeanProperties(this, ref);
 
-       return ref;
+        return ref;
 	}
 
     /**
@@ -248,7 +248,7 @@ public class EmbeddedDataSource extends 
      * converted from the method name. E.g. traceDirectory for
      * traceDirectory.
      *
-      */
+     */
     private static void addBeanProperties(Object ths, Reference ref)
     {
         // Look for all the getXXX methods in the class that take no arguments.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java?rev=1427047&r1=1427046&r2=1427047&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java Mon Dec 31 07:02:09 2012
@@ -176,7 +176,10 @@ import org.apache.derby.impl.jdbc.Util;
 	</PRE>
 
 */
-public class EmbeddedDataSource40 extends EmbeddedDataSource {
+public class EmbeddedDataSource40 extends EmbeddedDataSource
+    implements javax.sql.DataSource /* compile-time check for 4.1 extension */
+{
+   private static final long serialVersionUID = 4472591890758954803L;
     
     public EmbeddedDataSource40() {
     }