[jboss-cvs] JBossAS SVN: r95426 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/installer and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-22 12:24:19 -0400 (Thu, 22 Oct 2009)
New Revision: 95426

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/pom.xml
Log:
Revert back to felix-2.0.0

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-10-22 16:21:55 UTC (rev 95425)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-10-22 16:24:19 UTC (rev 95426)
@@ -220,7 +220,6 @@
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-jndi.jar" />
         <!-- web -->
-        <include name="jboss-osgi-webapp.jar" />
         <include name="jboss-osgi-webconsole.jar" />
         <include name="pax-web-jetty-bundle.jar" />
       </fileset>
@@ -233,7 +232,6 @@
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-jndi.jar" />
         <!-- web -->
-        <include name="jboss-osgi-webapp.jar" />
         <include name="jboss-osgi-webconsole.jar" />
         <include name="pax-web-jetty-bundle.jar" />
         <!-- all -->
@@ -327,6 +325,12 @@
       <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>
+      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">
+        <include name="jboss-osgi-webapp.jar" />
+      </fileset>
+      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
+        <include name="jboss-osgi-webapp.jar" />
+      </fileset>
 
     </pack>
 
@@ -375,7 +379,6 @@
         <include name="jboss-osgi-jaxb.jar" />
         <include name="jboss-osgi-jmx.jar" />
         <include name="jboss-osgi-jndi.jar" />
-        <include name="jboss-osgi-webapp.jar" />
         <include name="jboss-osgi-webconsole.jar" />
         <include name="jboss-osgi-xml-binding.jar" />
         <include name="pax-web-jetty-bundle.jar" />
@@ -434,6 +437,10 @@
         override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
+      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
+        override="true">
+        <include name="jboss-osgi-webapp.jar" />
+      </fileset>
 
     </pack>
 

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-10-22 16:21:55 UTC (rev 95425)
+++ projects/jboss-osgi/trunk/pom.xml	2009-10-22 16:24:19 UTC (rev 95426)
@@ -64,7 +64,7 @@
     <version.jboss.osgi.microcontainer>1.0.3-SNAPSHOT</version.jboss.osgi.microcontainer>
     <version.jboss.osgi.runtime.deployers>1.0.3-SNAPSHOT</version.jboss.osgi.runtime.deployers>
     <version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox>
-    <version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix>
+    <version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
     <version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
     <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.testing>0.0.1-SNAPSHOT</version.jboss.osgi.testing>