[dna-commits] DNA SVN: r714 - in trunk/extensions: dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi and 2 other directories.

[dna-commits at lists.jboss.org]

Author: lisbor
Date: 2009-01-19 07:31:54 -0500 (Mon, 19 Jan 2009)
New Revision: 714

Modified:
   trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java
   trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java
   trunk/extensions/dna-connector-jdbc-metadata/.classpath
   trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcConnection.java
   trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRequestProcesor.java
Log:
DNA-37 Federate schema information from relational sources
https://jira.jboss.org/jira/browse/DNA-37
Fix warning messages

Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java
===================================================================
--- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java	2009-01-16 21:47:49 UTC (rev 713)
+++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/util/DatabaseUtil.java	2009-01-19 12:31:54 UTC (rev 714)
@@ -2261,7 +2261,7 @@
             // foreign key name
             String foreignKeyName = getString(resultSet, "FK_NAME", false);
             // primary key name
-            String primaryKeyName = getString(resultSet, "PK_NAME", false);
+            //String primaryKeyName = getString(resultSet, "PK_NAME", false);
             // can the evaluation of foreign key constraints be deferred until commit
             Integer defferability = getInteger(resultSet, "DEFERRABILITY", false);
 

Modified: trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java
===================================================================
--- trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java	2009-01-16 21:47:49 UTC (rev 713)
+++ trunk/extensions/dna-common-jdbc/src/test/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBeanTest.java	2009-01-19 12:31:54 UTC (rev 714)
@@ -80,6 +80,13 @@
     /**
      * testDatabaseMetadataExceptions
      */
+    public void testModelFactoryIsNotNull() {
+        assertNotNull("Default model factory shall be set", factory);
+    }
+   
+    /**
+     * testDatabaseMetadataExceptions
+     */
     public void testGetExceptions() {
         // get list of exceptions
         List<DatabaseMetaDataMethodException> exceptionList = bean.getExceptionList();

Modified: trunk/extensions/dna-connector-jdbc-metadata/.classpath
===================================================================
--- trunk/extensions/dna-connector-jdbc-metadata/.classpath	2009-01-16 21:47:49 UTC (rev 713)
+++ trunk/extensions/dna-connector-jdbc-metadata/.classpath	2009-01-19 12:31:54 UTC (rev 714)
@@ -4,7 +4,8 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/data"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcConnection.java
===================================================================
--- trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcConnection.java	2009-01-16 21:47:49 UTC (rev 713)
+++ trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcConnection.java	2009-01-19 12:31:54 UTC (rev 714)
@@ -148,7 +148,7 @@
     public void execute( ExecutionContext context,
                          Request request ) throws RepositorySourceException {
         // create processor and delegate handling 
-        RequestProcessor proc = new JdbcRequestProcesor(getSourceName(),context, connection);
+        RequestProcessor proc = new JdbcRequestProcesor(getSourceName(),context, connection, rootNodeUuid);
         try {
             proc.process(request);
         } finally {

Modified: trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRequestProcesor.java
===================================================================
--- trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRequestProcesor.java	2009-01-16 21:47:49 UTC (rev 713)
+++ trunk/extensions/dna-connector-jdbc-metadata/src/main/java/org/jboss/dna/connector/jdbc/JdbcRequestProcesor.java	2009-01-19 12:31:54 UTC (rev 714)
@@ -24,6 +24,7 @@
 package org.jboss.dna.connector.jdbc;
 
 import java.sql.Connection;
+import java.util.UUID;
 import org.jboss.dna.common.util.Logger;
 import org.jboss.dna.graph.ExecutionContext;
 import org.jboss.dna.graph.property.DateTime;
@@ -44,6 +45,7 @@
  */
 public class JdbcRequestProcesor extends RequestProcessor {
     protected Connection connection;
+    protected UUID rootNodeUuid;
     
     /**
      * Logging for this instance
@@ -54,26 +56,32 @@
      * @param sourceName
      * @param context
      * @param connection 
+     * @param rootNodeUuid 
      */
     public JdbcRequestProcesor( String sourceName,
                                 ExecutionContext context,
-                                Connection connection) {
+                                Connection connection,
+                                UUID rootNodeUuid) {
         super(sourceName, context);
         this.connection = connection;
+        this.rootNodeUuid = rootNodeUuid;
     }
 
     /**
      * @param sourceName
      * @param context
      * @param connection 
+     * @param rootNodeUuid 
      * @param now
      */
     public JdbcRequestProcesor( String sourceName,
                                 ExecutionContext context,
                                 Connection connection,
+                                UUID rootNodeUuid,
                                 DateTime now ) {
         super(sourceName, context, now);
         this.connection = connection;
+        this.rootNodeUuid = rootNodeUuid;
     }
 
     /**