Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 06:11:24 -0500 (Thu, 04 Mar 2010)
New Revision: 101814
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Switch embedded felix/equinox to vfs30
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-03-04
11:09:02 UTC (rev 101813)
+++
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04
11:11:24 UTC (rev 101814)
@@ -411,8 +411,13 @@
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-testing.jar" />
<include name="jboss-osgi-vfs.jar" />
+ </fileset>
+ <fileset condition="!isJBoss601"
dir="(a){deploy.artifacts.dir}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
<include name="jboss-osgi-vfs21.jar" />
</fileset>
+ <fileset condition="isJBoss601"
dir="(a){deploy.artifacts.dir}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
+ <include name="jboss-osgi-vfs30.jar" />
+ </fileset>
<!-- deploy/osgi -->
<fileset dir="(a){deploy.artifacts.dir}/lib"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 11:09:02 UTC (rev 101813)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 11:11:24 UTC (rev 101814)
@@ -59,10 +59,6 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
<!-- Apache Aries Dependencies -->
<dependency>
@@ -287,6 +283,10 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -310,6 +310,10 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-felix</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -330,6 +334,10 @@
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -344,6 +352,10 @@
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -392,6 +404,8 @@
<properties>
<target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes>
</properties>
+ <dependencies>
+ </dependencies>
</profile>
<!--