[jboss-cvs] JBossAS SVN: r70146 - in trunk: console and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 26 22:01:09 EST 2008
Author: scott.stark at jboss.org
Date: 2008-02-26 22:01:09 -0500 (Tue, 26 Feb 2008)
New Revision: 70146
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/build/build.xml
trunk/console/build.xml
trunk/tools/etc/buildmagic/modules.ent
trunk/varia/build.xml
Log:
Extract the naming project to thirdparty
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-02-27 02:23:36 UTC (rev 70145)
+++ trunk/build/build-distr.xml 2008-02-27 03:01:09 UTC (rev 70146)
@@ -427,42 +427,6 @@
</target>
<!-- ====== -->
- <!-- Naming -->
- <!-- ====== -->
-
- <target name="_module-naming-most">
- <property name="_module.name" value="naming" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jnpserver.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jnp-client.jar"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="_module-naming-all" depends="_module-naming-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ====== -->
<!-- Server -->
<!-- ====== -->
@@ -1874,6 +1838,9 @@
<fileset dir="${jboss.jbossws.common.lib}">
<include name="jbossws-common.jar"/>
</fileset>
+ <fileset dir="${jboss.jnp.client.lib}">
+ <include name="jnp.client.jar"/>
+ </fileset>
<fileset dir="${jboss.jbossws.framework.lib}">
<include name="jbossws-framework.jar"/>
</fileset>
@@ -1997,6 +1964,9 @@
<include name="jboss-jaxws-ext.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
+ <fileset dir="${jboss.jnpserver.lib}">
+ <include name="jnpserver.jar"/>
+ </fileset>
<fileset dir="${jgroups.jgroups.lib}">
<include name="jgroups.jar"/>
</fileset>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2008-02-27 02:23:36 UTC (rev 70145)
+++ trunk/build/build-thirdparty.xml 2008-02-27 03:01:09 UTC (rev 70146)
@@ -108,6 +108,8 @@
<componentref name="jboss/jbossws-native50" version="2.0.3.GA"/>
<componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
<componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
+ <componentref name="jboss/jnp-client" version="5.0.0.Beta4"/>
+ <componentref name="jboss/jnpserver" version="5.0.0.Beta4"/>
<componentref name="jboss/messaging" version="1.4.1.Beta1"/>
<componentref name="jboss/metadata" version="1.0.0.Beta6"/>
<componentref name="jboss/microcontainer" version="2.0.0.Beta10.1"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-02-27 02:23:36 UTC (rev 70145)
+++ trunk/build/build.xml 2008-02-27 03:01:09 UTC (rev 70146)
@@ -98,7 +98,6 @@
<module name="mbeans"/>
<module name="messaging"/>
<module name="jbossmq"/>
- <module name="naming"/>
<module name="jbossas/remoting"/>
<module name="jmx-remoting"/>
<module name="jbossas/jmx-remoting"/>
@@ -123,7 +122,7 @@
</group>
<group name="core">
- <include modules="main, bootstrap, j2se, mbeans, jmx, system, system-jmx, naming"/>
+ <include modules="main, bootstrap, j2se, mbeans, jmx, system, system-jmx"/>
</group>
<group name="basic">
@@ -458,18 +457,6 @@
</target>
<!-- ====== -->
- <!-- Naming -->
- <!-- ====== -->
-
- <target name="_module-naming-most">
- <ant antfile="build-distr.xml" target="_module-naming-most"/>
- </target>
-
- <target name="_module-naming-all" depends="_module-naming-most">
- <ant antfile="build-distr.xml" target="_module-naming-all"/>
- </target>
-
- <!-- ====== -->
<!-- Server -->
<!-- ====== -->
Modified: trunk/console/build.xml
===================================================================
--- trunk/console/build.xml 2008-02-27 02:23:36 UTC (rev 70145)
+++ trunk/console/build.xml 2008-02-27 03:01:09 UTC (rev 70146)
@@ -354,7 +354,7 @@
<zipfileset src="${jboss.system.lib}/jboss-system-client.jar">
<exclude name="META-INF/INDEX.LIST"/>
</zipfileset>
- <zipfileset src="${jboss.naming.lib}/jnp-client.jar">
+ <zipfileset src="${jboss.jnp.client.lib}/jnp-client.jar">
<exclude name="META-INF/INDEX.LIST"/>
</zipfileset>
<zipfileset src="${jboss.jmx.lib}/jboss-jmx.jar">
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2008-02-27 02:23:36 UTC (rev 70145)
+++ trunk/tools/etc/buildmagic/modules.ent 2008-02-27 03:01:09 UTC (rev 70146)
@@ -139,8 +139,8 @@
<pathelement path="${jboss.mq.lib}/jbossmq.jar"/>
</path>
-<!-- Naming -->
-<property name="jboss.naming.root" value="${project.root}/naming/output"/>
+<!-- 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"/>
Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml 2008-02-27 02:23:36 UTC (rev 70145)
+++ trunk/varia/build.xml 2008-02-27 03:01:09 UTC (rev 70146)
@@ -478,15 +478,17 @@
</zip>
<!-- Build jbossjmx-ant.jar -->
- <jar jarfile="${build.lib}/jbossjmx-ant.jar"
- manifest="${build.etc}/default.mf">
+ <zip destfile="${build.lib}/jbossjmx-ant.jar">
+ <zipfileset fullpath="META-INF/MANIFEST.MF" dir="${build.etc}">
+ <include name="default.mf" />
+ </zipfileset>
<fileset dir="${build.classes}">
<include name="org/jboss/ant/**"/>
</fileset>
- <fileset dir="${jboss.naming.root}/classes">
+ <zipgroupfileset file="${jboss.naming.lib}/jnpserver.jar">
<include name="org/jnp/interfaces/**"/>
<include name="org/jnp/server/*Stub.class"/>
- </fileset>
+ </zipgroupfileset>
<fileset dir="${jboss.server.root}/classes">
<include name="org/jboss/jmx/adaptor/rmi/RMIAdaptor.class"/>
<include name="org/jboss/jmx/adaptor/rmi/RMIAdaptorImpl_Stub.class"/>
@@ -497,7 +499,7 @@
<include name="javax/management/*.class"/>
<include name="org/jboss/mx/util/Serialization.class"/>
</fileset>
- </jar>
+ </zip>
<!-- Build netboot.war -->
<war warfile="${build.lib}/netboot.war" webxml="${build.resources}/netboot/WEB-INF/web.xml">
More information about the jboss-cvs-commits
mailing list