aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r895774 - in /incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld: ./ blueprint-helloworld-api/src/main/resources/META-INF/ blueprint-helloworld-client/ blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/ bl...
Date Mon, 04 Jan 2010 20:53:16 GMT
Author: zoe
Date: Mon Jan  4 20:53:15 2010
New Revision: 895774

URL: http://svn.apache.org/viewvc?rev=895774&view=rev
Log:
ARIES-104

Removed:
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-api/src/main/resources/META-INF/MANIFEST.MF
Modified:
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
    incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/pom.xml

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml?rev=895774&r1=895773&r2=895774&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/pom.xml
Mon Jan  4 20:53:15 2010
@@ -1,53 +1,54 @@
-<!--
-    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
+	<!--
+		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
 
-    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.
--->
-<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>
-        <groupId>org.apache.aries.samples</groupId>
-        <artifactId>helloworld-samples</artifactId>
-        <version>1.0.0-incubating-SNAPSHOT</version>
-    </parent>
+		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.
+	-->
+<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>
+		<groupId>org.apache.aries.samples</groupId>
+		<artifactId>helloworld-samples</artifactId>
+		<version>1.0.0-incubating-SNAPSHOT</version>
+	</parent>
 
-    <artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
-    <name>Apache Aries Blueprint HelloWorldClient</name>
-    <packaging>bundle</packaging>
-    <description>Example blueprint hello world client application.</description>
+	<artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
+	<name>Apache Aries Blueprint HelloWorldClient</name>
+	<packaging>bundle</packaging>
+	<description>Example blueprint hello world client application.</description>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin
                 </artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.helloworld.server</artifactId>
-                <version>1.0.0-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.aries.samples</groupId>
+			<artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+			<version>1.0.0-incubating-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 </project>
     

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml?rev=895774&r1=895773&r2=895774&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
Mon Jan  4 20:53:15 2010
@@ -17,9 +17,9 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
         <reference id="helloservice"
-                interface="org.apache.aries.blueprint.helloworldapi.HelloWorldService" />
+                interface="org.apache.aries.samples.blueprint.helloworld.api.HelloWorldService"
/>
 
-        <bean id="helloclient" class="org.apache.aries.blueprint.helloworldclient.HelloWorldClient"
+        <bean id="helloclient" class="org.apache.aries.samples.blueprint.helloworld.client.HelloWorldClient"
                 init-method="startUp">
                 <property name="helloWorldService" ref="helloservice" />
         </bean>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml?rev=895774&r1=895773&r2=895774&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/pom.xml
Mon Jan  4 20:53:15 2010
@@ -44,8 +44,8 @@
     </build>
     <dependencies>
         <dependency>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>org.apache.aries.blueprint.helloworld.api</artifactId>
+                <groupId>org.apache.aries.samples</groupId>
+                <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
                 <version>1.0.0-incubating-SNAPSHOT</version>
         </dependency>
     </dependencies>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml?rev=895774&r1=895773&r2=895774&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
(original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/blueprint-helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
Mon Jan  4 20:53:15 2010
@@ -17,11 +17,11 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
         <bean id="helloservice"
-                class="org.apache.aries.blueprint.helloworldserver.HelloWorldServiceImpl"
+                class="org.apache.aries.samples.blueprint.helloworld.server.HelloWorldServiceImpl"
                 init-method="startUp">
         </bean>
 
         <service ref="helloservice"
-                interface="org.apache.aries.blueprint.helloworldapi.HelloWorldService" />
+                interface="org.apache.aries.samples.blueprint.helloworld.api.HelloWorldService"
/>
 
 </blueprint>

Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/pom.xml?rev=895774&r1=895773&r2=895774&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/pom.xml (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint-helloworld/pom.xml Mon Jan
 4 20:53:15 2010
@@ -34,6 +34,7 @@
 		<module>blueprint-helloworld-server</module>
 		<module>blueprint-helloworld-client</module>
 		<module>blueprint-helloworld-api</module>
+		<module>blueprint-helloworld-assembly</module>
 	</modules>
 
 </project>



Mime
View raw message