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 2008/08/12 00:24:43 UTC
svn commit: r684963 - /openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java

Author: dblevins
Date: Mon Aug 11 15:24:42 2008
New Revision: 684963

URL: http://svn.apache.org/viewvc?rev=684963&view=rev
Log:
Handle more namespaces in the upgrade logic

Modified:
    openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java?rev=684963&r1=684962&r2=684963&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java Mon Aug 11 15:24:42 2008
@@ -151,12 +151,27 @@
 
     //String uri, String localName, String qName, Attributes atts
     public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+
         if (uri.startsWith("http://openejb.apache.org/xml/ns/openejb-jar-2")){
             uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";
         } else if (uri.startsWith("http://www.openejb.org/xml/ns/openejb-jar-2")){
             uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";
+        } else if (uri.startsWith("http://openejb.org/xml/ns/openejb-jar-2")){
+            uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";
+        } else if (uri.startsWith("http://openejb.apache.org/xml/ns/pkgen-2")){
+            uri = "http://openejb.apache.org/xml/ns/pkgen-2.1";
         } else if (uri.startsWith("http://www.openejb.org/xml/ns/pkgen-2")){
             uri = "http://openejb.apache.org/xml/ns/pkgen-2.1";
+        } else if (uri.startsWith("http://openejb.org/xml/ns/pkgen-2")){
+            uri = "http://openejb.apache.org/xml/ns/pkgen-2.1";
+        } else if (uri.startsWith("http://geronimo.apache.org/xml/ns/deployment-1")){
+            uri = "http://geronimo.apache.org/xml/ns/deployment-1.2";
+        } else if (uri.startsWith("http://geronimo.apache.org/xml/ns/j2ee/application-1")) {
+            uri = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
+        } else if (uri.startsWith("http://geronimo.apache.org/xml/ns/naming-1")) {
+            uri = "http://geronimo.apache.org/xml/ns/naming-1.2";
+        } else if (uri.startsWith("http://geronimo.apache.org/xml/ns/security-2")) {
+            uri = "http://geronimo.apache.org/xml/ns/security-2.0";
         }
 
         String previousNs = visibleNamespaces.peek();