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 18:59:12 UTC
svn commit: r1162405 - in /karaf/cellar/branches/cellar-2.2.x: ./
samples/dosgi-greeter/
samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/
samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cella...
Author: iocanel
Date: Sat Aug 27 16:59:11 2011
New Revision: 1162405
URL: http://svn.apache.org/viewvc?rev=1162405&view=rev
Log:
Merged from trunk
[KARAF-837] Fixed some spelling/syntax errors . [from revision 1162399]
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README
karaf/cellar/branches/cellar-2.2.x/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/pom.xml
karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 27 16:59:11 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,1162356-1162357,1162390,1162397
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399
Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README?rev=1162405&r1=1162404&r2=1162405&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/README Sat Aug 27 16:59:11 2011
@@ -2,7 +2,7 @@ DOSGi Greeter is a sample application th
Requirements / Setup
--------------------
-It requires a cellar cluster of at least to nodes, say node A and B.
+It requires a cellar cluster of at least two nodes, say node A and B.
Node B will export the Greeter service and node A will import the service.
@@ -29,6 +29,6 @@ Installation
3. Executing the greet (Pass a greet message and the number of iterations).
karaf@root> dosgi-greeter:greet Halo 2
- Halo.Halo from node 192.168.1.101:5702 count 0.
- Halo.Halo from node 192.168.1.101:5702 count 1.
+ Hello.Hello from node 192.168.1.101:5702 count 0.
+ Hello.Hello from node 192.168.1.101:5702 count 1.
Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java?rev=1162405&r1=1162404&r2=1162405&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java Sat Aug 27 16:59:11 2011
@@ -23,7 +23,7 @@ import org.apache.karaf.shell.console.Os
@Command(scope = "dosgi-greeter", name = "greet", description = "Starts the greet client")
public class GreetCommand extends OsgiCommandSupport {
- @Argument(index = 0, name = "greetMessage", description = "The message that will be sent as greet.", required = true, multiValued = false)
+ @Argument(index = 0, name = "greetMessage", description = "The message that will be sent as the greeting.", required = true, multiValued = false)
String greetMessage;
@Argument(index = 1, name = "iterations", description = "The number of greet iterations to perform", required = false, multiValued = false)
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=1162405&r1=1162404&r2=1162405&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 Sat Aug 27 16:59:11 2011
@@ -83,5 +83,4 @@
</plugins>
</build>
-
</project>
Modified: karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java?rev=1162405&r1=1162404&r2=1162405&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/samples/dosgi-greeter/service/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/service/GreeterImpl.java Sat Aug 27 16:59:11 2011
@@ -31,7 +31,7 @@ public class GreeterImpl implements Gree
@Override
public GreetResponse greet(Greet greet) {
String message = greet.getMessage();
- String response = message+"." +String.format("Halo from node %s count %s.",id,counter++);
+ String response = message+"." +String.format("Hello from node %s count %s.",id,counter++);
GreetResponse greetResponse = new GreetResponse(greet,response);
return greetResponse;
}