From 71ceffdd951fbcb317227d85a8bf3d9e449b5a35 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Thu, 16 Apr 2009 21:47:17 +0000
Subject: [PATCH] move demo bundle to trunk

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@765777 13f79535-47bb-0310-9956-ffa450edef68
---
 bundles/demo/pom.xml                          | 84 +++++++++++++++++++
 .../main/java/actions/osgi/BundlesAction.java | 57 +++++++++++++
 .../java/actions/osgi/HelloWorldAction.java   | 40 +++++++++
 .../src/main/java/actions/osgi/Message.java   | 37 ++++++++
 .../META-INF/spring/applicationContext.xml    | 16 ++++
 .../main/resources/content/osgi/bundles.ftl   | 18 ++++
 .../content/osgi/hello-convention.ftl         | 10 +++
 .../src/main/resources/content/osgi/hello.ftl | 10 +++
 .../src/main/resources/content/osgi/hello.vm  | 10 +++
 .../src/main/resources/content/osgi/home.ftl  | 14 ++++
 bundles/demo/src/main/resources/struts.xml    | 20 +++++
 11 files changed, 316 insertions(+)
 create mode 100644 bundles/demo/pom.xml
 create mode 100644 bundles/demo/src/main/java/actions/osgi/BundlesAction.java
 create mode 100644 bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java
 create mode 100644 bundles/demo/src/main/java/actions/osgi/Message.java
 create mode 100644 bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml
 create mode 100644 bundles/demo/src/main/resources/content/osgi/bundles.ftl
 create mode 100644 bundles/demo/src/main/resources/content/osgi/hello-convention.ftl
 create mode 100644 bundles/demo/src/main/resources/content/osgi/hello.ftl
 create mode 100644 bundles/demo/src/main/resources/content/osgi/hello.vm
 create mode 100644 bundles/demo/src/main/resources/content/osgi/home.ftl
 create mode 100644 bundles/demo/src/main/resources/struts.xml

diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
new file mode 100644
index 000000000..1afa730a8
--- /dev/null
+++ b/bundles/demo/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <groupId>org.apache.struts.osgi</groupId>
+    <artifactId>struts2-demo-bundle</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Struts 2 OSGi Demo Bundle</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-core</artifactId>
+            <version>2.1.7-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <version>1.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-convention-plugin</artifactId>
+            <version>2.1.7-SNAPSHOT</version>
+        </dependency>
+
+         <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-osgi-plugin</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>2.1.7-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <version>2.0.0</version>
+                <configuration>
+                    <instructions>
+                        <manifestLocation>META-INF</manifestLocation>
+                        <Import-Package>*,com.opensymphony.xwork2</Import-Package>
+                        <Spring-Context>*;create-asynchronously:=false</Spring-Context>
+                        <Struts2-Enabled>true</Struts2-Enabled>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
diff --git a/bundles/demo/src/main/java/actions/osgi/BundlesAction.java b/bundles/demo/src/main/java/actions/osgi/BundlesAction.java
new file mode 100644
index 000000000..74feff244
--- /dev/null
+++ b/bundles/demo/src/main/java/actions/osgi/BundlesAction.java
@@ -0,0 +1,57 @@
+/*
+ * $Id$
+ *
+ * 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 actions.osgi;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Bundle;
+import org.apache.struts2.osgi.interceptor.BundleContextAware;
+import org.apache.struts2.osgi.interceptor.ServiceAware;
+import org.apache.struts2.convention.annotation.ResultPath;
+import org.springframework.context.ApplicationContext;
+
+import java.util.List;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * This action shows how to interact with the OSGi container, using the OSGi interceptor
+ */
+@ResultPath("/content")
+public class BundlesAction extends ActionSupport implements BundleContextAware, ServiceAware<ApplicationContext> {
+    private BundleContext bundleContext;
+    private List<ApplicationContext> services;
+
+    public void setServices(List<ApplicationContext> services) {
+        this.services = services;
+    }
+
+    public void setBundleContext(BundleContext bundleContext) {
+        this.bundleContext = bundleContext;
+    }
+
+    public int getApplicationContextsCount() {
+        return services.size();
+    }
+
+    public Bundle[] getBundles() {
+        return bundleContext.getBundles();
+    }
+}
diff --git a/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java b/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java
new file mode 100644
index 000000000..b27ab0f9a
--- /dev/null
+++ b/bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java
@@ -0,0 +1,40 @@
+package actions.osgi;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.ResultPath;
+import org.apache.struts2.osgi.interceptor.BundleContextAware;
+import org.apache.struts2.osgi.interceptor.ServiceAware;
+import org.osgi.framework.BundleContext;
+import org.springframework.context.ApplicationContext;
+
+import java.util.List;
+
+@ResultPath("/content")
+public class HelloWorldAction extends ActionSupport {
+    private Message message;
+
+    @Action("hello-convention")
+    public String execute() {
+        return SUCCESS;
+    }
+
+    public Message getMessage() {
+        return message;
+    }
+
+    public void setMessage(Message message) {
+        this.message = message;
+    }
+
+    public String getSimpleMessage() {
+        return "Hello!!!";
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder("{message:");
+        sb.append(message != null ? message.getText() : "null");
+        sb.append("}");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/bundles/demo/src/main/java/actions/osgi/Message.java b/bundles/demo/src/main/java/actions/osgi/Message.java
new file mode 100644
index 000000000..eb31f2948
--- /dev/null
+++ b/bundles/demo/src/main/java/actions/osgi/Message.java
@@ -0,0 +1,37 @@
+/*
+ * $Id$
+ *
+ * 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 actions.osgi;
+
+public class Message {
+    private String text;
+
+    public Message(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
diff --git a/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml b/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml
new file mode 100644
index 000000000..bc3cc3145
--- /dev/null
+++ b/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+    <bean class="actions.osgi.Message" id="message">
+        <constructor-arg type="java.lang.String" value="Welcome to the OSGi plugin. You can checkout any time you like, but can never leave"/>
+    </bean>
+    
+    <bean class="actions.osgi.HelloWorldAction" id="helloWorldAction" scope="prototype">
+        <property name="message" ref="message" />
+    </bean>
+</beans>
+
diff --git a/bundles/demo/src/main/resources/content/osgi/bundles.ftl b/bundles/demo/src/main/resources/content/osgi/bundles.ftl
new file mode 100644
index 000000000..e9decadf0
--- /dev/null
+++ b/bundles/demo/src/main/resources/content/osgi/bundles.ftl
@@ -0,0 +1,18 @@
+<html>
+    <head>
+        <title>OSGi integration</title>
+    </head>
+    <body>
+        This action was mapped by <b>Convention</b>, and shows how to get access to the <b>BundleContext</b>
+        and registered services
+        <br />
+        Spring Application Contexts: ${applicationContextsCount!}
+        <br>
+        Bundles List:
+        <ul>
+            <#list bundles as bundle>
+                <li>${bundle.symbolicName!}</li>
+            </#list>
+        </ul>
+    </body>
+</html>
\ No newline at end of file
diff --git a/bundles/demo/src/main/resources/content/osgi/hello-convention.ftl b/bundles/demo/src/main/resources/content/osgi/hello-convention.ftl
new file mode 100644
index 000000000..e47d160ce
--- /dev/null
+++ b/bundles/demo/src/main/resources/content/osgi/hello-convention.ftl
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>Action mapped by the Convention plugin</title>
+    </head>
+    <body>
+        This is an action mapped by the Convention plugin, using a FreeMarker result.
+        <br />
+        Message from Action: ${simpleMessage} 
+    </body>
+</html>
\ No newline at end of file
diff --git a/bundles/demo/src/main/resources/content/osgi/hello.ftl b/bundles/demo/src/main/resources/content/osgi/hello.ftl
new file mode 100644
index 000000000..fec234335
--- /dev/null
+++ b/bundles/demo/src/main/resources/content/osgi/hello.ftl
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>Action mapped by the XML configurationn</title>
+    </head>
+    <body>
+        This is an action mapped by XML configuration, using a <b>FreeMarker</b> result.
+        <br />
+        Message from Action: ${message.text}
+    </body>
+</html>
\ No newline at end of file
diff --git a/bundles/demo/src/main/resources/content/osgi/hello.vm b/bundles/demo/src/main/resources/content/osgi/hello.vm
new file mode 100644
index 000000000..40c1ff029
--- /dev/null
+++ b/bundles/demo/src/main/resources/content/osgi/hello.vm
@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <title>Action mapped by the XML configurationn</title>
+    </head>
+    <body>
+        This is an action mapped by XML configuration, using a <b>Velocity</b> result.
+        <br />
+        Message from Action: $message.text
+    </body>
+</html>
\ No newline at end of file
diff --git a/bundles/demo/src/main/resources/content/osgi/home.ftl b/bundles/demo/src/main/resources/content/osgi/home.ftl
new file mode 100644
index 000000000..089c89e85
--- /dev/null
+++ b/bundles/demo/src/main/resources/content/osgi/home.ftl
@@ -0,0 +1,14 @@
+<html>
+    <head>
+        <title>OSGi Demo Bundle</title>
+    </head>
+    <body>
+        This demo contains actions that will be packaged into an OSGi bundle and loaded by the Struts 2 OSGi plugin.
+        <br />
+        <ul>
+            <li><@s.a namespace="/osgi" action="hello-convention">Action mapped by the Convention plugin, with FreeMarker result</@s.a></li>
+            <li><@s.a namespace="/osgi" action="hello-freemarker">Action mapped by XML, with FreeMarker result</@s.a></li>
+            <li><@s.a namespace="/osgi" action="hello-velocity">Action mapped by XML, with Velocity result</@s.a></li>
+        </ul>
+    </body>
+</html>
\ No newline at end of file
diff --git a/bundles/demo/src/main/resources/struts.xml b/bundles/demo/src/main/resources/struts.xml
new file mode 100644
index 000000000..3f72ce861
--- /dev/null
+++ b/bundles/demo/src/main/resources/struts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+    <package name="bundle-demo" namespace="/osgi" extends="osgi-default">
+        <default-action-ref name="home" />
+        <action name="hello-velocity" class="helloWorldAction">
+            <result type="velocity">/content/osgi/hello.vm</result>
+        </action>
+        <action name="hello-freemarker" class="helloWorldAction">
+            <result type="freemarker">/content/osgi/hello.ftl</result>
+        </action>
+
+        <action name="home">
+            <result type="freemarker">/content/osgi/home.ftl</result>
+        </action>
+    </package>
+</struts>
\ No newline at end of file