incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r831356 - in /incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client: ./ src/main/java/org/apache/aries/blueprint/helloworldclient/ src/main/resources/OSGI-INF/blueprint/
Date Fri, 30 Oct 2009 15:57:22 GMT
Author: zoe
Date: Fri Oct 30 15:57:21 2009
New Revision: 831356

URL: http://svn.apache.org/viewvc?rev=831356&view=rev
Log:
ARIES-45 - client fixes

Removed:
    incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/java/org/apache/aries/blueprint/helloworldclient/HelloWorldClientImpl.java
Modified:
    incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
    incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/java/org/apache/aries/blueprint/helloworldclient/HelloWorldClient.java
    incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml

Modified: incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml?rev=831356&r1=831355&r2=831356&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
(original)
+++ incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/pom.xml
Fri Oct 30 15:57:21 2009
@@ -5,9 +5,9 @@
     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.
@@ -45,22 +45,10 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-        	<groupId>org.apache.aries.blueprint</groupId>
-        	<artifactId>aries-blueprint-api</artifactId>
-        </dependency>
-        <dependency>
-        	<groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
-        	<artifactId>blueprint-helloworldserver</artifactId>
-        	<version>1.0.0-incubating-SNAPSHOT</version>
+                <groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
+                <artifactId>blueprint-helloworldserver</artifactId>
+                <version>1.0.0-incubating-SNAPSHOT</version>
         </dependency>
     </dependencies>
-    <dependencyManagement>
-    	<dependencies>
-    	</dependencies>
-    </dependencyManagement>
 </project>
+    
\ No newline at end of file

Modified: incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/java/org/apache/aries/blueprint/helloworldclient/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/java/org/apache/aries/blueprint/helloworldclient/HelloWorldClient.java?rev=831356&r1=831355&r2=831356&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/java/org/apache/aries/blueprint/helloworldclient/HelloWorldClient.java
(original)
+++ incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/java/org/apache/aries/blueprint/helloworldclient/HelloWorldClient.java
Fri Oct 30 15:57:21 2009
@@ -18,6 +18,26 @@
  */
 package org.apache.aries.blueprint.helloworldclient;
 
-public interface HelloWorldClient {
-	public void startUp();
+import org.apache.aries.blueprint.helloworldapi.HelloWorldService;
+
+public class HelloWorldClient {
+
+        HelloWorldService helloWorldService = null;
+
+        public void startUp() {
+                System.out.println("========>>>>Client HelloWorld: About to execute
a method from the Hello World service");
+                helloWorldService.hello();
+                System.out.println("========>>>>Client HelloWorld: ... if you
didn't just see a Hello World message something went wrong");
+        }
+
+        public HelloWorldService getHelloWorldService() {
+                return helloWorldService;
+        }
+
+        public void setHelloWorldService(HelloWorldService helloWorldService) {
+                this.helloWorldService = helloWorldService;
+
+        }
+
 }
+

Modified: incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml?rev=831356&r1=831355&r2=831356&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
(original)
+++ incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
Fri Oct 30 15:57:21 2009
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-	<!--
-		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
+        <!--
+                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.
-	-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-	default-availability="optional">
+                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.
+        -->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-	<reference id="helloserver"
-		interface="org.apache.aries.blueprint.helloworldserver.HelloWorldServer" />
+        <reference id="helloservice"
+                interface="org.apache.aries.blueprint.helloworldapi.HelloWorldService" />
 
-	<bean id="helloclient" class="org.apache.aries.blueprint.helloworldclient.HelloWorldClientImpl"
-		init-method="startUp">
-		<property name="helloWorldComponent" ref="helloserver" />
-	</bean>
+        <bean id="helloclient" class="org.apache.aries.blueprint.helloworldclient.HelloWorldClient"
+                init-method="startUp">
+                <property name="helloWorldService" ref="helloservice" />
+        </bean>
 </blueprint>
-



Mime
View raw message