[jboss-cvs] JBossAS SVN: r93121 - in projects/jboss-osgi/trunk: testsuite and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-02 05:38:16 -0400 (Wed, 02 Sep 2009)
New Revision: 93121

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Install core and compendium from org.osgi

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	2009-09-02 08:35:23 UTC (rev 93120)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-02 09:38:16 UTC (rev 93121)
@@ -263,6 +263,7 @@
       <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap-web.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" override="true"/>
       <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap-all.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="jaxb-api.jar" />
         <include name="jboss-classloader.jar" />
         <include name="jboss-classloading.jar" />
         <include name="jboss-classloading-spi.jar" />
@@ -286,10 +287,10 @@
         <include name="jboss-reflect.jar" />
         <include name="jbossxb.jar" />
       </fileset>
-      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/apache-felix" targetdir="$INSTALL_PATH/runtime/lib" override="true">
+      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/lib" override="true">
         <include name="org.osgi.core.jar" />
       </fileset>
-      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/apache-felix" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
+      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
       

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-09-02 08:35:23 UTC (rev 93120)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-09-02 09:38:16 UTC (rev 93121)
@@ -316,6 +316,8 @@
       <properties>
         <target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes>
       </properties>
+      <dependencies>
+      </dependencies>
     </profile>
 
     <!--