You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/12/12 18:54:58 UTC
svn commit: r889955 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
Author: aadamchik
Date: Sat Dec 12 17:54:57 2009
New Revision: 889955
URL: http://svn.apache.org/viewvc?rev=889955&view=rev
Log:
CAY-1319 Minimal DI container-based configuration to run Cayenne
* fixing configuration version loading
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java?rev=889955&r1=889954&r2=889955&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java Sat Dec 12 17:54:57 2009
@@ -142,14 +142,17 @@
String namespaceURI,
String localName,
String name,
- Attributes atts) {
+ Attributes attributes) {
if (localName.equals(DOMAIN_TAG)) {
+ String version = attributes.getValue("", "project-version");
+ descriptor.setVersion(version);
+
return new DataChannelChildrenHandler(parser, this);
}
logger.info(unexpectedTagMessage(localName, DOMAIN_TAG));
- return super.createChildTagHandler(namespaceURI, localName, name, atts);
+ return super.createChildTagHandler(namespaceURI, localName, name, attributes);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java?rev=889955&r1=889954&r2=889955&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java Sat Dec 12 17:54:57 2009
@@ -147,6 +147,7 @@
assertNotNull(descriptor);
assertNull(descriptor.getName());
+ assertEquals("6", descriptor.getVersion());
Collection<DataMap> maps = descriptor.getDataMaps();
assertEquals(2, maps.size());