summaryrefslogtreecommitdiffstats
path: root/sandbox/kgoodson/jagg-webapp/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'sandbox/kgoodson/jagg-webapp/src/main')
-rw-r--r--sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite9
-rw-r--r--sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml6
-rw-r--r--sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html (renamed from sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html)0
-rw-r--r--sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml2
4 files changed, 9 insertions, 8 deletions
diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
index c6f837c0d2..dbff8c905f 100644
--- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
+++ b/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.composite
@@ -24,16 +24,17 @@
<component name="planApp">
<tuscany:implementation.widget location="plan.html"/>
- <reference name="plan" target="Plan">
- <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-jagg-webapp/Plan"/>
- </reference>
+ <service name="Widget">
+ <tuscany:binding.http uri="/plan"/>
+ </service>
+ <reference name="plan" target="Plan"></reference>
</component>
<component name="Plan">
<implementation.java class="services.PlanViewImpl"/>
<property name="planFile">src/main/resources/jiraSideBand.xml</property>
<service name="PlanView">
- <tuscany:binding.jsonrpc uri="http://localhost:8080/sample-jagg-webapp/Plan"/>
+ <tuscany:binding.jsonrpc uri="/Plan"/>
</service>
</component>
diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 9d874181fe..8122539244 100644
--- a/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:store="http://plan">
- <deployable composite="plan:plan"/>
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:jagg="http://jagg">
+ <deployable composite="jagg:jagg"/>
</contribution> \ No newline at end of file
diff --git a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html
index f064b47160..f064b47160 100644
--- a/sandbox/kgoodson/jagg-webapp/src/main/resources/plan.html
+++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/plan.html
diff --git a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml
index 9c8eb81ae4..ecf656d929 100644
--- a/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/kgoodson/jagg-webapp/src/main/webapp/WEB-INF/web.xml
@@ -18,7 +18,7 @@
* under the License.
-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
- <display-name>sample-jagg-secure-webapp</display-name>
+ <display-name>sample-jagg-webapp</display-name>
<filter>
<filter-name>tuscany</filter-name>