[jboss-cvs] JBossAS SVN: r99496 - in projects/jboss-osgi: projects/runtime/framework/trunk/scripts and 3 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2010-01-15 12:21:56 -0500 (Fri, 15 Jan 2010)
New Revision: 99496

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml
   projects/jboss-osgi/trunk/distribution/installer/pom.xml
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/pom.xml
Log:
Fix standalone runtime

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml	2010-01-15 17:19:03 UTC (rev 99495)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml	2010-01-15 17:21:56 UTC (rev 99496)
@@ -50,7 +50,6 @@
     <version.jboss.classloading>2.2.0-SNAPSHOT</version.jboss.classloading>
     <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
     <version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel>
-    <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr>
     <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
     <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
@@ -77,11 +76,6 @@
       <version>${version.drools}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-mdr</artifactId>
-      <version>${version.jboss.mdr}</version>
-    </dependency>
-    <dependency>
       <groupId>org.jboss.cl</groupId>
       <artifactId>jboss-classloader</artifactId>
       <version>${version.jboss.classloading}</version>

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml	2010-01-15 17:19:03 UTC (rev 99495)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml	2010-01-15 17:21:56 UTC (rev 99496)
@@ -13,6 +13,7 @@
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <includes>
         <include>*:args4j:jar</include>
+        <include>*:javax.inject:jar</include>
         <include>*:jaxb-api:jar</include>
         <include>*:jboss-classloader:jar</include>
         <include>*:jboss-classloading:jar</include>

Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/pom.xml	2010-01-15 17:19:03 UTC (rev 99495)
+++ projects/jboss-osgi/trunk/distribution/installer/pom.xml	2010-01-15 17:21:56 UTC (rev 99496)
@@ -30,6 +30,10 @@
   <!-- Dependencies -->
   <dependencies>
     <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.osgi.distribution</groupId>
       <artifactId>jboss-osgi-javadoc</artifactId>
       <version>${version}</version>

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2010-01-15 17:19:03 UTC (rev 99495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2010-01-15 17:21:56 UTC (rev 99496)
@@ -301,6 +301,7 @@
       <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml"
         override="true" />
       <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
+        <include name="javax.inject.jar" />
         <include name="jaxb-api.jar" />
         <include name="jboss-classloader.jar" />
         <include name="jboss-classloading.jar" />

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2010-01-15 17:19:03 UTC (rev 99495)
+++ projects/jboss-osgi/trunk/pom.xml	2010-01-15 17:21:56 UTC (rev 99496)
@@ -43,6 +43,7 @@
 
   <!-- Properties -->
   <properties>
+    <version.apache.ant>1.7.0</version.apache.ant>
     <version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin>
     <version.apache.felix.core>1.4.0</version.apache.felix.core>
     <version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin>
@@ -82,6 +83,13 @@
   <dependencyManagement>
     <dependencies>
     
+      <!-- apache ant -->
+      <dependency>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${version.apache.ant}</version>
+      </dependency>
+      
       <!-- jboss.osgi -->
       <dependency>
         <groupId>org.jboss.osgi</groupId>