You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by hu...@apache.org on 2010/04/08 14:34:26 UTC
svn commit: r931909 - in /incubator/aries/trunk/samples: blueprint/
blueprint/helloworld/ blueprint/helloworld/blueprint-helloworld-api/
blueprint/helloworld/blueprint-helloworld-assembly/
blueprint/helloworld/blueprint-helloworld-client/ blueprint/hel...
Author: hughesj
Date: Thu Apr 8 12:34:25 2010
New Revision: 931909
URL: http://svn.apache.org/viewvc?rev=931909&view=rev
Log:
ARIES-280 refactoring helloworld sample so blueprint samples come under samples/blueprint
Added:
incubator/aries/trunk/samples/blueprint/
incubator/aries/trunk/samples/blueprint/helloworld/
- copied from r931595, incubator/aries/trunk/samples/helloworld-samples/blueprint/
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-api/
- copied from r931595, incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-api/
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/
- copied from r931595, incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-client/
- copied from r931595, incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-client/
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-server/
- copied from r931595, incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-server/
incubator/aries/trunk/samples/blueprint/pom.xml
Removed:
incubator/aries/trunk/samples/blueprint/helloworld/blueprint-helloworld-api/
incubator/aries/trunk/samples/blueprint/helloworld/blueprint-helloworld-assembly/
incubator/aries/trunk/samples/blueprint/helloworld/blueprint-helloworld-client/
incubator/aries/trunk/samples/blueprint/helloworld/blueprint-helloworld-server/
incubator/aries/trunk/samples/helloworld-samples/blueprint/
Modified:
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml
incubator/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml
incubator/aries/trunk/samples/blueprint/helloworld/pom.xml
Modified: incubator/aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml?rev=931909&r1=931595&r2=931909&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint/helloworld/helloworld-api/pom.xml Thu Apr 8 12:34:25 2010
@@ -20,17 +20,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>blueprint</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>helloworld</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
<name>Apache Aries Blueprint HelloWorld API</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application - api</description>
- <build>
+ <properties>
+ <aries.osgi.export.pkg>
+ org.apache.aries.samples.blueprint.helloworld.api
+ </aries.osgi.export.pkg>
+ </properties>
+
+ <!--build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -44,5 +50,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build-->
</project>
Modified: incubator/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml?rev=931909&r1=931595&r2=931909&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint/helloworld/helloworld-assembly/pom.xml Thu Apr 8 12:34:25 2010
@@ -19,12 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>blueprint</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>helloworld</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.assembly</artifactId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
<name>Apache Aries Blueprint HelloWorld Assembly</name>
<packaging>pom</packaging>
@@ -66,18 +66,18 @@
</dependency>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.server</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.client</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
</dependency>
</dependencies>
Modified: incubator/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml?rev=931909&r1=931595&r2=931909&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint/helloworld/helloworld-client/pom.xml Thu Apr 8 12:34:25 2010
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,12 +18,12 @@
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>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>blueprint</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>helloworld</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.client</artifactId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
<name>Apache Aries Blueprint HelloWorldClient</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world client application.</description>
@@ -44,8 +44,8 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml?rev=931909&r1=931595&r2=931909&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint/helloworld/helloworld-server/pom.xml Thu Apr 8 12:34:25 2010
@@ -20,12 +20,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>blueprint</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>helloworld</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.server</artifactId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
<name>Apache Aries Blueprint HelloWorldServer</name>
<packaging>bundle</packaging>
<description>Example blueprint hello world application - server</description>
@@ -46,8 +46,8 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/aries/trunk/samples/blueprint/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint/helloworld/pom.xml?rev=931909&r1=931595&r2=931909&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blueprint/helloworld/pom.xml (original)
+++ incubator/aries/trunk/samples/blueprint/helloworld/pom.xml Thu Apr 8 12:34:25 2010
@@ -20,48 +20,47 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.samples.helloworld</groupId>
- <artifactId>helloworld</artifactId>
+ <groupId>org.apache.aries.samples.blueprint</groupId>
+ <artifactId>blueprint</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>blueprint</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>helloworld</artifactId>
<name>Apache Aries Blueprint HelloWorld</name>
<packaging>pom</packaging>
<description>Example blueprint hello world application</description>
-
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.server</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.client</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
- <artifactId>org.apache.aries.samples.helloworld.blueprint.assembly</artifactId>
+ <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
- <module>blueprint-helloworld-api</module>
- <module>blueprint-helloworld-server</module>
- <module>blueprint-helloworld-client</module>
- <module>blueprint-helloworld-assembly</module>
+ <module>helloworld-api</module>
+ <module>helloworld-server</module>
+ <module>helloworld-client</module>
+ <module>helloworld-assembly</module>
</modules>
</project>
Added: incubator/aries/trunk/samples/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blueprint/pom.xml?rev=931909&view=auto
==============================================================================
--- incubator/aries/trunk/samples/blueprint/pom.xml (added)
+++ incubator/aries/trunk/samples/blueprint/pom.xml Thu Apr 8 12:34:25 2010
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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>
+ <groupId>org.apache.aries.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.aries.samples.blueprint</groupId>
+ <artifactId>blueprint</artifactId>
+ <name>Apache Aries Blueprint samples</name>
+ <packaging>pom</packaging>
+ <description>Samples demonstrating the Apache Aries Blueprint implementation</description>
+
+ <modules>
+ <module>helloworld</module>
+ </modules>
+</project>