You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/08/27 16:55:43 UTC

svn commit: r1162366 - in /karaf/cellar/branches/cellar-2.2.x: ./ samples/ samples/dosgi-greeter/ samples/dosgi-greeter/api/ samples/dosgi-greeter/api/src/ samples/dosgi-greeter/api/src/main/ samples/dosgi-greeter/api/src/main/java/ samples/dosgi-greet...

Author: iocanel
Date: Sat Aug 27 14:55:41 2011
New Revision: 1162366

URL: http://svn.apache.org/viewvc?rev=1162366&view=rev
Log:
Merged from trunk: [KARAF-837] Added samples. Added dosgi-greeter sample. Added hazelcast-app sample. [KARAF-837] Added missing files. revisions: 1162356 & 1162357

Added:
    karaf/cellar/branches/cellar-2.2.x/samples/
      - copied from r1162356, karaf/cellar/trunk/samples/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/NOTICE
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/NOTICE
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/README
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/pom.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/Greet.java
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/Greet.java
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/GreetResponse.java
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/GreetResponse.java
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/Greeter.java
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/api/Greeter.java
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/test/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/test/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/api/src/test/java/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/api/src/test/java/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/pom.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreeterClient.java
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreeterClient.java
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/resources/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/resources/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/blueprint/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/blueprint/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/blueprint/blueprint.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/blueprint/shell-greeter.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/main/resources/OSGI-INF/blueprint/shell-greeter.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/test/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/test/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/test/java/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/client/src/test/java/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml
      - copied, changed from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/pom.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/resources/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/resources/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/resources/OSGI-INF/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/resources/OSGI-INF/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/resources/OSGI-INF/blueprint/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/resources/OSGI-INF/blueprint/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/test/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/test/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/test/java/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/service/src/test/java/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/src/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/resources/
      - copied from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/src/main/resources/
    karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/src/main/resources/features.xml
      - copied unchanged from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/src/main/resources/features.xml
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/NOTICE
      - copied unchanged from r1162357, karaf/cellar/trunk/samples/hazelcast-app/NOTICE
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/README
      - copied unchanged from r1162357, karaf/cellar/trunk/samples/hazelcast-app/README
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/pom.xml
      - copied, changed from r1162357, karaf/cellar/trunk/samples/hazelcast-app/pom.xml
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/
      - copied from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java
      - copied unchanged from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Activator.java
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Message.java
      - copied unchanged from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/Message.java
    karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java
      - copied unchanged from r1162357, karaf/cellar/trunk/samples/hazelcast-app/src/main/java/org/apache/karaf/cellar/samples/hazelcast/MessageListener.java
    karaf/cellar/branches/cellar-2.2.x/samples/pom.xml
      - copied, changed from r1162357, karaf/cellar/trunk/samples/pom.xml
Modified:
    karaf/cellar/branches/cellar-2.2.x/   (props changed)
    karaf/cellar/branches/cellar-2.2.x/pom.xml

Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 27 14:55:41 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357

Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1162366&r1=1162365&r2=1162366&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Sat Aug 27 14:55:41 2011
@@ -64,6 +64,7 @@
         <module>management</module>
         <module>webconsole</module>
         <module>assembly</module>
+        <module>samples</module>
     </modules>
 
     <scm>

Copied: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml (from r1162356, karaf/cellar/trunk/samples/dosgi-greeter/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml&p1=karaf/cellar/trunk/samples/dosgi-greeter/pom.xml&r1=1162356&r2=1162366&rev=1162366&view=diff
==============================================================================
--- karaf/cellar/trunk/samples/dosgi-greeter/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/pom.xml Sat Aug 27 14:55:41 2011
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.apache.karaf.cellar</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -84,4 +84,4 @@
     </build>
 
 
-</project>
\ No newline at end of file
+</project>

Copied: karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/pom.xml (from r1162357, karaf/cellar/trunk/samples/hazelcast-app/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/pom.xml&p1=karaf/cellar/trunk/samples/hazelcast-app/pom.xml&r1=1162357&r2=1162366&rev=1162366&view=diff
==============================================================================
--- karaf/cellar/trunk/samples/hazelcast-app/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/hazelcast-app/pom.xml Sat Aug 27 14:55:41 2011
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>samples</artifactId>
         <groupId>org.apache.karaf.cellar</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -58,4 +58,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Copied: karaf/cellar/branches/cellar-2.2.x/samples/pom.xml (from r1162357, karaf/cellar/trunk/samples/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/samples/pom.xml&p1=karaf/cellar/trunk/samples/pom.xml&r1=1162357&r2=1162366&rev=1162366&view=diff
==============================================================================
--- karaf/cellar/trunk/samples/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/pom.xml Sat Aug 27 14:55:41 2011
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cellar</artifactId>
         <groupId>org.apache.karaf</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>