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:25:12 UTC

svn commit: r1142850 - in /incubator/nuvem/trunk/nuvem-google/src/main: java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java resources/META-INF/sca-contribution.xml resources/nuvemxmpp.composite

Author: johnp
Date: Mon Jul  4 23:25:12 2011
New Revision: 1142850

URL: http://svn.apache.org/viewvc?rev=1142850&view=rev
Log:
updated proper namespaces, promoted required nuvem components and exported the namesapce for external use

Modified:
    incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java
    incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml
    incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite

Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java?rev=1142850&r1=1142849&r2=1142850&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java Mon Jul  4 23:25:12 2011
@@ -23,6 +23,8 @@ import java.util.Map;
 import java.util.logging.Logger;
 
 import org.apache.nuvem.cloud.xmpp.XMPPConnector;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 import com.google.appengine.api.xmpp.XMPPService;
 import com.google.appengine.api.xmpp.XMPPServiceFactory;
@@ -31,6 +33,8 @@ import com.google.appengine.api.xmpp.XMP
  * Connects to the google XMPP Server inside the GAE platform.
  * 
  */
+@Service(XMPPConnector.class)
+@Scope("COMPOSITE")
 public class GoogleXMPPConnector implements XMPPConnector<XMPPService> {
 
 	/**

Modified: incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml?rev=1142850&r1=1142849&r2=1142850&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/resources/META-INF/sca-contribution.xml Mon Jul  4 23:25:12 2011
@@ -19,9 +19,11 @@
 -->
 <contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" 
-	xmlns:google="http://nuvemgoogle">
-	<export namespace="http://nuvemgoogle" />
-	<export.java package="org.apache.nuvem.cloud.xmpp.client" />
+	xmlns:nuvem="http://apache.org/nuvem">
+	
+	<deployable composite="nuvem:xmppgoogle" />
+	<export namespace="http://apache.org/nuvem" />
+<!-- 	<export.java package="org.apache.nuvem.cloud.xmpp.impl" /> -->
+	
 	
-	<deployable composite="google:xmpp" />
 </contribution>
\ No newline at end of file

Modified: incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite?rev=1142850&r1=1142849&r2=1142850&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/resources/nuvemxmpp.composite Mon Jul  4 23:25:12 2011
@@ -13,11 +13,14 @@
 		License for the * specific language governing permissions and
 		limitations * under the License.
 	-->
+	    
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://nuvemgoogle" name="xmpp">
-
+	targetNamespace="http://apache.org/nuvem" name="xmppgoogle">
 
+    <service name="XMPPEndPoint" promote="XMPPComponent/XMPPEndPoint" />
+    
+    
 	<component name="XMPPComponent">
 		<implementation.java
 			class="org.apache.nuvem.cloud.xmpp.impl.GoogleXMPPEndPoint" />