[jboss-cvs] JBossAS SVN: r59310 - in projects/osgi/trunk: core core/src core/src/etc deployment

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jan 3 08:12:05 EST 2007


Author: alesj
Date: 2007-01-03 08:11:56 -0500 (Wed, 03 Jan 2007)
New Revision: 59310

Added:
   projects/osgi/trunk/core/src/etc/
   projects/osgi/trunk/core/src/etc/default.mf
Modified:
   projects/osgi/trunk/core/build-test.xml
   projects/osgi/trunk/core/build.xml
   projects/osgi/trunk/deployment/build-test.xml
   projects/osgi/trunk/deployment/build.xml
Log:
fixed to osgi

Modified: projects/osgi/trunk/core/build-test.xml
===================================================================
--- projects/osgi/trunk/core/build-test.xml	2007-01-03 13:03:17 UTC (rev 59309)
+++ projects/osgi/trunk/core/build-test.xml	2007-01-03 13:11:56 UTC (rev 59310)
@@ -17,7 +17,7 @@
 
 <!-- $Id: build-test.xml 58705 2006-12-14 13:24:22 +0100 (Cet, 14 dec 2006) ales.justin at jboss.org $ -->
 
-<project default="main" name="JBoss/Spring-int Tests">
+<project default="main" name="JBoss/Core Tests">
 
    <!-- ================================================================== -->
    <!-- Setup                                                              -->
@@ -55,8 +55,8 @@
       <!-- =================== -->
 
       <!-- Module name(s) & version -->
-      <property name="module.name" value="spring-int"/>
-      <property name="module.Name" value="JBoss Spring MC Integration"/>
+      <property name="module.name" value="core"/>
+      <property name="module.Name" value="JBoss OSGi Core"/>
       <property name="module.version" value="DEV"/>
       <property name="jar.prefix" value="jboss-${module.name}-test"/>
 
@@ -78,14 +78,12 @@
          <path refid="jboss/common.core.classpath"/>
          <path refid="jboss/common.logging.spi.classpath"/>
          <path refid="jboss/common.logging.log4j.classpath"/>
-         <path refid="jboss.jbossxb.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="apache.log4j.classpath"/>
          <path refid="javassist.javassist.classpath"/>
          <path refid="junit.junit.classpath"/>
-         <path refid="oswego.concurrent.classpath"/>
-         <path refid="trove.trove.classpath"/>
          <path refid="jboss.aop50.classpath"/>
+         <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
       </path>
 
@@ -106,10 +104,6 @@
 
       <!-- The combined dependant module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.container.classpath"/>
-         <path refid="jboss.dependency.classpath"/>
-         <path refid="jboss.kernel.classpath"/>
-         <path refid="jboss.kernel-test.classpath"/>
          <path refid="jboss.this.classpath"/>
       </path>
 

Modified: projects/osgi/trunk/core/build.xml
===================================================================
--- projects/osgi/trunk/core/build.xml	2007-01-03 13:03:17 UTC (rev 59309)
+++ projects/osgi/trunk/core/build.xml	2007-01-03 13:11:56 UTC (rev 59310)
@@ -15,10 +15,8 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: build.xml 59020 2006-12-14 00:51:15 +0100 (Čet, 14 dec 2006) adrian at jboss.org $ -->
+<project default="main" name="JBoss/Core">
 
-<project default="main" name="JBoss/Spring-int">
-
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
   <!-- ================================================================== -->
@@ -55,8 +53,8 @@
     <!-- =================== -->
 
     <!-- Module name(s) & version -->
-    <property name="module.name" value="spring-int"/>
-    <property name="module.Name" value="JBoss Spring MC Integration"/>
+    <property name="module.name" value="core"/>
+    <property name="module.Name" value="JBoss OSGi Core"/>
     <property name="module.version" value="DEV"/>
     <property name="jar.prefix" value="jboss-${module.name}"/>
 
@@ -76,6 +74,7 @@
       <path refid="jboss/common.core.classpath"/>
       <path refid="jboss/common.logging.spi.classpath"/>
       <path refid="jboss/common.logging.log4j.classpath"/>
+      <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
       <path refid="jboss.test.classpath"/>
     </path>
@@ -88,10 +87,6 @@
 
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.container.classpath"/>
-      <path refid="jboss.dependency.classpath"/>
-      <path refid="jboss.kernel.classpath"/>
-      <path refid="jboss.kernel-test.classpath"/>
     </path>
 
     <!-- ===== -->

