You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/27 08:17:00 UTC

svn commit: r1236552 - in /karaf/cellar/branches/cellar-2.2.x/samples: camel-hazelcast-app/ camel-hazelcast-app/assembly/ camel-hazelcast-app/assembly/src/ camel-hazelcast-app/assembly/src/main/ camel-hazelcast-app/assembly/src/main/resources/ camel-ha...

Author: jbonofre
Date: Fri Jan 27 07:16:59 2012
New Revision: 1236552

URL: http://svn.apache.org/viewvc?rev=1236552&view=rev
Log:
Fix the samples modules structure to avoid a gpg:sign issue

Added:
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/pom.xml
      - copied, changed from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/main/resources/
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/main/resources/features.xml
      - copied, changed from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/src/main/resources/features.xml
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/NOTICE
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/NOTICE
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/NOTICE
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/pom.xml
      - copied, changed from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/main/resources/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/main/resources/features.xml
      - copied, changed from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/resources/features.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/NOTICE
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/NOTICE
Removed:
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/src/main/resources/features.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/resources/features.xml
Modified:
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/pom.xml

Copied: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/pom.xml (from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/pom.xml&p1=karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml&r1=1236546&r2=1236552&rev=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/pom.xml Fri Jan 27 07:16:59 2012
@@ -22,25 +22,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.karaf.cellar</groupId>
-        <artifactId>samples</artifactId>
+        <groupId>org.apache.karaf.cellar.samples</groupId>
+        <artifactId>camel</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.karaf.cellar.samples</groupId>
     <artifactId>camel-hazelcast-app</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Karaf :: Cellar :: Samples :: Camel Hazelcast Application</name>
-
-    <properties>
-        <camel.version>2.9.0</camel.version>
-    </properties>
-
-    <modules>
-        <module>producer</module>
-        <module>consumer</module>
-    </modules>
+    <name>Apache Karaf :: Cellar :: Samples :: Camel Hazelcast Application :: Assembly</name>
 
     <build>
         <resources>

Copied: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/main/resources/features.xml (from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/src/main/resources/features.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/main/resources/features.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/assembly/src/main/resources/features.xml&p1=karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/src/main/resources/features.xml&r1=1236546&r2=1236552&rev=1236552&view=diff
==============================================================================
    (empty)

Added: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/NOTICE
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/NOTICE?rev=1236552&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/NOTICE (added)
+++ karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/NOTICE Fri Jan 27 07:16:59 2012
@@ -0,0 +1,48 @@
+Apache Karaf Cellar
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JClouds (http://www.jclouds.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/consumer/pom.xml Fri Jan 27 07:16:59 2012
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.karaf.cellar.samples</groupId>
-        <artifactId>camel-hazelcast-app</artifactId>
+        <artifactId>camel</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/pom.xml Fri Jan 27 07:16:59 2012
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.karaf.cellar.samples</groupId>
-    <artifactId>camel-hazelcast-app</artifactId>
+    <artifactId>camel</artifactId>
     <packaging>pom</packaging>
     <name>Apache Karaf :: Cellar :: Samples :: Camel Hazelcast Application</name>
 
@@ -40,55 +40,7 @@
     <modules>
         <module>producer</module>
         <module>consumer</module>
+        <module>assembly</module>
     </modules>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifact</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/classes/features.xml</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file

Added: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/NOTICE
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/NOTICE?rev=1236552&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/NOTICE (added)
+++ karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/NOTICE Fri Jan 27 07:16:59 2012
@@ -0,0 +1,48 @@
+Apache Karaf Cellar
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JClouds (http://www.jclouds.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/camel-hazelcast-app/producer/pom.xml Fri Jan 27 07:16:59 2012
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.karaf.cellar.samples</groupId>
-        <artifactId>camel-hazelcast-app</artifactId>
+        <artifactId>camel</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Added: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/NOTICE
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/NOTICE?rev=1236552&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/NOTICE (added)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/NOTICE Fri Jan 27 07:16:59 2012
@@ -0,0 +1,44 @@
+Apache Karaf Cellar
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/pom.xml Fri Jan 27 07:16:59 2012
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.karaf.cellar.samples</groupId>
-        <artifactId>dosgi-greeter</artifactId>
+        <artifactId>dosgi</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/pom.xml (from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/pom.xml&p1=karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml&r1=1236546&r2=1236552&rev=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/pom.xml Fri Jan 27 07:16:59 2012
@@ -22,22 +22,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.karaf.cellar</groupId>
-        <artifactId>samples</artifactId>
+        <groupId>org.apache.karaf.cellar.samples</groupId>
+        <artifactId>dosgi</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.karaf.cellar.samples</groupId>
     <artifactId>dosgi-greeter</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Karaf :: Cellar :: Samples :: DOSGi</name>
-
-    <modules>
-        <module>api</module>
-        <module>service</module>
-        <module>client</module>
-    </modules>
+    <name>Apache Karaf :: Cellar :: Samples :: DOSGi :: Assembly</name>
 
     <build>
         <resources>
@@ -88,4 +81,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file

Copied: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/main/resources/features.xml (from r1236546, karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/resources/features.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/main/resources/features.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/assembly/src/main/resources/features.xml&p1=karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/resources/features.xml&r1=1236546&r2=1236552&rev=1236552&view=diff
==============================================================================
    (empty)

Added: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/NOTICE
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/NOTICE?rev=1236552&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/NOTICE (added)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/NOTICE Fri Jan 27 07:16:59 2012
@@ -0,0 +1,44 @@
+Apache Karaf Cellar
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/pom.xml Fri Jan 27 07:16:59 2012
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.karaf.cellar.samples</groupId>
-        <artifactId>dosgi-greeter</artifactId>
+        <artifactId>dosgi</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml Fri Jan 27 07:16:59 2012
@@ -29,7 +29,7 @@
     </parent>
 
     <groupId>org.apache.karaf.cellar.samples</groupId>
-    <artifactId>dosgi-greeter</artifactId>
+    <artifactId>dosgi</artifactId>
     <packaging>pom</packaging>
     <name>Apache Karaf :: Cellar :: Samples :: DOSGi</name>
 
@@ -37,55 +37,7 @@
         <module>api</module>
         <module>service</module>
         <module>client</module>
+        <module>assembly</module>
     </modules>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifact</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/classes/features.xml</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Added: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/NOTICE
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/NOTICE?rev=1236552&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/NOTICE (added)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/NOTICE Fri Jan 27 07:16:59 2012
@@ -0,0 +1,44 @@
+Apache Karaf Cellar
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+
+III. License Summary
+- Apache License 2.0

Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/pom.xml?rev=1236552&r1=1236551&r2=1236552&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/pom.xml Fri Jan 27 07:16:59 2012
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.karaf.cellar.samples</groupId>
-        <artifactId>dosgi-greeter</artifactId>
+        <artifactId>dosgi</artifactId>
         <version>2.2.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>