WFLY-1077 IIOP subsystem: Configuration fix after rebase

jbosstm · Jan 13, 2015 · 0ccca9c · 0ccca9c
1 parent 4fda094
commit 0ccca9c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 26 deletions.
diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-genericjms.xml
@@ -11,7 +11,7 @@
         <subsystem supplement="full">ejb3.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
-        <subsystem>jacorb.xml</subsystem>
+        <subsystem>jdkorb.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
         <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-hornetq-colocated.xml
@@ -10,7 +10,7 @@
       <subsystem>ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jacorb.xml</subsystem>
+      <subsystem>jdkorb.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jmx.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-jts.xml
@@ -11,7 +11,7 @@
       <subsystem>ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jacorb.xml</subsystem>
+      <subsystem>jdkorb.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-picketlink.xml
@@ -10,7 +10,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jacorb.xml</subsystem>
+      <subsystem>jdkorb.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-rts.xml
@@ -11,7 +11,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jacorb.xml</subsystem>
+      <subsystem>jdkorb.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml b/feature-pack/src/main/resources/configuration/examples/subsystems-xts.xml
@@ -10,7 +10,7 @@
       <subsystem supplement="full">ejb3.xml</subsystem>
       <subsystem>io.xml</subsystem>
       <subsystem>infinispan.xml</subsystem>
-      <subsystem>jacorb.xml</subsystem>
+      <subsystem>jdkorb.xml</subsystem>
       <subsystem>jaxrs.xml</subsystem>
       <subsystem>jca.xml</subsystem>
       <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml
@@ -11,7 +11,7 @@
         <subsystem supplement="full-ha">ejb3.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem supplement="ha">infinispan.xml</subsystem>
-        <subsystem>jacorb.xml</subsystem>
+        <subsystem>jdkorb.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
         <subsystem>jca.xml</subsystem>
         <subsystem>jdr.xml</subsystem>

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml
@@ -23,11 +23,12 @@
   -->
 <module xmlns="urn:jboss:module:1.3" name="javax.orb.api">
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.openjdk-orb:openjdk-orb}"/>
     </resources>
 
     <dependencies>
       <module name="sun.jdk"/>
       <module name="javax.transaction.api"/>
+      <module name="org.jboss.iiop-client"/>
     </dependencies>
 </module>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml
@@ -23,10 +23,7 @@
   -->
 
 <module xmlns="urn:jboss:module:1.3" name="javax.rmi.api">
-    <resources>
-        <artifact name="${org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec}"/>
-    </resources>
-       <dependencies>
+    <dependencies>
         <module name="javax.orb.api" export="false">
             <exports>
                 <include-set>

diff --git a/...re-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdkorb/main/module.xml b/...re-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdkorb/main/module.xml
@@ -28,7 +28,7 @@
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.wildfly:wildfly-jdkorb}"/>
     </resources>
 
     <dependencies>
@@ -42,8 +42,9 @@
         <module name="org.jboss.as.server"/>
         <module name="org.jboss.common-core"/>
         <module name="org.jboss.logging"/>
-        <module name="org.jboss.metadata"/>
-        <module name="org.jboss.modules"/>
+        <module name="org.jboss.metadata.common"/>
+        <module name="org.jboss.metadata.ejb"/>
+	<module name="org.jboss.modules"/>
         <module name="org.jboss.msc"/>
         <module name="org.jboss.staxmapper"/>
         <module name="org.jboss.jts" />

diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml
@@ -28,7 +28,7 @@
     </properties>
 
     <resources>
-        <artifact name="${org.jboss.narayana.jts:narayana-jts-jacorb}"/>
+        <artifact name="${org.jboss.narayana.jts:narayana-jts-idlj}"/>
     </resources>
 
     <dependencies>

diff --git a/jdkorb/pom.xml b/jdkorb/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2010, Red Hat, Inc., and individual contributors
@@ -33,7 +34,6 @@
         <version>9.0.0.Alpha2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.wildfly</groupId>
     <artifactId>wildfly-jdkorb</artifactId>
     <version>9.0.0.Alpha2-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -83,7 +83,7 @@
        </dependency>
 
        <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-server</artifactId>
         </dependency>
 
@@ -93,7 +93,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-network</artifactId>
         </dependency>
 

diff --git a/...urces/configuration/subsystems/jdkorb.xml → .../resources/subsystem-templates/jdkorb.xml b/...urces/configuration/subsystems/jdkorb.xml → .../resources/subsystem-templates/jdkorb.xml
@@ -4,7 +4,7 @@
    <extension-module>org.jboss.as.jdkorb</extension-module>
    <subsystem xmlns="urn:jboss:domain:jdkorb:1.0">
        <orb socket-binding="jdkorb" ssl-socket-binding="jdkorb-ssl">
-           <initializers transactions="on" security="identity"/>
+           <initializers transactions="spec" security="identity"/>
        </orb>
    </subsystem>
    <socket-binding name="jdkorb" interface="unsecure" port="3528"/>

diff --git a/pom.xml b/pom.xml
@@ -162,6 +162,7 @@
         <version.org.jboss.narayana>5.0.4.Final</version.org.jboss.narayana>
         <version.org.jboss.metadata>9.0.0.Beta1</version.org.jboss.metadata>
         <version.org.jboss.mod_cluster>1.3.1.Beta1</version.org.jboss.mod_cluster>
+        <version.org.jboss.openjdk-orb>7.5.0</version.org.jboss.openjdk-orb>
         <version.org.jboss.xnio.netty.netty-xnio-transport>0.1.1.Final</version.org.jboss.xnio.netty.netty-xnio-transport>
         <version.org.jboss.remote-naming>2.0.3.Final</version.org.jboss.remote-naming>
         <version.org.jboss.resteasy>3.0.10.Final</version.org.jboss.resteasy>
@@ -273,7 +274,6 @@
         <module>ejb3</module>
         <module>embedded</module>
         <module>feature-pack</module>
-        <module>jacorb</module>
         <module>jdkorb</module>
 	<module>jaxrs</module>
         <module>jdr</module>
@@ -303,7 +303,7 @@
         <module>weld</module>
         <module>xts</module>
         <module>rts</module>
-		<module>testsuite/shared</module>
+	<module>testsuite/shared</module>
         <module>testsuite</module>
     </modules>
 
@@ -4976,7 +4976,7 @@
             <dependency>
 		<groupId>org.jboss.openjdk-orb</groupId>
 		<artifactId>openjdk-orb</artifactId>
-	        <version>7.5.0</version>	    
+	        <version>${version.org.jboss.openjdk-orb}</version>
 	    </dependency>
 
             <dependency>

diff --git a/transactions/pom.xml b/transactions/pom.xml
@@ -44,19 +44,22 @@
 	<dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-jdkorb</artifactId>
-            <version>8.0.1.Final-SNAPSHOT</version>
 	</dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.jacorb</groupId>
             <artifactId>jacorb</artifactId>
+        </dependency>-->
+	<dependency>
+            <groupId>org.jboss.openjdk-orb</groupId>
+            <artifactId>openjdk-orb</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-transaction-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.narayana.jts</groupId>
-            <artifactId>narayana-jts-jacorb</artifactId>
+            <artifactId>narayana-jts-idlj</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.narayana.jts</groupId>