Added: projects/osgi/trunk/core/src/etc/default.mf
===================================================================
--- projects/osgi/trunk/core/src/etc/default.mf	2007-01-03 13:03:17 UTC (rev 59309)
+++ projects/osgi/trunk/core/src/etc/default.mf	2007-01-03 13:11:56 UTC (rev 59310)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
+Main-Class: org.jboss.osgi.Todo

Modified: projects/osgi/trunk/deployment/build-test.xml
===================================================================
--- projects/osgi/trunk/deployment/build-test.xml	2007-01-03 13:03:17 UTC (rev 59309)
+++ projects/osgi/trunk/deployment/build-test.xml	2007-01-03 13:11:56 UTC (rev 59310)
@@ -15,9 +15,8 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: build-test.xml 58705 2006-12-14 13:24:22 +0100 (Cet, 14 dec 2006) ales.justin at jboss.org $ -->
 
-<project default="main" name="JBoss/Spring-int Tests">
+<project default="main" name="JBoss/Deployment Tests">
 
    <!-- ================================================================== -->
    <!-- Setup                                                              -->
@@ -55,8 +54,8 @@
       <!-- =================== -->
 
       <!-- Module name(s) & version -->
-      <property name="module.name" value="spring-int"/>
-      <property name="module.Name" value="JBoss Spring MC Integration"/>
+      <property name="module.name" value="deployment"/>
+      <property name="module.Name" value="JBoss OSGi deployment Tests"/>
       <property name="module.version" value="DEV"/>
       <property name="jar.prefix" value="jboss-${module.name}-test"/>
 
@@ -78,14 +77,12 @@
          <path refid="jboss/common.core.classpath"/>
          <path refid="jboss/common.logging.spi.classpath"/>
          <path refid="jboss/common.logging.log4j.classpath"/>
-         <path refid="jboss.jbossxb.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="apache.log4j.classpath"/>
          <path refid="javassist.javassist.classpath"/>
          <path refid="junit.junit.classpath"/>
-         <path refid="oswego.concurrent.classpath"/>
-         <path refid="trove.trove.classpath"/>
          <path refid="jboss.aop50.classpath"/>
+         <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
       </path>
 
@@ -106,10 +103,7 @@
 
       <!-- The combined dependant module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.container.classpath"/>
-         <path refid="jboss.dependency.classpath"/>
-         <path refid="jboss.kernel.classpath"/>
-         <path refid="jboss.kernel-test.classpath"/>
+         <path refid="jboss.core.classpath"/>
          <path refid="jboss.this.classpath"/>
       </path>
 

Modified: projects/osgi/trunk/deployment/build.xml
===================================================================
--- projects/osgi/trunk/deployment/build.xml	2007-01-03 13:03:17 UTC (rev 59309)
+++ projects/osgi/trunk/deployment/build.xml	2007-01-03 13:11:56 UTC (rev 59310)
@@ -15,9 +15,8 @@
 <!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: build.xml 59020 2006-12-14 00:51:15 +0100 (Čet, 14 dec 2006) adrian at jboss.org $ -->
 
-<project default="main" name="JBoss/Spring-int">
+<project default="main" name="JBoss/Deployment">
 
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
@@ -55,8 +54,8 @@
     <!-- =================== -->
 
     <!-- Module name(s) & version -->
-    <property name="module.name" value="spring-int"/>
-    <property name="module.Name" value="JBoss Spring MC Integration"/>
+    <property name="module.name" value="deployment"/>
+    <property name="module.Name" value="JBoss OSGi deployment"/>
     <property name="module.version" value="DEV"/>
     <property name="jar.prefix" value="jboss-${module.name}"/>
 
@@ -76,6 +75,7 @@
       <path refid="jboss/common.core.classpath"/>
       <path refid="jboss/common.logging.spi.classpath"/>
       <path refid="jboss/common.logging.log4j.classpath"/>
+      <path refid="jboss.microcontainer.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
       <path refid="jboss.test.classpath"/>
     </path>
@@ -88,10 +88,7 @@
 
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.container.classpath"/>
-      <path refid="jboss.dependency.classpath"/>
-      <path refid="jboss.kernel.classpath"/>
-      <path refid="jboss.kernel-test.classpath"/>
+      <path refid="jboss.core.classpath"/>
     </path>
 
     <!-- ===== -->




More information about the jboss-cvs-commits mailing list