[jboss-cvs] JBossAS SVN: r86014 - in trunk: build and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 17 14:56:45 EDT 2009 

Author: pgier
Date: 2009-03-17 14:56:45 -0400 (Tue, 17 Mar 2009)
New Revision: 86014

Added:
   trunk/jbossas-jmx-remoting/
   trunk/jbossas-jts/
   trunk/jbossas-remoting/
Removed:
   trunk/jbossas/jmx-remoting/
   trunk/jbossas/jts/
   trunk/jbossas/remoting/
Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/jbossas-jmx-remoting/pom.xml
   trunk/jbossas-remoting/pom.xml
   trunk/pom.xml
Log:
[JBBUILD-517] Move jbossas/jmx-remoting and jbossas/remoting to flatten directory structure.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-03-17 18:15:31 UTC (rev 86013)
+++ trunk/build/build-distr.xml	2009-03-17 18:56:45 UTC (rev 86014)
@@ -40,9 +40,9 @@
   <!-- Remoting -->
   <!-- ======== -->
 
-  <target name="_module-jbossas/remoting-most">
-    <property name="_module.name" value="remoting" override="true"/>
-    <property name="_module.output" override="true" value="${project.root}/jbossas/${_module.name}/output"/>
+  <target name="_module-jbossas-remoting-most">
+    <property name="_module.name" value="jbossas-remoting" override="true"/>
+    <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.all.lib}"/>
@@ -66,7 +66,7 @@
     </copy>
   </target>
 
-  <target name="_module-remoting-all" depends="_module-jbossas/remoting-most">
+  <target name="_module-remoting-all" depends="_module-jbossas-remoting-most">
     <!-- Copy the generated javadocs -->
     <mkdir dir="${install.api}/${_module.name}"/>
     <copy todir="${install.api}/${_module.name}" filtering="no">
@@ -105,7 +105,7 @@
 
   </target>
 
-  <target name="_module-jbossas/jmx-remoting-all" depends="_module-jbossas/jmx-remoting-most">
+  <target name="_module-jbossas-jmx-remoting-all" depends="_module-jbossas-jmx-remoting-most">
     <!-- Copy the generated javadocs -->
     <mkdir dir="${install.api}/${_module.name}"/>
     <copy todir="${install.api}/${_module.name}" filtering="no">
@@ -116,8 +116,8 @@
 
   </target>
 
-  <target name="_module-jbossas/jmx-remoting-most">
-    <property name="_module.name" value="jbossas/jmx-remoting" override="true"/>
+  <target name="_module-jbossas-jmx-remoting-most">
+    <property name="_module.name" value="jbossas-jmx-remoting" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
     <unjar src="${project.root}/${_module.name}/output/lib/jmx-remoting.sar" dest="${install.default}/deploy/jmx-remoting.sar"/>
@@ -2118,9 +2118,9 @@
         </fileset>
     </copy>
     <copy todir="${install.examples}/jts" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjts-properties.xml"/>
-    <!-- copy JBossTS JTS install script and instructions from jbossas/jts module -->
+    <!-- copy JBossTS JTS install script and instructions from jbossas-jts module -->
     <copy todir="${install.examples}/jts" filtering="no">
-        <fileset dir="${project.root}/jbossas/jts">
+        <fileset dir="${project.root}/jbossas-jts">
             <include name="README.txt"/>
             <include name="build.xml"/>
         </fileset>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-03-17 18:15:31 UTC (rev 86013)
+++ trunk/build/build.xml	2009-03-17 18:56:45 UTC (rev 86014)
@@ -99,9 +99,9 @@
       <module name="main" externalBuild="true"/>
       <module name="management" externalBuild="true"/>
       <module name="messaging" externalBuild="true"/>
-      <module name="jbossas/remoting" externalBuild="true"/>
+      <module name="jbossas-remoting" externalBuild="true"/>
       <module name="jmx-remoting" externalBuild="true"/>
-      <module name="jbossas/jmx-remoting" externalBuild="true"/>
+      <module name="jbossas-jmx-remoting" externalBuild="true"/>
       <module name="profileservice" externalBuild="true"/>
       <module name="security" externalBuild="true"/>
       <module name="server" externalBuild="true"/>
