You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by jo...@apache.org on 2011/07/04 23:28:35 UTC
svn commit: r1142851 - in
/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war:
META-INF/sca-contribution.xml WEB-INF/web.xml nodeConfig.xml store.composite
Author: johnp
Date: Mon Jul 4 23:28:35 2011
New Revision: 1142851
URL: http://svn.apache.org/viewvc?rev=1142851&view=rev
Log:
refactored store.composite to use <implementation.composite> to make use of nuvem service
Added:
incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/nodeConfig.xml (with props)
Modified:
incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/META-INF/sca-contribution.xml
incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml
incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite
Modified: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/META-INF/sca-contribution.xml?rev=1142851&r1=1142850&r2=1142851&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/META-INF/sca-contribution.xml (original)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/META-INF/sca-contribution.xml Mon Jul 4 23:28:35 2011
@@ -10,7 +10,7 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
+ * Unless required by applicable law or agreed to in writing,y
* 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
@@ -19,8 +19,13 @@
-->
<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:store="http://store">
+ xmlns:store="http://store"
+ xmlns:nuvem="http://apache.org/nuvem">
+
+<!-- <deployable composite="nuvem:xmppgoogle" /> -->
<deployable composite="store:store" />
- <!-- import.java package="services" / -->
+ <import namespace="http://apache.org/nuvem"/>
+
+<!-- <import.java package="org.apache.nuvem.cloud.xmpp.impl" /> -->
</contribution>
\ No newline at end of file
Modified: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml?rev=1142851&r1=1142850&r2=1142851&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml (original)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/WEB-INF/web.xml Mon Jul 4 23:28:35 2011
@@ -17,6 +17,11 @@
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
+ <context-param>
+ <param-name>node.configuration</param-name>
+ <param-value>nodeConfig.xml</param-value>
+ </context-param>
+
<!-- Tuscany Filter -->
<filter>
<filter-name>tuscany</filter-name>
Added: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/nodeConfig.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/nodeConfig.xml?rev=1142851&view=auto
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/nodeConfig.xml (added)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/nodeConfig.xml Mon Jul 4 23:28:35 2011
@@ -0,0 +1,23 @@
+<?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. -->
+<node xmlns="http://tuscany.apache.org/xmlns/sca/1.1" domain="default">
+
+ <contribution location="." metaDataURL="META-INF/sca-contribution.xml"
+ uri="META-INF/sca-contribution.xml" startDeployables="true" />
+
+ <contribution location="WEB-INF/lib/nuvem-google-1.0-incubating-SNAPSHOT.jar"
+ metaDataURL="META-INF/sca-contribution.xml" uri="WEB-INF/lib/nuvem-google-1.0-incubating-SNAPSHOT.jar" startDeployables="true"/>
+
+
+
+</node>
\ No newline at end of file
Propchange: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/nodeConfig.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite?rev=1142851&r1=1142850&r2=1142851&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite (original)
+++ incubator/nuvem/trunk/nuvem-samples/store-appengine-webapp/war/store.composite Mon Jul 4 23:28:35 2011
@@ -15,6 +15,7 @@
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:nuvem="http://apache.org/nuvem"
xmlns:s="http://store" targetNamespace="http://store" name="store">
<component name="Catalog">
@@ -64,34 +65,17 @@
</service>
</component>
- <component name="XMPPComponent">
- <implementation.java
- class="org.apache.nuvem.cloud.xmpp.impl.GoogleXMPPEndPoint" />
- <service name="XMPPEndPoint">
- <interface.java interface="org.apache.nuvem.cloud.xmpp.XMPPEndPoint" />
- </service>
- <reference name="presenceManager" target="PresenceComponent/PresenceManager">
- <interface.java
- interface="org.apache.nuvem.cloud.xmpp.presence.PresenceManager" />
- </reference>
- </component>
-
- <component name="PresenceComponent">
- <implementation.java
- class="org.apache.nuvem.cloud.xmpp.impl.GooglePresenceManager" />
- <service name="PresenceManager">
- <interface.java
- interface="org.apache.nuvem.cloud.xmpp.presence.PresenceManager" />
- </service>
- </component>
-
<component name="ShipmentObserver">
<implementation.java class="services.XMPPShipmentObserver" />
- <reference name="endpoint" target="XMPPComponent/XMPPEndPoint">
+ <reference name="endpoint" target="XMPP/XMPPEndPoint">
<interface.java interface="org.apache.nuvem.cloud.xmpp.XMPPEndPoint" />
</reference>
</component>
+ <component name="XMPP">
+ <implementation.composite name="nuvem:xmppgoogle" />
+ </component>
+
<component name="ShipmentService">
<implementation.java class="services.ShipmentServiceImpl" />
<reference name="observer" target="ShipmentObserver" />