[jboss-osgi-commits] JBoss-OSGI SVN: r91191 - in projects/jboss-osgi/trunk: distribution and 9 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Tue Jul 14 04:25:35 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-14 04:25:34 -0400 (Tue, 14 Jul 2009)
New Revision: 91191
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml
projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml
projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml
projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml
projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml
projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml
projects/jboss-osgi/trunk/modules/runtime/jbossas/.classpath
projects/jboss-osgi/trunk/modules/runtime/jbossas/.project
projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml
projects/jboss-osgi/trunk/modules/testsuite/pom.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Fix blueprint groupId
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -60,18 +60,18 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-integration-jbossas</artifactId>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-integration-jbossas</artifactId>
- <version>${version.jboss.osgi.integration.jbossas}</version>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <version>${version.jboss.osgi.runtime.jbossas}</version>
<classifier>config</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-integration-jbossas</artifactId>
- <version>${version.jboss.osgi.integration.jbossas}</version>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <version>${version.jboss.osgi.runtime.jbossas}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -284,7 +284,7 @@
<!-- deployers/osgi.deployer -->
<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-integration-jbossas.jar" />
+ <include name="jboss-osgi-runtime-jbossas.jar" />
<include name="jboss-osgi-spi.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -4,12 +4,12 @@
<name>JBossOSGi Bundles - Blueprint Implementation</name>
<description>A JBossOSGi provided Blueprint implementation</description>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
<packaging>bundle</packaging>
<parent>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -3,7 +3,7 @@
<name>JBossOSGi Bundles - Blueprint</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint-parent</artifactId>
<packaging>pom</packaging>
Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -3,12 +3,12 @@
<name>JBossOSGi Bundles - Blueprint Testsuite</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint-testsuite</artifactId>
<packaging>jar</packaging>
<parent>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -48,7 +48,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -17,13 +17,13 @@
<name>JBossOSGi Bundles - Husky Implementation</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky</artifactId>
<packaging>bundle</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Modified: projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -18,7 +18,7 @@
<name>JBossOSGi Bundles - Husky</name>
<description>JBoss OSGi Test Support</description>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
<packaging>pom</packaging>
Modified: projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -17,13 +17,13 @@
<name>JBossOSGi Bundles - Husky Testsuite</name>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-testsuite</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Modified: projects/jboss-osgi/trunk/modules/runtime/jbossas/.classpath
===================================================================
--- projects/jboss-osgi/trunk/modules/runtime/jbossas/.classpath 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/runtime/jbossas/.classpath 2009-07-14 08:25:34 UTC (rev 91191)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: projects/jboss-osgi/trunk/modules/runtime/jbossas/.project
===================================================================
--- projects/jboss-osgi/trunk/modules/runtime/jbossas/.project 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/runtime/jbossas/.project 2009-07-14 08:25:34 UTC (rev 91191)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-runtime-deployer</name>
+ <name>jboss-osgi-runtime-jbossas</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -5,7 +5,7 @@
<name>JBossOSGi Runtime - JBossAS</name>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-integration-jbossas</artifactId>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
Modified: projects/jboss-osgi/trunk/modules/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/modules/testsuite/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/modules/testsuite/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -85,13 +85,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
+ <artifactId>jboss-osgi-husky</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-07-14 07:50:13 UTC (rev 91190)
+++ projects/jboss-osgi/trunk/pom.xml 2009-07-14 08:25:34 UTC (rev 91191)
@@ -110,16 +110,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-integration-jbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<version>${version.jboss.osgi.runtime.equinox}</version>
</dependency>
@@ -135,6 +125,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <version>${version.jboss.osgi.runtime.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
</dependency>
@@ -165,6 +160,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jaxb</artifactId>
<version>${version.jboss.osgi.jaxb}</version>
</dependency>
More information about the jboss-osgi-commits
mailing list