Fix names space; mc --> pojo.

QStephen · Sep 1, 2011 · 7ebb970 · 7ebb970
1 parent f6566e1
commit 7ebb970
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/pojo/src/main/java/org/jboss/as/pojo/KernelDeploymentParsingProcessor.java b/pojo/src/main/java/org/jboss/as/pojo/KernelDeploymentParsingProcessor.java
@@ -22,16 +22,6 @@
 
 package org.jboss.as.pojo;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
 import org.jboss.as.pojo.descriptor.KernelDeploymentXmlDescriptor;
 import org.jboss.as.pojo.descriptor.KernelDeploymentXmlDescriptorParser;
 import org.jboss.as.server.deployment.Attachments;
@@ -45,6 +35,15 @@
 import org.jboss.vfs.VirtualFile;
 import org.jboss.vfs.util.SuffixMatchFilter;
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * DeploymentUnitProcessor responsible for parsing a jboss-beans.xml
  * descriptor and attaching the corresponding KernelDeploymentXmlDescriptor.
@@ -57,7 +56,7 @@ public class KernelDeploymentParsingProcessor implements DeploymentUnitProcessor
     private final XMLInputFactory inputFactory = XMLInputFactory.newInstance();
 
     public KernelDeploymentParsingProcessor() {
-        xmlMapper.registerRootElement(new QName("urn:jboss:mc:7.0", "deployment"), new KernelDeploymentXmlDescriptorParser());
+        xmlMapper.registerRootElement(new QName(KernelDeploymentXmlDescriptorParser.NAMESPACE, "deployment"), new KernelDeploymentXmlDescriptorParser());
     }
 
     /**

diff --git a/pojo/src/main/java/org/jboss/as/pojo/descriptor/KernelDeploymentXmlDescriptorParser.java b/pojo/src/main/java/org/jboss/as/pojo/descriptor/KernelDeploymentXmlDescriptorParser.java
@@ -48,7 +48,7 @@
  * @author <a href="mailto:[email protected]">Ales Justin</a>
  */
 public class KernelDeploymentXmlDescriptorParser implements XMLElementReader<ParseResult<KernelDeploymentXmlDescriptor>>, XMLStreamConstants {
-    public static final String NAMESPACE = "urn:jboss:mc:7.0";
+    public static final String NAMESPACE = "urn:jboss:pojo:7.0";
 
     private enum Element {
         BEAN(new QName(NAMESPACE, "bean")),

diff --git a/testsuite/integration/src/test/resources/pojo/a-jboss-beans.xml b/testsuite/integration/src/test/resources/pojo/a-jboss-beans.xml
@@ -19,9 +19,9 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<deployment xmlns="urn:jboss:mc:7.0"
+<deployment xmlns="urn:jboss:pojo:7.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:jboss:mc:7.0 jboss-mc_7_0.xsd">
+      xsi:schemaLocation="urn:jboss:pojo:7.0 jboss-mc_7_0.xsd">
 
     <bean name="A" class="org.jboss.as.testsuite.integration.pojo.support.A">
         <constructor>

diff --git a/testsuite/integration/src/test/resources/pojo/b-jboss-beans.xml b/testsuite/integration/src/test/resources/pojo/b-jboss-beans.xml
@@ -19,9 +19,9 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<deployment xmlns="urn:jboss:mc:7.0"
+<deployment xmlns="urn:jboss:pojo:7.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:jboss:mc:7.0 jboss-mc_7_0.xsd">
+      xsi:schemaLocation="urn:jboss:pojo:7.0 jboss-mc_7_0.xsd">
 
     <bean name="B" class="org.jboss.as.testsuite.integration.pojo.support.B">
         <property name="a"><inject bean="A"/></property>

diff --git a/testsuite/integration/src/test/resources/pojo/callback-jboss-beans.xml b/testsuite/integration/src/test/resources/pojo/callback-jboss-beans.xml
@@ -19,9 +19,9 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<deployment xmlns="urn:jboss:mc:7.0"
+<deployment xmlns="urn:jboss:pojo:7.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:jboss:mc:7.0 jboss-mc_7_0.xsd">
+      xsi:schemaLocation="urn:jboss:pojo:7.0 jboss-mc_7_0.xsd">
 
     <bean name="Injectee1" class="org.jboss.as.testsuite.integration.pojo.support.TInjectee" />
 

diff --git a/testsuite/integration/src/test/resources/pojo/collections-jboss-beans.xml b/testsuite/integration/src/test/resources/pojo/collections-jboss-beans.xml
@@ -19,9 +19,9 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<deployment xmlns="urn:jboss:mc:7.0"
+<deployment xmlns="urn:jboss:pojo:7.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:jboss:mc:7.0 jboss-mc_7_0.xsd">
+      xsi:schemaLocation="urn:jboss:pojo:7.0 jboss-mc_7_0.xsd">
 
     <bean name="TC" class="org.jboss.as.testsuite.integration.pojo.support.TCollections">
         <property name="numbers">

diff --git a/testsuite/integration/src/test/resources/pojo/simple-jboss-beans.xml b/testsuite/integration/src/test/resources/pojo/simple-jboss-beans.xml
@@ -19,9 +19,9 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<deployment xmlns="urn:jboss:mc:7.0"
+<deployment xmlns="urn:jboss:pojo:7.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:jboss:mc:7.0 jboss-mc_7_0.xsd">
+      xsi:schemaLocation="urn:jboss:pojo:7.0 jboss-mc_7_0.xsd">
 
     <bean name="Bean">
         <alias>Alias-Bean</alias>

diff --git a/testsuite/integration/src/test/resources/pojo/type-jboss-beans.xml b/testsuite/integration/src/test/resources/pojo/type-jboss-beans.xml
@@ -19,9 +19,9 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<deployment xmlns="urn:jboss:mc:7.0"
+<deployment xmlns="urn:jboss:pojo:7.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:jboss:mc:7.0 jboss-mc_7_0.xsd">
+      xsi:schemaLocation="urn:jboss:pojo:7.0 jboss-mc_7_0.xsd">
 
     <bean name="B" class="org.jboss.as.testsuite.integration.pojo.support.B">
         <property name="c"><inject/></property>