You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2012/01/27 09:19:50 UTC
svn commit: r1236573 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
Author: oltka
Date: Fri Jan 27 08:19:50 2012
New Revision: 1236573
URL: http://svn.apache.org/viewvc?rev=1236573&view=rev
Log:
CAY-1656 cayenne generate extra data in xml model when change factory
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=1236573&r1=1236572&r2=1236573&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 08:19:50 2012
@@ -24,7 +24,10 @@ 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;
import org.apache.cayenne.util.XMLEncoder;
@@ -107,7 +110,10 @@ public class DataNodeDescriptor implemen
encoder.printlnAttribute("adapter", adapterType);
encoder.printlnAttribute("factory", dataSourceFactoryType);
- encoder.printlnAttribute("parameters", parameters);
+
+ if (JNDIDataSourceFactory.class.getName().equals(dataSourceFactoryType) || DBCPDataSourceFactory.class.getName().equals(dataSourceFactoryType)) {
+ encoder.printlnAttribute("parameters", parameters);
+ }
encoder.printlnAttribute("schema-update-strategy", schemaUpdateStrategyType);
encoder.println(">");
@@ -123,7 +129,7 @@ public class DataNodeDescriptor implemen
}
}
- if (dataSourceDescriptor != null) {
+ if (dataSourceDescriptor != null && XMLPoolingDataSourceFactory.class.getName().equals(dataSourceFactoryType)) {
dataSourceDescriptor.encodeAsXML(encoder);
}