incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r921575 - in /incubator/aries/trunk/samples/helloworld-samples: ./ blueprint/ blueprint/blueprint-helloworld-api/ blueprint/blueprint-helloworld-assembly/ blueprint/blueprint-helloworld-client/ blueprint/blueprint-helloworld-server/
Date Wed, 10 Mar 2010 21:21:42 GMT
Author: zoe
Date: Wed Mar 10 21:21:40 2010
New Revision: 921575

URL: http://svn.apache.org/viewvc?rev=921575&view=rev
Log:
ARIES-225 Some pom refactoring done, not complete yet

Modified:
    incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-api/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-client/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-server/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/pom.xml

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-api/pom.xml?rev=921575&r1=921574&r2=921575&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-api/pom.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-api/pom.xml
Wed Mar 10 21:21:40 2010
@@ -1,3 +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
@@ -15,14 +16,16 @@
     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>blueprint-helloworld</artifactId>
+        <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+        <artifactId>blueprint</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>blueprint-helloworld-api</artifactId>
+    <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
     <name>Apache Aries Blueprint HelloWorld API</name>
     <packaging>bundle</packaging>
     <description>Example blueprint hello world application - api</description>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/pom.xml?rev=921575&r1=921574&r2=921575&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/pom.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/pom.xml
Wed Mar 10 21:21:40 2010
@@ -19,12 +19,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries.samples</groupId>
-        <artifactId>blueprint-helloworld</artifactId>
+        <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+        <artifactId>blueprint</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>blueprint-helloworld-assembly</artifactId>
+    <artifactId>org.apache.aries.samples.helloworld.blueprint.assembly</artifactId>
     <name>Apache Aries Blueprint HelloWorld Assembly</name>
     <packaging>pom</packaging>
 
@@ -66,18 +66,21 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.aries.samples</groupId>
-            <artifactId>blueprint-helloworld-api</artifactId>
+            <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+            <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
+        <version>0.1-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.aries.samples</groupId>
-            <artifactId>blueprint-helloworld-server</artifactId>
+            <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+            <artifactId>org.apache.aries.samples.helloworld.blueprint.server</artifactId>
+        <version>0.1-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.aries.samples</groupId>
-            <artifactId>blueprint-helloworld-client</artifactId>
+            <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+            <artifactId>org.apache.aries.samples.helloworld.blueprint.client</artifactId>
+        <version>0.1-incubating-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
@@ -123,11 +126,3 @@
     </build>
 
 </project>
-
-        
-
-        
-        
-        
-        
-        

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-client/pom.xml?rev=921575&r1=921574&r2=921575&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-client/pom.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-client/pom.xml
Wed Mar 10 21:21:40 2010
@@ -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</groupId>
-		<artifactId>helloworld-samples</artifactId>
+		<groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+		<artifactId>blueprint</artifactId>
 		<version>0.1-incubating-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>blueprint-helloworld-client</artifactId>
+	<artifactId>org.apache.aries.samples.helloworld.blueprint.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</groupId>
-			<artifactId>blueprint-helloworld-api</artifactId>
+			<groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+			<artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 	</dependencies>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-server/pom.xml?rev=921575&r1=921574&r2=921575&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-server/pom.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-server/pom.xml
Wed Mar 10 21:21:40 2010
@@ -1,3 +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
@@ -15,14 +16,16 @@
     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>helloworld-samples</artifactId>
+        <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+        <artifactId>blueprint</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>blueprint-helloworld-server</artifactId>
+    <artifactId>org.apache.aries.samples.helloworld.blueprint.server</artifactId>
     <name>Apache Aries Blueprint HelloWorldServer</name>
     <packaging>bundle</packaging>
     <description>Example blueprint hello world application - server</description>
@@ -43,8 +46,8 @@
     </build>
     <dependencies>
         <dependency>
-                <groupId>org.apache.aries.samples</groupId>
-                <artifactId>blueprint-helloworld-api</artifactId>
+                <groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+                <artifactId>org.apache.aries.samples.helloworld.blueprint.api</artifactId>
                 <version>${pom.version}</version>
         </dependency>
     </dependencies>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint/pom.xml?rev=921575&r1=921574&r2=921575&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint/pom.xml Wed Mar 10 21:21:40
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
@@ -20,48 +20,22 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-	<groupId>org.apache.aries.samples</groupId>
-	        <artifactId>helloworld-samples</artifactId>
+	<groupId>org.apache.aries.samples.helloworld</groupId>
+	        <artifactId>helloworld</artifactId>
         <version>0.1-incubating-SNAPSHOT</version>
         </parent>
 
-	<artifactId>blueprint-helloworld</artifactId>
+	<groupId>org.apache.aries.samples.helloworld.blueprint</groupId>
+	<artifactId>blueprint</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</groupId>
-                <artifactId>blueprint-helloworld-api</artifactId>
-                <version>${version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.samples</groupId>
-                <artifactId>blueprint-helloworld-assembly</artifactId>
-                <type>eba</type>
-                <version>${version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.samples</groupId>
-                <artifactId>blueprint-helloworld-client</artifactId>
-                <version>${version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.aries.samples</groupId>
-                <artifactId>blueprint-helloworld-server</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>blueprint-helloworld-assembly</module> 
 	</modules>
 
 </project>

Modified: incubator/aries/trunk/samples/helloworld-samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/pom.xml?rev=921575&r1=921574&r2=921575&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/pom.xml Wed Mar 10 21:21:40 2010
@@ -1,3 +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
@@ -23,13 +24,14 @@
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>helloworld-samples</artifactId>
+    <groupId>org.apache.aries.samples.helloworld</groupId>
+    <artifactId>helloworld</artifactId>
     <name>Apache Aries HelloWorld samples</name>
     <packaging>pom</packaging>
     <description>Example hello world application</description>
 
     <modules>
-        <module>blueprint-helloworld</module>
+        <module>blueprint</module> 
     </modules>
 
 



Mime
View raw message