[jboss-cvs] JBossAS SVN: r97958 - in trunk: component-matrix and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2009-12-17 06:45:52 -0500 (Thu, 17 Dec 2009)
New Revision: 97958

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/server/pom.xml
   trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
Log:
JBAS-7556: bring in jboss-reloaded-naming

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-12-17 10:54:48 UTC (rev 97957)
+++ trunk/build/build.xml	2009-12-17 11:45:52 UTC (rev 97958)
@@ -2002,6 +2002,7 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-spi:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-transactions:jar"/>
+      <fileset refid="org.jboss.reloaded:jboss-reloaded-naming:jar"/>
       <fileset refid="org.hibernate:hibernate-core:jar"/>
       <fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-entitymanager:jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-12-17 10:54:48 UTC (rev 97957)
+++ trunk/component-matrix/pom.xml	2009-12-17 11:45:52 UTC (rev 97958)
@@ -113,6 +113,7 @@
     <version.org.jboss.mx>6.0.0.Beta1</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.4.GA</version.org.jboss.naming>
     <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
+    <version.org.jboss.reloaded.naming>0.1.0-alpha-1</version.org.jboss.reloaded.naming>
     <version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
     <version.org.jboss.security>2.1.0.20090318</version.org.jboss.security>
     <version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
@@ -1376,6 +1377,12 @@
         <artifactId>jboss-reflect</artifactId>
         <version>${version.org.jboss.reflect}</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.reloaded</groupId>
+        <artifactId>jboss-reloaded-naming</artifactId>
+        <version>${version.org.jboss.reloaded.naming}</version>
+      </dependency>
       
       <dependency>
         <groupId>org.jboss</groupId>

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2009-12-17 10:54:48 UTC (rev 97957)
+++ trunk/server/pom.xml	2009-12-17 11:45:52 UTC (rev 97958)
@@ -293,6 +293,12 @@
 	</exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.reloaded</groupId>
+      <artifactId>jboss-reloaded-naming</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     
     <dependency>
       <groupId>org.jboss.security</groupId>

Modified: trunk/server/src/etc/deployers/core-naming-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/core-naming-jboss-beans.xml	2009-12-17 10:54:48 UTC (rev 97957)
+++ trunk/server/src/etc/deployers/core-naming-jboss-beans.xml	2009-12-17 11:45:52 UTC (rev 97958)
@@ -17,8 +17,11 @@
         <!-- Install this bean as the global JVM NamingServer -->
         <property name="installGlobalService">true</property>
         <property name="useGlobalService">false</property>
+        <property name="installJavaComp">false</property>
     </bean>
 
+    <bean name="NameSpaces" class="org.jboss.reloaded.naming.service.NameSpaces"/>
+
     <bean name="RemoteNamingBean" class="org.jnp.server.Main">
         <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=Naming", exposedInterface=org.jnp.server.MainMBean, registerDirectly=true)</annotation>
         
@@ -60,4 +63,4 @@
         <property name="lookupExector"><inject bean="LookupPool"/></property>
     </bean>
     
-</deployment>
\ No newline at end of file
+</deployment>