[jboss-osgi-commits] JBoss-OSGI SVN: r101467 - in projects/jboss-osgi/trunk: distribution and 2 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Feb 25 06:48:11 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-25 06:48:11 -0500 (Thu, 25 Feb 2010)
New Revision: 101467
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Update felix & equinox runtimes
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-02-25 11:45:51 UTC (rev 101466)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-25 11:48:11 UTC (rev 101467)
@@ -147,9 +147,9 @@
<include name="jboss-osgi-jndi-sources.jar" />
<include name="jboss-osgi-jta-sources.jar" />
<include name="jboss-osgi-reflect-sources.jar" />
- <include name="jboss-osgi-runtime-equinox-sources.jar" />
- <include name="jboss-osgi-runtime-felix-sources.jar" />
- <include name="jboss-osgi-runtime-jbossas-sources.jar" />
+ <include name="jboss-osgi-equinox-sources.jar" />
+ <include name="jboss-osgi-felix-sources.jar" />
+ <include name="jboss-osgi-jbossas-sources.jar" />
<include name="jboss-osgi-spi-sources.jar" />
<include name="jboss-osgi-testing-sources.jar" />
<include name="jboss-osgi-webapp-sources.jar" />
@@ -270,7 +270,7 @@
<singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-extra-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties"
override="true" />
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
- <include name="jboss-osgi-runtime-felix.jar" />
+ <include name="jboss-osgi-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
@@ -296,7 +296,7 @@
<singlefile condition="isEquinox" src="@{runtime.dir}/server/conf/jboss-osgi-extra-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties"
override="true" />
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
- <include name="jboss-osgi-runtime-equinox.jar" />
+ <include name="jboss-osgi-equinox.jar" />
<include name="org.eclipse.osgi.jar" />
</fileset>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
@@ -400,7 +400,7 @@
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-deployers.jar" />
<include name="jboss-osgi-deployment.jar" />
- <include name="jboss-osgi-runtime-jbossas.jar" />
+ <include name="jboss-osgi-jbossas.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-testing.jar" />
</fileset>
@@ -431,7 +431,7 @@
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
- <include name="jboss-osgi-runtime-felix.jar" />
+ <include name="jboss-osgi-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
<singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-felix.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
@@ -450,7 +450,7 @@
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
- <include name="jboss-osgi-runtime-equinox.jar" />
+ <include name="jboss-osgi-equinox.jar" />
<include name="org.apache.equinox.framework.jar" />
<include name="org.eclipse.osgi.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 11:45:51 UTC (rev 101466)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 11:48:11 UTC (rev 101467)
@@ -354,15 +354,15 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <artifactId>jboss-osgi-jbossas</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <artifactId>jboss-osgi-jbossas</artifactId>
<version>${version.jboss.osgi.runtime.jbossas}</version>
<classifier>sources</classifier>
</dependency>
- <!-- jboss-osgi-runtime-jbossas: no javadoc -->
+ <!-- jboss-osgi-jbossas: no javadoc -->
<!-- Aries Dependencies -->
<dependency>
@@ -381,11 +381,11 @@
<!-- Equinox Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <artifactId>jboss-osgi-equinox</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <artifactId>jboss-osgi-equinox</artifactId>
<version>${version.jboss.osgi.runtime.equinox}</version>
<classifier>sources</classifier>
</dependency>
@@ -393,11 +393,11 @@
<!-- Felix Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-felix</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-felix</artifactId>
<version>${version.jboss.osgi.runtime.felix}</version>
<classifier>sources</classifier>
</dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-25 11:45:51 UTC (rev 101466)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-25 11:48:11 UTC (rev 101467)
@@ -71,7 +71,7 @@
<version.jboss.osgi.runtime.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.runtime.equinox>3.5.1.SP1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
+ <version.jboss.osgi.runtime.jbossas>1.0.3-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
@@ -221,21 +221,21 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <artifactId>jboss-osgijbossas</artifactId>
<version>${version.jboss.osgi.runtime.jbossas}</version>
</dependency>
<!-- Equinox Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <artifactId>jboss-osgi-equinox</artifactId>
<version>${version.jboss.osgi.runtime.equinox}</version>
</dependency>
<!-- Felix Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-felix</artifactId>
<version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-25 11:45:51 UTC (rev 101466)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-25 11:48:11 UTC (rev 101467)
@@ -281,7 +281,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <artifactId>jboss-osgi-equinox</artifactId>
</dependency>
</dependencies>
</profile>
@@ -304,7 +304,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-felix</artifactId>
</dependency>
</dependencies>
</profile>
More information about the jboss-osgi-commits
mailing list