[jboss-cvs] JBossAS SVN: r59309 - projects/osgi/trunk/build

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

Author: alesj
Date: 2007-01-03 08:03:17 -0500 (Wed, 03 Jan 2007)
New Revision: 59309

Modified:
   projects/osgi/trunk/build/build.xml
Log:
fixed to osgi

Modified: projects/osgi/trunk/build/build.xml
===================================================================
--- projects/osgi/trunk/build/build.xml	2007-01-03 12:53:40 UTC (rev 59308)
+++ projects/osgi/trunk/build/build.xml	2007-01-03 13:03:17 UTC (rev 59309)
@@ -12,10 +12,8 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: build.xml 59209 2006-12-22 07:58:07 +0100 (Pet, 22 dec 2006) scott.stark at jboss.org $ -->
+<project default="main" name="JBossOSGi/Build">
 
-<project default="main" name="JBossMC/Build">
-
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
   <!-- ================================================================== -->
@@ -62,7 +60,7 @@
 
     <!-- Module name(s) & version -->
     <property name="module.name" value="jboss"/>
-    <property name="module.Name" value="JBossMC Build"/>
+    <property name="module.Name" value="JBossOSGi Build"/>
     <property name="module.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
 
     <!-- ============== -->
@@ -76,14 +74,10 @@
     <moduleconfig property="modules" selected="${groups}">
 
       <!-- Modules -->
-      <module name="container"/>
-      <module name="dependency"/>
-      <module name="kernel"/>
-      <module name="aop-mc-int"/>
-      <module name="metatype"/>
-      <module name="managed"/>
-      <module name="deployers"/>
-      <module name="osgi-int"/>
+      <module name="core"/>
+      <module name="deployment"/>
+      <module name="services"/>
+      <module name="testsuite"/>
 
       <!-- Module groups -->
 
@@ -95,7 +89,7 @@
       </group>
 
       <group name="core">
-        <include modules="container, dependency, kernel, aop-mc-int, metatype, managed, deployers, osgi-int"/>
+        <include modules="core, deployment, services, testsuite"/>
       </group>
 
       <group name="default">
@@ -208,99 +202,41 @@
    		message="The jbossbuild.repository.dir property must be set and point to the local jbossbuild repository root"/>
    <fail unless="jbossbuild.repository.version"
    		message="The jbossbuild.repository.version property must be set to the version id (snapshot, 2.0.0.GA, ...)"/>
-  	<mkdir dir="${jbossbuild.repository.dir}/jboss/microcontainer/${jbossbuild.repository.version}" />
-  	<echo file="${jbossbuild.repository.dir}/jboss/microcontainer/${jbossbuild.repository.version}/component-info.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<project name="jboss/microcontainer-component-info">
+  	<mkdir dir="${jbossbuild.repository.dir}/jboss/osgi/${jbossbuild.repository.version}" />
+  	<echo file="${jbossbuild.repository.dir}/jboss/osgi/${jbossbuild.repository.version}/component-info.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<project name="jboss/osgi-component-info">
 
-   <component id="jboss/microcontainer"
+   <component id="jboss/osgi"
               licenseType="lgpl"
               version="${jbossbuild.repository.version}"
               >
-      <artifact id="jboss-aop-mc-int.jar"/>
-      <artifact id="jboss-aop-mc-int-boot.jar"/>
-      <artifact id="jboss-aop-mc-int-deployer.jar"/>
-      <artifact id="jboss-container.jar"/>
-      <artifact id="jboss-dependency.jar"/>
-      <artifact id="jboss-microcontainer.jar"/>
-      <artifact id="jboss-deployers.jar"/>
-      <artifact id="jboss-aop-mc-int-src.zip"/>
-      <artifact id="jboss-container-src.zip"/>
-      <artifact id="jboss-dependency-src.zip"/>
-      <artifact id="jboss-deployers-src.zip"/>
-      <artifact id="jboss-microcontainer-src.zip"/>
+      <artifact id="jboss-osgi-core.jar"/>
+      <artifact id="jboss-osgi-deployment.jar"/>
+      <artifact id="jboss-osgi-services.jar"/>
       <export>
