You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ga...@apache.org on 2009/12/30 17:03:57 UTC
svn commit: r894658 - in /incubator/aries/trunk/jmx: ./
jmx-blueprint-bundle/ jmx-bundle/ jmx-itests/
jmx-itests/src/test/java/org/apache/aries/jmx/framework/
jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/
Author: gawor
Date: Wed Dec 30 16:03:56 2009
New Revision: 894658
URL: http://svn.apache.org/viewvc?rev=894658&view=rev
Log:
make bundle artifact names consistent with other names
Modified:
incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
incubator/aries/trunk/jmx/jmx-bundle/pom.xml
incubator/aries/trunk/jmx/jmx-itests/pom.xml
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
incubator/aries/trunk/jmx/pom.xml
Modified: incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=894658&r1=894657&r2=894658&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Wed Dec 30 16:03:56 2009
@@ -23,7 +23,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-jmx-blueprint</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Blueprint Bundle</name>
<description>
@@ -60,7 +60,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.groupId}.blueprint</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
!org.apache.aries.jmx*,
javax.management,
Modified: incubator/aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-bundle/pom.xml?rev=894658&r1=894657&r2=894658&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-bundle/pom.xml Wed Dec 30 16:03:56 2009
@@ -23,7 +23,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-jmx</artifactId>
+ <artifactId>org.apache.aries.jmx</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Bundle</name>
<description>
@@ -60,7 +60,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.groupId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
!org.apache.aries.jmx*,
org.osgi.framework;version="1.5.0",
Modified: incubator/aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/pom.xml?rev=894658&r1=894657&r2=894658&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-itests/pom.xml Wed Dec 30 16:03:56 2009
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx</artifactId>
+ <artifactId>org.apache.aries.jmx</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java?rev=894658&r1=894657&r2=894658&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java Wed Dec 30 16:03:56 2009
@@ -41,7 +41,7 @@
@Configuration
public static Option[] configuration() {
return CoreOptions.options(CoreOptions.equinox(),
- CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx").versionAsInProject()
+ CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx").versionAsInProject()
);
}
Modified: incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=894658&r1=894657&r2=894658&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java Wed Dec 30 16:03:56 2009
@@ -80,7 +80,7 @@
CoreOptions.mavenBundle().groupId("org.apache.aries").artifactId("org.apache.aries.util").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint").versionAsInProject(),
CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.sample").versionAsInProject(),
- CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-blueprint").versionAsInProject()
+ CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("org.apache.aries.jmx.blueprint").versionAsInProject()
);
}
Modified: incubator/aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=894658&r1=894657&r2=894658&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Wed Dec 30 16:03:56 2009
@@ -63,12 +63,12 @@
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx</artifactId>
+ <artifactId>org.apache.aries.jmx</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx-blueprint</artifactId>
+ <artifactId>org.apache.aries.jmx.blueprint</artifactId>
<version>${version}</version>
</dependency>
<dependency>