svn commit: r1236609 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java

[oltka]

Author: oltka
Date: Fri Jan 27 09:07:22 2012
New Revision: 1236609

URL: http://svn.apache.org/viewvc?rev=1236609&view=rev
Log:
CAY-1656 make sence generate property for all dataNodes with factory not 
XMLPoolingDataSourceFactory

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java?rev=1236609&r1=1236608&r2=1236609&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
 Fri Jan 27 09:07:22 2012
@@ -24,9 +24,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.configuration.server.DBCPDataSourceFactory;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.JNDIDataSourceFactory;
 import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.resource.Resource;
@@ -111,7 +108,7 @@ public class DataNodeDescriptor implemen
         encoder.printlnAttribute("adapter", adapterType);
         encoder.printlnAttribute("factory", dataSourceFactoryType);
         
-        if 
(JNDIDataSourceFactory.class.getName().equals(dataSourceFactoryType) ||  
DBCPDataSourceFactory.class.getName().equals(dataSourceFactoryType)) {
+        if 
(!XMLPoolingDataSourceFactory.class.getName().equals(dataSourceFactoryType)) {
             encoder.printlnAttribute("parameters", parameters);
         }
         encoder.printlnAttribute("schema-update-strategy", 
schemaUpdateStrategyType);