cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r930709 - in /cayenne/main/trunk/framework: cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/ cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/
Date Sun, 04 Apr 2010 16:24:38 GMT
Author: aadamchik
Date: Sun Apr  4 16:24:38 2010
New Revision: 930709

URL: http://svn.apache.org/viewvc?rev=930709&view=rev
Log:
CAY-1414 Remove org.apache.cayenne.conf package

Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceBuilder.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DBCPDataSourceProperties.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/conf/DBCPDataSourcePropertiesTest.java
Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java?rev=930709&r1=930708&r2=930709&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
Sun Apr  4 16:24:38 2010
@@ -21,9 +21,9 @@ package org.apache.cayenne.modeler.actio
 
 import java.util.Collection;
 
-import org.apache.cayenne.conf.DriverDataSourceFactory;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ProjectController;
@@ -49,9 +49,11 @@ public abstract class DBWizardAction ext
         if (node == null) {
             DataMap map = projectController.getCurrentDataMap();
             if (map != null) {
-                Collection<DataNodeDescriptor> nodes = ((DataChannelDescriptor)projectController.getProject().getRootNode()).getNodeDescriptors();
-                for(DataNodeDescriptor n:nodes){
-                    if(n.getDataMapNames().contains(map.getName())){
+                Collection<DataNodeDescriptor> nodes = ((DataChannelDescriptor) projectController
+                        .getProject()
+                        .getRootNode()).getNodeDescriptors();
+                for (DataNodeDescriptor n : nodes) {
+                    if (n.getDataMapNames().contains(map.getName())) {
                         node = n;
                         break;
                     }
@@ -67,7 +69,7 @@ public abstract class DBWizardAction ext
 
             // only driver nodes have meaningful connection info set
             DataNodeDescriptor node = getPreferredNode();
-            return (node != null && DriverDataSourceFactory.class.getName().equals(
+            return (node != null && XMLPoolingDataSourceFactory.class.getName().equals(
                     node.getDataSourceFactoryType())) ? "DataNode Connection Info" : null;
         }
 
@@ -88,7 +90,8 @@ public abstract class DBWizardAction ext
         // if node has local DS set, use it
         DataNodeDefaults nodeDefaults = (DataNodeDefaults) getApplication()
                 .getCayenneProjectPreferences()
-                .getProjectDetailObject(DataNodeDefaults.class,
+                .getProjectDetailObject(
+                        DataNodeDefaults.class,
                         getProjectController().getPreferenceForDataDomain().node(
                                 "DataNode").node(node.getName()));
 
@@ -105,7 +108,8 @@ public abstract class DBWizardAction ext
         }
 
         // extract data from the node
-        if (!DriverDataSourceFactory.class.getName().equals(node.getDataSourceFactoryType()))
{
+        if (!XMLPoolingDataSourceFactory.class.getName().equals(
+                node.getDataSourceFactoryType())) {
             return null;
         }
 



Mime
View raw message