Author: zoe
Date: Fri Oct 30 15:58:30 2009
New Revision: 831357
URL: http://svn.apache.org/viewvc?rev=831357&view=rev
Log:
ARIES-45 Server fixes
Added:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServiceImpl.java
- copied, changed from r831327,
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServerImpl.java
Removed:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServer.java
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServerImpl.java
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml?rev=831357&r1=831356&r2=831357&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/pom.xml
Fri Oct 30 15:58:30 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.
@@ -17,7 +17,7 @@
<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>
- <artifactId>blueprint-helloworld</artifactId>
+ <artifactId>blueprint-helloworld</artifactId>
<groupId>org.apache.aries.blueprint</groupId>
<version>1.0.0-incubating-SNAPSHOT</version>
</parent>
@@ -45,13 +45,10 @@
</build>
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
+
<groupId>org.apache.aries.blueprint.blueprint-helloworld</groupId>
+ <artifactId>blueprint-helloworld-api</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>aries-blueprint-api</artifactId>
- </dependency>
</dependencies>
</project>
+
\ No newline at end of file
Copied:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServiceImpl.java
(from r831327,
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServerImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServiceImpl.java?p2=incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServiceImpl.java&p1=incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServerImpl.java&r1=831327&r2=831357&rev=831357&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServerImpl.java
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/java/org/apache/aries/blueprint/helloworldserver/HelloWorldServiceImpl.java
Fri Oct 30 15:58:30 2009
@@ -17,14 +17,17 @@
* under the License.
*/
package org.apache.aries.blueprint.helloworldserver;
+import org.apache.aries.blueprint.helloworldapi.HelloWorldService;
-public class HelloWorldServerImpl implements HelloWorldServer {
+public class HelloWorldServiceImpl implements HelloWorldService {
- public void hello() {
- System.out.println("======>>> A message from the server: Hello
World!");
- }
+ public void hello() {
+ System.out.println("======>>> A message from the server: Hello
World!");
+ }
- public void startUp() {
- System.out.println("======>>> Starting HelloWorld Server");
- }
+ public void startUp() {
+ System.out.println("======>>> Starting HelloWorld Server");
+ }
}
+
+
\ No newline at end of file
Modified:
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml?rev=831357&r1=831356&r2=831357&view=diff
==============================================================================
---
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
(original)
+++
incubator/aries/trunk/blueprint/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
Fri Oct 30 15:58:30 2009
@@ -1,30 +1,27 @@
<?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";>
+
+ <bean id="helloservice"
+
class="org.apache.aries.blueprint.helloworldserver.HelloWorldServiceImpl"
+ init-method="startUp">
+ </bean>
- 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">
-
-
-
- <bean id="helloserver"
class="org.apache.aries.blueprint.helloworldserver.HelloWorldServerImpl"
- init-method="startUp">
- </bean>
-
- <service ref="helloserver"
interface="org.apache.aries.blueprint.helloworldserver.HelloWorldServer"/>
+ <service ref="helloservice"
+
interface="org.apache.aries.blueprint.helloworldapi.HelloWorldService" />
</blueprint>
-
