Merge pull request #10912 from ctomc/metadata-split-package

WFLY-9867 JBMETA-405 Upgrade metadata to 12.0.0.Beta1
wildfly · Mar 2, 2018 · f2d1534 · f2d1534
2 parents b38790e + 16e953a
commit f2d1534
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 32 deletions.
diff --git a/ee/src/main/java/org/jboss/as/ee/structure/AppJBossAllParser.java b/ee/src/main/java/org/jboss/as/ee/structure/AppJBossAllParser.java
@@ -29,7 +29,7 @@
 import org.jboss.as.server.deployment.DeploymentUnit;
 import org.jboss.as.server.deployment.jbossallxml.JBossAllXMLParser;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.parser.jboss.JBossAppMetaDataParser;
+import org.jboss.metadata.ear.parser.jboss.JBossAppMetaDataParser;
 import org.jboss.staxmapper.XMLExtendedStreamReader;
 
 /**

diff --git a/ee/src/main/java/org/jboss/as/ee/structure/EarMetaDataParsingProcessor.java b/ee/src/main/java/org/jboss/as/ee/structure/EarMetaDataParsingProcessor.java
@@ -35,10 +35,10 @@
 import org.jboss.as.server.deployment.DeploymentUnitProcessor;
 import org.jboss.as.server.deployment.module.ResourceRoot;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.merge.JBossAppMetaDataMerger;
+import org.jboss.metadata.ear.parser.jboss.JBossAppMetaDataParser;
+import org.jboss.metadata.ear.parser.spec.EarMetaDataParser;
 import org.jboss.metadata.ear.spec.EarMetaData;
-import org.jboss.metadata.merge.JBossAppMetaDataMerger;
-import org.jboss.metadata.parser.jboss.JBossAppMetaDataParser;
-import org.jboss.metadata.parser.spec.EarMetaDataParser;
 import org.jboss.metadata.parser.util.NoopXMLResolver;
 import org.jboss.metadata.property.PropertyReplacer;
 import org.jboss.vfs.VFSUtils;

diff --git a/...ain/java/org/jboss/as/ejb3/deployment/processors/merging/TimerMethodMergingProcessor.java b/...ain/java/org/jboss/as/ejb3/deployment/processors/merging/TimerMethodMergingProcessor.java
@@ -42,8 +42,8 @@
 import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
 import org.jboss.as.server.deployment.reflect.ClassReflectionIndex;
 import org.jboss.as.server.deployment.reflect.DeploymentReflectionIndex;
-import org.jboss.metadata.common.ejb.IScheduleTarget;
-import org.jboss.metadata.common.ejb.ITimeoutTarget;
+import org.jboss.metadata.ejb.common.IScheduleTarget;
+import org.jboss.metadata.ejb.common.ITimeoutTarget;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
 import org.jboss.metadata.ejb.spec.ScheduleMetaData;

diff --git a/pom.xml b/pom.xml
@@ -190,7 +190,7 @@
         <!-- Only used for testing -->
         <version.org.jboss.logmanager.commons-logging-jboss-logmanager>1.0.3.Final</version.org.jboss.logmanager.commons-logging-jboss-logmanager>
         <version.org.jboss.narayana>5.5.31.Final</version.org.jboss.narayana>
-        <version.org.jboss.metadata>11.0.0.Final</version.org.jboss.metadata>
+        <version.org.jboss.metadata>12.0.0.Beta1</version.org.jboss.metadata>
         <version.org.jboss.mod_cluster>1.3.8.Final</version.org.jboss.mod_cluster>
         <version.org.jboss.openjdk-orb>8.1.0.Final</version.org.jboss.openjdk-orb>
         <version.org.jboss.xnio.netty.netty-xnio-transport>0.1.2.Final</version.org.jboss.xnio.netty.netty-xnio-transport>

diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/jboss-ejb3.xml b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/jboss-ejb3.xml
@@ -6,7 +6,7 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-2_0.xsd
                   http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd
-                  urn:iiop jboss-ejb-iiop_1_0.xsd"
+                  urn:iiop http://www.jboss.org/j2ee/schema/jboss-ejb-iiop_1_1.xsd"
                version="3.1"
                impl-version="2.0">
     <assembly-descriptor>
@@ -17,20 +17,9 @@
         <iiop:iiop>
             <ejb-name>*</ejb-name>
             <iiop:ior-security-config>
-                <iiop:transport-config>
-                    <iiop:integrity>supported</iiop:integrity>
-                    <iiop:confidentiality>supported</iiop:confidentiality>
-                    <iiop:establish-trust-in-target>supported</iiop:establish-trust-in-target>
-                    <iiop:establish-trust-in-client>supported</iiop:establish-trust-in-client>
-                </iiop:transport-config>
-                <iiop:as-context>
-                    <iiop:auth-method>username_password</iiop:auth-method>
-                    <iiop:realm>default</iiop:realm>
-                    <iiop:required>false</iiop:required>
-                </iiop:as-context>
-                <iiop:sas-context>
-                    <iiop:caller-propagation>supported</iiop:caller-propagation>
-                </iiop:sas-context>
+                <iiop:transport-config integrity="supported" confidentiality="supported"  establish-trust-in-target="supported" establish-trust-in-client="supported" />
+                <iiop:as-context auth-method="username_password" realm="default" required="false" />
+                <iiop:sas-context caller-propagation="supported" />
             </iiop:ior-security-config>
         </iiop:iiop>
     </assembly-descriptor>

diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiopssl/basic/jboss-ejb3.xml b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiopssl/basic/jboss-ejb3.xml
@@ -6,7 +6,7 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-2_0.xsd
                   http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd
-                  urn:iiop jboss-ejb-iiop_1_0.xsd"
+                  urn:iiop http://www.jboss.org/j2ee/schema/jboss-ejb-iiop_1_1.xsd"
                version="3.1"
                impl-version="2.0">
     <assembly-descriptor>
@@ -17,15 +17,8 @@
         <iiop:iiop>
             <ejb-name>*</ejb-name>
             <iiop:ior-security-config>
-                <iiop:transport-config>
-                    <iiop:integrity>required</iiop:integrity>
-                    <iiop:confidentiality>required</iiop:confidentiality>
-                    <iiop:establish-trust-in-target>supported</iiop:establish-trust-in-target>
-                    <iiop:establish-trust-in-client>supported</iiop:establish-trust-in-client>
-                </iiop:transport-config>
-                <iiop:sas-context>
-                    <iiop:caller-propagation>supported</iiop:caller-propagation>
-                </iiop:sas-context>
+                <iiop:transport-config integrity="required" confidentiality="required" establish-trust-in-client="supported" establish-trust-in-target="supported" />
+                <iiop:sas-context caller-propagation="supported" />
             </iiop:ior-security-config>
         </iiop:iiop>
     </assembly-descriptor>