You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/23 23:22:36 UTC
svn commit: r499157 -
/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java
Author: dblevins
Date: Tue Jan 23 14:22:35 2007
New Revision: 499157
URL: http://svn.apache.org/viewvc?view=rev&rev=499157
Log:
Fix for duplicate table-name
Modified:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java?view=diff&rev=499157&r1=499156&r2=499157
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java Tue Jan 23 14:22:35 2007
@@ -115,7 +115,6 @@
ns.put("sql", "http://openejb.apache.org/xml/ns/pkgen-2.1");
ns.put("sql-generator", "http://openejb.apache.org/xml/ns/pkgen-2.1");
ns.put("suppress-default-environment", "http://geronimo.apache.org/xml/ns/deployment-1.2");
- ns.put("table-name", "http://openejb.apache.org/xml/ns/pkgen-2.1");
ns.put("type", "http://geronimo.apache.org/xml/ns/deployment-1.2");
ns.put("uri", "http://geronimo.apache.org/xml/ns/naming-1.2");
ns.put("url", "http://geronimo.apache.org/xml/ns/naming-1.2");
@@ -137,6 +136,7 @@
duplicates.put("name", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2", "http://geronimo.apache.org/xml/ns/naming-1.2"));
duplicates.put("pattern", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2", "http://geronimo.apache.org/xml/ns/naming-1.2"));
duplicates.put("version", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2", "http://geronimo.apache.org/xml/ns/naming-1.2"));
+ duplicates.put("table-name", Arrays.asList("http://openejb.apache.org/xml/ns/openejb-jar-2.2", "http://openejb.apache.org/xml/ns/pkgen-2.1"));
}
public NamespaceFilter(XMLReader xmlReader) {