@@ -134,9 +134,9 @@
       </group>
 
       <group name="standard">
-        <include modules="jbossas/remoting,
+        <include modules="jbossas-remoting,
                           jmx-remoting,
-                          jbossas/jmx-remoting,
+                          jbossas-jmx-remoting,
                           messaging,
                           cluster,
                           varia,
@@ -353,12 +353,12 @@
   <!-- Remoting -->
   <!-- ======== -->
 
-  <target name="_module-jbossas/remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/remoting-most"/>
+  <target name="_module-jbossas-remoting-most">
+     <ant antfile="build-distr.xml" target="_module-jbossas-remoting-most"/>
   </target>
 
-  <target name="_module-remoting-all" depends="_module-jbossas/remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/remoting-all"/>
+  <target name="_module-remoting-all" depends="_module-jbossas-remoting-most">
+     <ant antfile="build-distr.xml" target="_module-jbossas-remoting-all"/>
   </target>
 
   <!-- ============ -->
@@ -373,12 +373,12 @@
      <ant antfile="build-distr.xml" target="_module-jmx-remoting-all"/>
    </target>
 
-   <target name="_module-jbossas/jmx-remoting-all" depends="_module-jbossas/jmx-remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/jmx-remoting-all"/>
+   <target name="_module-jbossas-jmx-remoting-all" depends="_module-jbossas-jmx-remoting-most">
+     <ant antfile="build-distr.xml" target="_module-jbossas-jmx-remoting-all"/>
    </target>
 
-   <target name="_module-jbossas/jmx-remoting-most">
-     <ant antfile="build-distr.xml" target="_module-jbossas/jmx-remoting-most"/>
+   <target name="_module-jbossas-jmx-remoting-most">
+     <ant antfile="build-distr.xml" target="_module-jbossas-jmx-remoting-most"/>
    </target>
 
    <!-- ======== -->

Copied: trunk/jbossas-jmx-remoting (from rev 85929, trunk/jbossas/jmx-remoting)


Property changes on: trunk/jbossas-jmx-remoting
___________________________________________________________________
Name: svn:ignore
   + output
build.log
target

Name: svn:mergeinfo
   + 

Modified: trunk/jbossas-jmx-remoting/pom.xml
===================================================================
--- trunk/jbossas/jmx-remoting/pom.xml	2009-03-16 14:33:42 UTC (rev 85929)
+++ trunk/jbossas-jmx-remoting/pom.xml	2009-03-17 18:56:45 UTC (rev 86014)
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.jboss.jbossas</groupId>
-    <artifactId>jboss-as-jbossas</artifactId>
+    <artifactId>jboss-as-parent</artifactId>
     <version>6.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Copied: trunk/jbossas-jts (from rev 85929, trunk/jbossas/jts)


Property changes on: trunk/jbossas-jts
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: trunk/jbossas-remoting (from rev 85929, trunk/jbossas/remoting)


Property changes on: trunk/jbossas-remoting
___________________________________________________________________
Name: svn:ignore
   + output
target

Name: svn:mergeinfo
   + 

Modified: trunk/jbossas-remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml	2009-03-16 14:33:42 UTC (rev 85929)
+++ trunk/jbossas-remoting/pom.xml	2009-03-17 18:56:45 UTC (rev 86014)
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.jboss.jbossas</groupId>
-    <artifactId>jboss-as-jbossas</artifactId>
+    <artifactId>jboss-as-parent</artifactId>
     <version>6.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-03-17 18:15:31 UTC (rev 86013)
+++ trunk/pom.xml	2009-03-17 18:56:45 UTC (rev 86014)
@@ -363,8 +363,9 @@
         <module>security</module>
         <module>server</module>
         <module>deployment</module>
-        <module>jbossas</module>
+        <module>jbossas-remoting</module>
         <module>jmx-remoting</module>
+        <module>jbossas-jmx-remoting</module>
         <module>messaging</module>
         <module>cluster</module>
         <module>varia</module>

More information about the jboss-cvs-commits mailing list