You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/02/07 11:48:19 UTC
[1/2] cayenne git commit: Unknown tag in XML parser
Repository: cayenne
Updated Branches:
refs/heads/master 234d97980 -> e88edcf58
Unknown tag in XML parser
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/40bcac77
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/40bcac77
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/40bcac77
Branch: refs/heads/master
Commit: 40bcac77a03e7a7ecb8df930a0aac6017430bf3c
Parents: d8a944b
Author: Arseni Bulatski <an...@gmail.com>
Authored: Tue Feb 6 11:50:34 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Feb 6 11:50:34 2018 +0300
----------------------------------------------------------------------
.../cayenne/configuration/xml/DataChannelChildrenHandler.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/40bcac77/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
index e351fac..99d1f7a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DataChannelChildrenHandler.java
@@ -40,6 +40,7 @@ final class DataChannelChildrenHandler extends NamespaceAwareNestedTagHandler {
static final String NODE_TAG = "node";
static final String PROPERTY_TAG = "property";
static final String DATA_MAP_TAG = "data-map";
+ static final String DOMAIN_TAG = "domain";
private XMLDataChannelDescriptorLoader xmlDataChannelDescriptorLoader;
@@ -67,6 +68,9 @@ final class DataChannelChildrenHandler extends NamespaceAwareNestedTagHandler {
case NODE_TAG:
addNode(attributes);
return true;
+
+ case DOMAIN_TAG:
+ return true;
}
return false;
[2/2] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/267' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/267' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e88edcf5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e88edcf5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e88edcf5
Branch: refs/heads/master
Commit: e88edcf58864c9d5457de484903958eb8dbf6f83
Parents: 234d979 40bcac7
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Feb 7 14:47:53 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Feb 7 14:47:53 2018 +0300
----------------------------------------------------------------------
.../cayenne/configuration/xml/DataChannelChildrenHandler.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------