-         <include input="jboss-aop-mc-int.jar"/>
-         <include input="jboss-aop-mc-int-boot.jar"/>
-         <include input="jboss-aop-mc-int-deployer.jar"/>
-         <include input="jboss-container.jar"/>
-         <include input="jboss-dependency.jar"/>
-         <include input="jboss-microcontainer.jar"/>
-         <include input="jboss-deployers.jar"/>
+         <include input="jboss-osgi-core.jar"/>
+         <include input="jboss-osgi-deployment.jar"/>
+         <include input="jboss-osgi-services.jar"/>
       </export>
    </component>
 
 </project>
 ]]></echo>
-  	  <copy todir="${jbossbuild.repository.dir}/jboss/microcontainer/${jbossbuild.repository.version}/lib">  	 
-	  		<fileset dir="../aop-mc-int/output/lib">
+  	  <copy todir="${jbossbuild.repository.dir}/jboss/osgi/${jbossbuild.repository.version}/lib">  	 
+	  		<fileset dir="../core/output/lib">
 	  			<include name="*.jar" />
 	  			<include name="*-src.zip" />
 	  		</fileset>
-	  		<fileset dir="../container/output/lib">
+	  		<fileset dir="../deployment/output/lib">
 	  			<include name="*.jar" />
 	  			<include name="*-src.zip" />
 	  		</fileset>
-	  		<fileset dir="../dependency/output/lib">
+	  		<fileset dir="../services/output/lib">
 	  			<include name="*.jar" />
 	  			<include name="*-src.zip" />
 	  		</fileset>
-	  		<fileset dir="../deployers/output/lib">
-	  			<include name="*.jar" />
-	  			<include name="*-src.zip" />
-	  		</fileset>
-	  		<fileset dir="../kernel/output/lib">
-	  			<include name="*.jar" />
-	  			<include name="*-src.zip" />
-	  		</fileset>  	 
   	  	</copy>
-	<!-- The JDK14 compatible versions -->
-  	<mkdir dir="${jbossbuild.repository.dir}/jboss/microcontainer14/${jbossbuild.repository.version}" />
-  	<echo file="${jbossbuild.repository.dir}/jboss/microcontainer14/${jbossbuild.repository.version}/component-info.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<project name="jboss/microcontainer-component-info">
 
-   <component id="jboss/microcontainer14"
-              licenseType="lgpl"
-              version="${jbossbuild.repository.version}"
-              >
-      <artifact id="jboss-aop-mc-int14.jar"/>
-      <artifact id="jboss-container14.jar"/>
-      <artifact id="jboss-dependency14.jar"/>
-      <artifact id="jboss-microcontainer14.jar"/>
-      <export>
-         <include input="jboss-aop-mc-int14.jar"/>
-         <include input="jboss-container14.jar"/>
-         <include input="jboss-dependency14.jar"/>
-         <include input="jboss-microcontainer14.jar"/>
-      </export>
-   </component>
-
-</project>
-]]></echo>
-  	  <copy todir="${jbossbuild.repository.dir}/jboss/microcontainer14/${jbossbuild.repository.version}/lib">  	 
-	  		<fileset dir="../aop-mc-int/output/lib14">
-	  			<include name="*.jar" />
-	  		</fileset>
-	  		<fileset dir="../container/output/lib14">
-	  			<include name="*.jar" />
-	  		</fileset>
-	  		<fileset dir="../dependency/output/lib14">
-	  			<include name="*.jar" />
-	  		</fileset>
-	  		<fileset dir="../kernel/output/lib14">
-	  			<include name="*.jar" />
-	  		</fileset>  	 
-  	  	</copy>
-
   </target>
 
   <!-- ================================================================== -->