Author: linsun
Date: Tue Dec 1 03:24:08 2009
New Revision: 885662
URL: http://svn.apache.org/viewvc?rev=885662&view=rev
Log:
update blueprint jar file names per discussion on dev list
Modified:
incubator/aries/trunk/blueprint/blueprint-api/pom.xml
incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
incubator/aries/trunk/blueprint/blueprint-cm/pom.xml
incubator/aries/trunk/blueprint/blueprint-core/pom.xml
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-api/pom.xml
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
incubator/aries/trunk/blueprint/blueprint-sample/pom.xml
incubator/aries/trunk/blueprint/pom.xml
Modified: incubator/aries/trunk/blueprint/blueprint-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-api/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-api/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-api/pom.xml Tue Dec 1 03:24:08
2009
@@ -22,7 +22,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint API</name>
<description>
Modified: incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml Tue Dec 1
03:24:08 2009
@@ -22,7 +22,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Bundle</name>
<description>
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-core</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-cm</artifactId>
+ <artifactId>org.apache.aries.blueprint.cm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -113,19 +113,19 @@
<configuration>
<artifactSet>
<includes>
-
<include>org.apache.aries.blueprint:aries-blueprint-core</include>
-
<include>org.apache.aries.blueprint:aries-blueprint-cm</include>
+
<include>org.apache.aries.blueprint:org.apache.aries.blueprint.core</include>
+
<include>org.apache.aries.blueprint:org.apache.aries.blueprint.cm</include>
</includes>
</artifactSet>
<filters>
<filter>
-
<artifact>org.apache.aries.blueprint:aries-blueprint-core</artifact>
+
<artifact>org.apache.aries.blueprint:org.apache.aries.blueprint.core</artifact>
<excludes>
<exclude>org/**</exclude>
</excludes>
</filter>
<filter>
-
<artifact>org.apache.aries.blueprint:aries-blueprint-cm</artifact>
+
<artifact>org.apache.aries.blueprint:org.apache.aries.blueprint.cm</artifact>
<excludes>
<exclude>org/**</exclude>
</excludes>
@@ -163,12 +163,12 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.aries.blueprint</groupId>
-
<artifactId>aries-blueprint-core</artifactId>
+
<artifactId>org.apache.aries.blueprint.core</artifactId>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.aries.blueprint</groupId>
-
<artifactId>aries-blueprint-cm</artifactId>
+
<artifactId>org.apache.aries.blueprint.cm</artifactId>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
Modified: incubator/aries/trunk/blueprint/blueprint-cm/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-cm/pom.xml Tue Dec 1 03:24:08
2009
@@ -24,7 +24,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-blueprint-cm</artifactId>
+ <artifactId>org.apache.aries.blueprint.cm</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint CM</name>
<description>
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-core</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: incubator/aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/pom.xml Tue Dec 1 03:24:08
2009
@@ -24,7 +24,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>aries-blueprint-core</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries Blueprint Core</name>
<description>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-api/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-api/pom.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-api/pom.xml
Tue Dec 1 03:24:08 2009
@@ -22,8 +22,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>blueprint-helloworld-api</artifactId>
- <groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
+ <artifactId>org.apache.aries.blueprint.helloworld.api</artifactId>
<name>Apache Aries Blueprint HelloWorld Api</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application - api</description>
@@ -37,8 +36,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>
- ${pom.groupId}.blueprint-helloworld-api</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
Tue Dec 1 03:24:08 2009
@@ -22,8 +22,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>blueprint-helloworldclient</artifactId>
- <groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
+ <artifactId>org.apache.aries.blueprint.helloworld.client</artifactId>
<name>Apache Aries Blueprint HelloWorldClient</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world client
application.</description>
@@ -37,7 +36,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.blueprint-helloworldclient</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
@@ -45,10 +44,10 @@
</build>
<dependencies>
<dependency>
-
<groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
- <artifactId>blueprint-helloworldserver</artifactId>
+ <groupId>org.apache.aries.blueprint</groupId>
+
<artifactId>org.apache.aries.blueprint.helloworld.server</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
-
\ No newline at end of file
+
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
Tue Dec 1 03:24:08 2009
@@ -22,8 +22,7 @@
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>blueprint-helloworldserver</artifactId>
- <groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
+ <artifactId>org.apache.aries.blueprint.helloworld.server</artifactId>
<name>Apache Aries Blueprint HelloWorldServer</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application -
server</description>
@@ -37,7 +36,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.blueprint-helloworldserver</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
@@ -45,10 +44,10 @@
</build>
<dependencies>
<dependency>
-
<groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
- <artifactId>blueprint-helloworld-api</artifactId>
+ <groupId>org.apache.aries.blueprint</groupId>
+
<artifactId>org.apache.aries.blueprint.helloworld.api</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
-
\ No newline at end of file
+
Modified: incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/pom.xml Tue Dec 1
03:24:08 2009
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
Tue Dec 1 03:24:08 2009
@@ -125,7 +125,7 @@
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
// Bundles
- mavenBundle("org.apache.aries.blueprint", "aries-blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart(),
mavenBundle("org.osgi", "org.osgi.compendium"),
//
org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
Tue Dec 1 03:24:08 2009
@@ -182,7 +182,7 @@
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
// Bundles
- mavenBundle("org.apache.aries.blueprint", "aries-blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart(),
mavenBundle("org.osgi","org.osgi.compendium"),
//
org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
Tue Dec 1 03:24:08 2009
@@ -144,7 +144,7 @@
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
// Bundles
- mavenBundle("org.apache.aries.blueprint", "aries-blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample"),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: incubator/aries/trunk/blueprint/blueprint-sample/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/pom.xml Tue Dec 1
03:24:08 2009
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/aries/trunk/blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/pom.xml?rev=885662&r1=885661&r2=885662&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/pom.xml (original)
+++ incubator/aries/trunk/blueprint/pom.xml Tue Dec 1 03:24:08 2009
@@ -59,22 +59,22 @@
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-api</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-core</artifactId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-cm</artifactId>
+ <artifactId>org.apache.aries.blueprint.cm</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
<version>${version}</version>
</dependency>
<dependency>
