[jboss-cvs] JBossAS SVN: r94008 - 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-09-24 17:01:48 -0400 (Thu, 24 Sep 2009)
New Revision: 94008

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/pom.xml
Log:
Update dependencies and stop updating jboss520 lib jars

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-24 20:54:34 UTC (rev 94007)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2009-09-24 21:01:48 UTC (rev 94008)
@@ -67,10 +67,6 @@
       <name>frameworkSelection</name>
       <value>jbossmc</value>
     </condition>
-    <condition type="or" id="isFelixOrEquinox">
-      <condition type="ref" refid="isFelix" />
-      <condition type="ref" refid="isEquinox" />
-    </condition>
     <condition type="variable" id="isJBoss501">
       <name>jbossSelection</name>
       <value>jboss501</value>
@@ -91,6 +87,14 @@
       <name>jbossTargetServer</name>
       <value>minimal</value>
     </condition>
+    <condition type="or" id="isFelixOrEquinox">
+      <condition type="ref" refid="isFelix" />
+      <condition type="ref" refid="isEquinox" />
+    </condition>
+    <condition type="and" id="isJBossMCAndJBoss600">
+      <condition type="ref" refid="isJBossMC" />
+      <condition type="ref" refid="isJBoss600" />
+    </condition>
   </conditions>
 
   <!-- Panels -->
@@ -418,12 +422,6 @@
       </fileset>
       <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
         override="true" />
-      <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/lib" override="true">
-        <include name="jboss-classloader.jar" />
-        <include name="jboss-classloading.jar" />
-        <include name="jboss-dependency.jar" />
-        <include name="jboss-vfs.jar" />
-      </fileset>
       <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
         override="true">
         <include name="org.osgi.core.jar" />
@@ -433,6 +431,13 @@
         <include name="org.osgi.compendium.jar" />
       </fileset>
 
+      <fileset condition="isJBossMCAndJBoss600" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/lib" override="true">
+        <include name="jboss-classloader.jar" />
+        <include name="jboss-classloading.jar" />
+        <include name="jboss-dependency.jar" />
+        <include name="jboss-vfs.jar" />
+      </fileset>
+      
     </pack>
 
   </packs>

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-09-24 20:54:34 UTC (rev 94007)
+++ projects/jboss-osgi/trunk/pom.xml	2009-09-24 21:01:48 UTC (rev 94008)
@@ -57,7 +57,7 @@
     <version.jboss.osgi.runtime.equinox>3.5</version.jboss.osgi.runtime.equinox>
     <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
     <version.jboss.osgi.runtime.jbossas>1.0.1</version.jboss.osgi.runtime.jbossas>
-    <version.jboss.osgi.runtime.jbossmc>1.0.0.Beta2</version.jboss.osgi.runtime.jbossmc>
+    <version.jboss.osgi.runtime.jbossmc>1.0.0.Beta3-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
     <version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
     <version.jboss.osgi.webconsole>1.0.1</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>