[jboss-cvs] JBossAS SVN: r73089 - in trunk: cluster and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 6 16:47:08 EDT 2008
Author: pgier
Date: 2008-05-06 16:47:07 -0400 (Tue, 06 May 2008)
New Revision: 73089
Modified:
trunk/aspects/build-test50.xml
trunk/cluster/build.xml
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/embedded/build.xml
trunk/iiop/build.xml
trunk/jbossmq/build.xml
trunk/security/build.xml
trunk/server/build.xml
trunk/spring-int/build.xml
trunk/testsuite/build.xml
trunk/tomcat/build-test.xml
trunk/tools/etc/buildmagic/modules.ent
trunk/varia/build.xml
Log:
Change the jboss naming references from jboss.naming to jboss.jnpserver
Modified: trunk/aspects/build-test50.xml
===================================================================
--- trunk/aspects/build-test50.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/aspects/build-test50.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -119,7 +119,7 @@
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.jmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/cluster/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -106,7 +106,7 @@
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.j2se.classpath"/>
</path>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/ejb3/build-test.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -202,7 +202,7 @@
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
@@ -542,7 +542,7 @@
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="trove.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
@@ -654,7 +654,7 @@
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="trove.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/ejb3/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -144,7 +144,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.mbeans.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.security.int.classpath"/>
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/embedded/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -132,7 +132,7 @@
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.server.classpath"/>
@@ -384,7 +384,7 @@
<zipfileset src="${jboss.aspects.lib}/jboss-aop-embedded.jar"/>
<zipfileset src="${jboss.integration.lib}/jboss-transaction-spi.jar"/>
<zipfileset src="${jboss.integration.lib}/jboss-classloading-spi.jar"/>
- <zipfileset src="${jboss.naming.lib}/jnpserver.jar"/>
+ <zipfileset src="${jboss.jnpserver.lib}/jnpserver.jar"/>
<zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar"/>
<zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
<zipfileset src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar"/>
Modified: trunk/iiop/build.xml
===================================================================
--- trunk/iiop/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/iiop/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -100,7 +100,7 @@
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
Modified: trunk/jbossmq/build.xml
===================================================================
--- trunk/jbossmq/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/jbossmq/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -85,7 +85,7 @@
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.jboss.jaspi.api.classpath"/>
Modified: trunk/security/build.xml
===================================================================
--- trunk/security/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/security/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -97,7 +97,7 @@
<path refid="jboss.jboss.deployers.classpath"/>
<path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.system.classpath"/>
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/server/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -117,7 +117,7 @@
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.mbeans.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
Modified: trunk/spring-int/build.xml
===================================================================
--- trunk/spring-int/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/spring-int/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -354,7 +354,7 @@
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.j2ee.classpath"/>
<path refid="jboss.hibernate.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="ejb3-persistence.classpath"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/testsuite/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -211,7 +211,7 @@
<path refid="jboss.management.classpath"/>
<path refid="jboss.mbeans.classpath"/>
<path refid="jboss.mq.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.profileservice.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
Modified: trunk/tomcat/build-test.xml
===================================================================
--- trunk/tomcat/build-test.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/tomcat/build-test.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -171,7 +171,7 @@
<path refid="jboss.cluster.classpath"/>
<path refid="jboss.main.classpath"/>
<path refid="jboss.system.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/tools/etc/buildmagic/modules.ent 2008-05-06 20:47:07 UTC (rev 73089)
@@ -139,13 +139,6 @@
<pathelement path="${jboss.mq.lib}/jbossmq.jar"/>
</path>
-<!-- Naming is now in thirdparty -->
-<property name="jboss.naming.root" value="${project.root}/thirdparty/jboss/jnpserver"/>
-<property name="jboss.naming.lib" value="${jboss.naming.root}/lib"/>
-<path id="jboss.naming.classpath">
- <pathelement path="${jboss.naming.lib}/jnpserver.jar"/>
-</path>
-
<!-- ProfileService -->
<property name="jboss.profileservice.root" value="${project.root}/profileservice/output"/>
<property name="jboss.profileservice.lib" value="${jboss.profileservice.root}/lib"/>
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2008-05-06 20:09:09 UTC (rev 73088)
+++ trunk/varia/build.xml 2008-05-06 20:47:07 UTC (rev 73089)
@@ -121,7 +121,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.j2se.classpath"/>
- <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.jnpserver.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.mq.classpath"/>
@@ -486,7 +486,7 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ant/**"/>
</fileset>
- <zipgroupfileset file="${jboss.naming.lib}/jnpserver.jar">
+ <zipgroupfileset file="${jboss.jnpserver.lib}/jnpserver.jar">
<include name="org/jnp/interfaces/**"/>
<include name="org/jnp/server/*Stub.class"/>
</zipgroupfileset>
More information about the jboss-cvs-commits
mailing list