[jboss-cvs] JBossAS SVN: r84759 - in projects/jboss-osgi/trunk: distribution and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 25 13:48:58 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-02-25 13:48:57 -0500 (Wed, 25 Feb 2009)
New Revision: 84759
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/microcontainer/osgi-int/.project
projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/deployer/.project
projects/jboss-osgi/trunk/runtime/deployer/pom.xml
projects/jboss-osgi/trunk/runtime/felix/.project
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/spi/.project
projects/jboss-osgi/trunk/runtime/spi/pom.xml
projects/jboss-osgi/trunk/service/http/pom.xml
projects/jboss-osgi/trunk/service/webconsole/.project
projects/jboss-osgi/trunk/service/webconsole/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Allign artifactid with mvn layout
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -36,28 +36,28 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployer</artifactId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
+ <classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployer</artifactId>
- <classifier>config</classifier>
+ <artifactId>jboss-osgi-service-webconsole</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-felix</artifactId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-felix</artifactId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -21,18 +21,18 @@
<!-- resources -->
<dependencySet>
- <outputDirectory>resources/jboss-osgi-deployer-config</outputDirectory>
+ <outputDirectory>resources/jboss-osgi-runtime-deployer-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jboss-osgi-deployer:jar:config</include>
+ <include>*:jboss-osgi-runtime-deployer:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
<dependencySet>
- <outputDirectory>resources/jboss-osgi-felix-config</outputDirectory>
+ <outputDirectory>resources/jboss-osgi-runtime-felix-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jboss-osgi-felix:jar:config</include>
+ <include>*:jboss-osgi-runtime-felix:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
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-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -68,21 +68,21 @@
<!-- OSGi Deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
- <include name="jboss-osgi-deployer.jar" />
- <include name="jboss-osgi-felix.jar" />
- <include name="jboss-osgi-spi.jar" />
+ <include name="jboss-osgi-runtime-deployer.jar" />
+ <include name="jboss-osgi-runtime-felix.jar" />
+ <include name="jboss-osgi-runtime-spi.jar" />
<include name="org.apache.felix.framework.jar" />
<include name="org.osgi.compendium.jar" />
<include name="org.osgi.core.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-deployer-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-deployer-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
<!-- OSGi Bundles -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="jboss-osgi-service-http.jar" />
- <include name="jboss-osgi-webconsole.jar" />
+ <include name="jboss-osgi-service-webconsole.jar" />
</fileset>
</pack>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/.project
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/.project 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/.project 2009-02-25 18:48:57 UTC (rev 84759)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-int</name>
+ <name>jboss-osgi-microcontainer-facade</name>
<comment>JBoss OSGi Integration</comment>
<projects>
</projects>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss OSGi - Microcontainer Facade and Deployers</name>
- <artifactId>jboss-osgi-int</artifactId>
+ <artifactId>jboss-osgi-microcontainer-facade</artifactId>
<packaging>jar</packaging>
<parent>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<version>1.0.0.Alpha3</version>
-
+
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
@@ -33,6 +33,7 @@
</modules>
<properties>
+ <version.aqute.bnd>0.0.249</version.aqute.bnd>
<version.felix.framework>1.4.1</version.felix.framework>
<version.felix.javax.servlet>1.0.0</version.felix.javax.servlet>
<version.felix.osgi.core>1.2.0</version.felix.osgi.core>
@@ -54,6 +55,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>${version.aqute.bnd}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-int</artifactId>
<version>${project.version}</version>
@@ -154,7 +160,7 @@
<artifactId>osgi_R4_core</artifactId>
<version>${version.osgi.r4.core}</version>
</dependency>
-
+
<!-- Felix Dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -176,7 +182,7 @@
<artifactId>org.apache.felix.framework</artifactId>
<version>${version.felix.framework}</version>
</dependency>
-
+
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss</groupId>
@@ -288,7 +294,7 @@
</reporting>
<profiles>
-
+
<!--
Name: default
Desc: The default profile
@@ -303,7 +309,7 @@
<microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory>
</properties>
</profile>
-
+
<!--
Name: distro
Desc: Build the distribution
@@ -315,21 +321,9 @@
</modules>
<build>
<plugins>
- <!--
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!--
+ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <quiet>true</quiet> </configuration> <executions> <execution>
+ <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> </execution> </executions> </plugin>
-->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -340,7 +334,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: eclipse
Desc: The eclipse profile
Modified: projects/jboss-osgi/trunk/runtime/deployer/.project
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/.project 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/runtime/deployer/.project 2009-02-25 18:48:57 UTC (rev 84759)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-deployer</name>
+ <name>jboss-osgi-runtime-deployer</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -6,7 +6,7 @@
<description>JBoss OSGi - JBoss Deployer</description>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployer</artifactId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
<packaging>jar</packaging>
<parent>
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/runtime/felix/.project
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/.project 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/runtime/felix/.project 2009-02-25 18:48:57 UTC (rev 84759)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-felix</name>
+ <name>jboss-osgi-runtime-felix</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -6,7 +6,7 @@
<description>JBoss OSGi - Apache Felix Runtime</description>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-felix</artifactId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
<packaging>jar</packaging>
<parent>
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/runtime/spi/.project
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/.project 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/runtime/spi/.project 2009-02-25 18:48:57 UTC (rev 84759)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-spi</name>
+ <name>jboss-osgi-runtime-spi</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/trunk/runtime/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -6,7 +6,7 @@
<description>JBoss OSGi - Runtime SPI</description>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
Modified: projects/jboss-osgi/trunk/service/http/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/http/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/service/http/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/service/webconsole/.project
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/.project 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/service/webconsole/.project 2009-02-25 18:48:57 UTC (rev 84759)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.felix.webconsole</name>
+ <name>jboss-osgi-service-webconsole</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -5,7 +5,7 @@
<description>JBoss OSGi - Web Console Service</description>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
+ <artifactId>jboss-osgi-service-webconsole</artifactId>
<packaging>bundle</packaging>
<parent>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-25 18:29:16 UTC (rev 84758)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-02-25 18:48:57 UTC (rev 84759)
@@ -24,7 +24,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-felix</artifactId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -34,7 +34,6 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
- <version>0.0.249</version>
</dependency>
<!-- Test Dependencies -->
More information about the jboss-cvs-commits
mailing list