You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/09/14 04:29:44 UTC
svn commit: r1170418 - in /geronimo/samples/trunk/samples/osgi: ./
aries-datasource/ ariestrader-jdbc/ ariestrader-jdbc/src/main/history/
helloworld-eba/ helloworld-eba/helloworld-api/
helloworld-eba/helloworld-api/src/ helloworld-eba/helloworld-api/sr...
Author: violalu
Date: Wed Sep 14 02:29:42 2011
New Revision: 1170418
URL: http://svn.apache.org/viewvc?rev=1170418&view=rev
Log:
Add one eba sample into osgi
Added:
geronimo/samples/trunk/samples/osgi/helloworld-eba/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/api/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/api/HelloWorldService.java
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/resources/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/resources/META-INF/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/configuration/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/resources/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/resources/configuration/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/blueprint/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/server/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/server/HelloWorldServiceImpl.java
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/blueprint/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/wab/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/wab/HelloWorldServlet.java
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/WEB-INF/
geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/WEB-INF/web.xml
geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml
Modified:
geronimo/samples/trunk/samples/osgi/aries-datasource/pom.xml
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/pom.xml
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml
geronimo/samples/trunk/samples/osgi/pom.xml
Modified: geronimo/samples/trunk/samples/osgi/aries-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/aries-datasource/pom.xml?rev=1170418&r1=1170417&r2=1170418&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/aries-datasource/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/aries-datasource/pom.xml Wed Sep 14 02:29:42 2011
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
<type>rar</type>
<!--<scope>provided</scope>-->
</dependency>
@@ -104,7 +104,7 @@
<module>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
<type>rar</type>
</module>
<useMavenDependencies>
Modified: geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/pom.xml?rev=1170418&r1=1170417&r2=1170418&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/pom.xml Wed Sep 14 02:29:42 2011
@@ -37,7 +37,7 @@
</description>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
<version>${ariesVersion}</version>
@@ -67,7 +67,7 @@
<scope>provided</scope>
</dependency>
- <!--<dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
@@ -81,7 +81,7 @@
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -90,14 +90,12 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-aries-resolver</artifactId>
+ <artifactId>geronimo-aries</artifactId>
<version>${geronimoVersion}</version>
- <scope>provided</scope>
- </dependency>-->
-
-
+ <scope>provided</scope>
+ </dependency>
</dependencies>
@@ -109,7 +107,7 @@
<configuration>
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${ariesDeployer}</deploymentConfig>
<!--<deploymentConfig>${tomcatDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
Modified: geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml?rev=1170418&r1=1170417&r2=1170418&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml (original)
+++ geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml Wed Sep 14 02:29:42 2011
@@ -3,9 +3,9 @@
<module-id>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>ariestrader-jdbc-tomcat</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<type>car</type>
- </module-id>
+ </module-id>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
@@ -16,4 +16,9 @@
<artifactId>aries-datasource</artifactId>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-aries</artifactId>
+ <import>all</import>
+ </dependency>
</plugin-artifact>
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/pom.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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.geronimo.samples</groupId>
+ <artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+ <name>Apache Aries Blueprint HelloWorld API</name>
+ <packaging>bundle</packaging>
+ <description>Example blueprint hello world application - api</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Export-Package>
+ org.apache.aries.samples.blueprint.helloworld.api;
+ version=${pom.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/api/HelloWorldService.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/api/HelloWorldService.java?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/api/HelloWorldService.java (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-api/src/main/java/org/apache/aries/samples/blueprint/helloworld/api/HelloWorldService.java Wed Sep 14 02:29:42 2011
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+package org.apache.aries.samples.blueprint.helloworld.api;
+
+public interface HelloWorldService {
+ public void hello();
+
+ public void startUp();
+}
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/pom.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+ -->
+<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.geronimo.samples</groupId>
+ <artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
+ <name>Apache Aries Blueprint HelloWorld Assembly</name>
+ <packaging>eba</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.wab</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>eba-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <generateManifest>true</generateManifest>
+ <instructions>
+ <Application-SymbolicName>${pom.artifactId}</Application-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/configuration/config.ini?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/configuration/config.ini (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-assembly/src/main/filtered-resources/configuration/config.ini Wed Sep 14 02:29:42 2011
@@ -0,0 +1,29 @@
+# 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.
+
+osgi.bundles=\
+cm-3.2.0-v20070116@start,\
+services-3.1.200-v20070605@start,\
+pax-logging-api-1.4.jar@start,\
+pax-logging-service-1.4.jar@start,\
+org.apache.aries.util-${ariesUtilVersion}.jar@start,\
+org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
+org.apache.aries.samples.blueprint.helloworld.api-${ariesBlueprintVersion}.jar@1,\
+org.apache.aries.samples.blueprint.helloworld.server-${ariesBlueprintVersion}.jar@1,\
+org.apache.aries.samples.blueprint.helloworld.client-${ariesBlueprintVersion}.jar@1
+eclipse.ignoreApp=true
+org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/pom.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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.
+ -->
+<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.geronimo.samples</groupId>
+ <artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
+ <version>3.0-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>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin
+ </artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
+
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/java/org/apache/aries/samples/blueprint/helloworld/client/HelloWorldClient.java Wed Sep 14 02:29:42 2011
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+package org.apache.aries.samples.blueprint.helloworld.client;
+
+import org.apache.aries.samples.blueprint.helloworld.api.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;
+
+ }
+
+}
+
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-client/src/main/resources/OSGI-INF/blueprint/config.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +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
+
+ 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="helloservice"
+ interface="org.apache.aries.samples.blueprint.helloworld.api.HelloWorldService" />
+
+ <bean id="helloclient" class="org.apache.aries.samples.blueprint.helloworld.client.HelloWorldClient"
+ init-method="startUp">
+ <property name="helloWorldService" ref="helloservice" />
+ </bean>
+</blueprint>
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/pom.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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.geronimo.samples</groupId>
+ <artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
+ <name>Apache Aries Blueprint HelloWorldServer</name>
+ <packaging>bundle</packaging>
+ <description>Example blueprint hello world application - server</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin
+ </artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
+
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/server/HelloWorldServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/server/HelloWorldServiceImpl.java?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/server/HelloWorldServiceImpl.java (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/java/org/apache/aries/samples/blueprint/helloworld/server/HelloWorldServiceImpl.java Wed Sep 14 02:29:42 2011
@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+package org.apache.aries.samples.blueprint.helloworld.server;
+import org.apache.aries.samples.blueprint.helloworld.api.*;
+
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+ public void hello() {
+ System.out.println("======>>> A message from the server: Hello World!");
+ }
+
+ public void startUp() {
+ System.out.println("======>>> Starting HelloWorld Server");
+ }
+}
+
+
\ No newline at end of file
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-server/src/main/resources/OSGI-INF/blueprint/config.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +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
+
+ 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.samples.blueprint.helloworld.server.HelloWorldServiceImpl"
+ init-method="startUp">
+ </bean>
+
+ <service ref="helloservice"
+ interface="org.apache.aries.samples.blueprint.helloworld.api.HelloWorldService" />
+
+</blueprint>
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/pom.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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.
+ -->
+<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.geronimo.samples</groupId>
+ <artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.wab</artifactId>
+ <name>Apache Aries Blueprint HelloWorld WAB</name>
+ <packaging>bundle</packaging>
+ <description>Example blueprint hello world client application.</description>
+
+<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin
+ </artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>/Hello</Web-ContextPath>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Private-Package>org.apache.aries.samples.blueprint.helloworld.wab</Private-Package>
+ <Export-Package>!org.apache.aries.samples.blueprint.helloworld.wab</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/wab/HelloWorldServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/wab/HelloWorldServlet.java?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/wab/HelloWorldServlet.java (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/java/org/apache/aries/samples/blueprint/helloworld/wab/HelloWorldServlet.java Wed Sep 14 02:29:42 2011
@@ -0,0 +1,120 @@
+/**
+ * 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.
+ */
+package org.apache.aries.samples.blueprint.helloworld.wab;
+
+import org.apache.aries.samples.blueprint.helloworld.api.HelloWorldService;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public class HelloWorldServlet extends HttpServlet{
+ private ServletContext sc;
+ private BundleContext bundleContext;
+ private static final String OSGI_SERVICE_PREFIX = "osgi:service/";
+
+ /**
+ * @see Servlet#init(ServletConfig)
+ */
+ public void init(ServletConfig config) throws ServletException {
+ sc = config.getServletContext();
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ protected void performTask(HttpServletRequest request, HttpServletResponse response){
+ try {
+ bundleContext = (BundleContext) sc.getAttribute("osgi-bundlecontext");
+ PrintWriter pw = response.getWriter();
+ if (bundleContext != null) {
+ ServiceReference sr = bundleContext.getServiceReference(HelloWorldService.class.getName());
+ if (sr != null) {
+ HelloWorldService sm = (HelloWorldService) bundleContext.getService(sr);
+ sm.hello();
+ pw.println("Call Hello World service Hello");
+ bundleContext.ungetService(sr);
+ }
+ } else {
+ pw.println("Bundle Context is Null");
+ }
+
+ //JNDI Lookup via osgi:service
+ HelloWorldService sm = (HelloWorldService) getOSGIService(HelloWorldService.class.getName(),null);
+ if(sm != null){
+ sm.hello();
+ pw.println("Call Hello World service Hello");
+ }else {
+ pw.println("Service Lookup is Null");
+ }
+
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ /**
+ * Lookup and return an osgi service
+ *
+ * @return Object
+ *
+ */
+ public static final Object getOSGIService(String serviceName, String filter) {
+
+ String name = OSGI_SERVICE_PREFIX + serviceName;
+ if (filter != null) {
+ name = name + "/" + filter;
+ }
+
+ try {
+ InitialContext ic = new InitialContext();
+ return ic.lookup(name);
+ } catch (NamingException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+}
+
+
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/WEB-INF/web.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/WEB-INF/web.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/helloworld-wab/src/main/resources/WEB-INF/web.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>Hello World EBA</display-name>
+
+ <servlet>
+ <display-name>HelloWorldServlet</display-name>
+ <servlet-name>HelloWorldServlet</servlet-name>
+ <servlet-class>org.apache.aries.samples.blueprint.helloworld.wab.HelloWorldServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HelloWorldServlet</servlet-name>
+ <url-pattern>/hello</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Added: geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml?rev=1170418&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml (added)
+++ geronimo/samples/trunk/samples/osgi/helloworld-eba/pom.xml Wed Sep 14 02:29:42 2011
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ 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.
+ -->
+<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>osgi</artifactId>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.geronimo.samples.osgi.helloworld.eba</artifactId>
+ <name>Apache Aries Blueprint HelloWorld</name>
+ <packaging>pom</packaging>
+ <description>Example blueprint hello world application</description>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.wab</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>helloworld-api</module>
+ <module>helloworld-server</module>
+ <module>helloworld-client</module>
+ <module>helloworld-wab</module>
+ <module>helloworld-assembly</module>
+ </modules>
+
+</project>
Modified: geronimo/samples/trunk/samples/osgi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/osgi/pom.xml?rev=1170418&r1=1170417&r2=1170418&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/osgi/pom.xml (original)
+++ geronimo/samples/trunk/samples/osgi/pom.xml Wed Sep 14 02:29:42 2011
@@ -31,7 +31,7 @@
</description>
<properties>
- <ariesVersion>0.1-incubating</ariesVersion>
+ <ariesVersion>0.3</ariesVersion>
</properties>
@@ -108,6 +108,7 @@
<module>aries-datasource</module>
<module>showmethemoney</module>
<module>wab-sample</module>
+ <module>helloworld-eba</module>
<!--<module>ariestrader-jdbc</module>-->
</modules>
</profile>