Author: zoe
Date: Tue Oct 27 16:29:45 2009
New Revision: 830235
URL: http://svn.apache.org/viewvc?rev=830235&view=rev
Log:
ARIES-43 Reorganised and added a pom.xml to the parent blueprint-helloworld
directory
Added:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldclient/
- copied from r829815,
incubator/aries/trunk/blueprint/blueprint-helloworld/helloworldclient/
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldserver/
- copied from r829815,
incubator/aries/trunk/blueprint/blueprint-helloworld/helloworldserver/
incubator/aries/trunk/blueprint/blueprint-helloworld/pom.xml
Removed:
incubator/aries/trunk/blueprint/blueprint-helloworld/helloworldclient/
incubator/aries/trunk/blueprint/blueprint-helloworld/helloworldserver/
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldclient/pom.xml
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldserver/pom.xml
incubator/aries/trunk/blueprint/pom.xml
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldclient/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldclient/pom.xml?rev=830235&r1=829815&r2=830235&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldclient/pom.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldclient/pom.xml
Tue Oct 27 16:29:45 2009
@@ -18,11 +18,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint</artifactId>
+ <artifactId>blueprint-helloworld</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>helloworldclient</artifactId>
+ <artifactId>blueprint-helloworldclient</artifactId>
+ <groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
<name>Apache Aries Blueprint HelloWorldClient</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world client
application.</description>
@@ -36,7 +37,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.helloworldclient</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.groupId}.blueprint-helloworldclient</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
@@ -53,8 +54,8 @@
<artifactId>aries-blueprint-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>helloworldserver</artifactId>
+
<groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
+ <artifactId>blueprint-helloworldserver</artifactId>
<version>1.0.0-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldserver/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldserver/pom.xml?rev=830235&r1=829815&r2=830235&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldserver/pom.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworldserver/pom.xml
Tue Oct 27 16:29:45 2009
@@ -17,12 +17,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>blueprint</artifactId>
+ <artifactId>blueprint-helloworld</artifactId>
<groupId>org.apache.aries.blueprint</groupId>
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>helloworldserver</artifactId>
+ <artifactId>blueprint-helloworldserver</artifactId>
+ <groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
<name>Apache Aries Blueprint HelloWorldServer</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application -
server</description>
@@ -36,7 +37,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${pom.groupId}.helloworldserver</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${pom.groupId}.blueprint-helloworldserver</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Added: incubator/aries/trunk/blueprint/blueprint-helloworld/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/pom.xml?rev=830235&view=auto
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-helloworld/pom.xml (added)
+++ incubator/aries/trunk/blueprint/blueprint-helloworld/pom.xml Tue Oct 27
16:29:45 2009
@@ -0,0 +1,46 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>blueprint</artifactId>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+ <name>Apache Aries Blueprint HelloWorld sample</name>
+ <artifactId>blueprint-helloworld</artifactId>
+ <packaging>pom</packaging>
+ <description>Example blueprint hello world application</description>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>aries-blueprint-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>blueprint-helloworldserver</module>
+ <module>blueprint-helloworldclient</module>
+ </modules>
+</project>
Modified: incubator/aries/trunk/blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/pom.xml?rev=830235&r1=830234&r2=830235&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/pom.xml (original)
+++ incubator/aries/trunk/blueprint/pom.xml Tue Oct 27 16:29:45 2009
@@ -240,6 +240,7 @@
<module>blueprint-bundle</module>
<module>blueprint-sample</module>
<module>blueprint-itests</module>
+ <module>blueprint-helloworld</module>
</modules>
</project>
