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/05/07 23:03:15 UTC

svn commit: r1100650 - in /incubator/nuvem/trunk/nuvem-api: ./ src/main/java/org/apache/nuvem/cloud/xmpp/ src/main/java/org/apache/nuvem/cloud/xmpp/api/ src/main/java/org/apache/nuvem/cloud/xmpp/common/ src/main/java/org/apache/nuvem/cloud/xmpp/message...

Author: johnp
Date: Sat May  7 23:03:14 2011
New Revision: 1100650

URL: http://svn.apache.org/viewvc?rev=1100650&view=rev
Log:
module restructuring + few folder structure changes to keep it consistent with all other modules

Added:
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractPresenceManager.java
      - copied, changed from r1098845, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractPresenceManager.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractXMPPEndPoint.java
      - copied, changed from r1098845, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractXMPPEndPoint.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Error.java
      - copied, changed from r1070056, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Error.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/ErrorCode.java
      - copied, changed from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/ErrorCode.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Event.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/JID.java
      - copied, changed from r1086391, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/JID.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Status.java
      - copied, changed from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Status.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnectException.java
      - copied, changed from r1086391, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnectException.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnector.java
      - copied, changed from r1092551, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnector.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPoint.java
      - copied, changed from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPEndPoint.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPException.java
      - copied, changed from r1037386, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPException.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPServer.java
      - copied, changed from r1086391, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPServer.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/
      - copied from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/message/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/LoggingMessageListener.java
      - copied, changed from r1098845, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/LoggingMessageListener.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/
      - copied from r1098841, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/presence/
Removed:
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/
Modified:
    incubator/nuvem/trunk/nuvem-api/pom.xml
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPointFactory.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/ContentType.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/Message.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageBuilder.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageListener.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/PayLoad.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/Presence.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceAttributes.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceBuilder.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceListener.java
    incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceManager.java

Modified: incubator/nuvem/trunk/nuvem-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/pom.xml?rev=1100650&r1=1100649&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-api/pom.xml Sat May  7 23:03:14 2011
@@ -27,7 +27,7 @@
         <version>1.0-incubating-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>nuvem-cloud-api</artifactId>
+    <artifactId>nuvem-api</artifactId>
     <version>1.0-incubating-SNAPSHOT</version>
     <name>Apache Nuvem Cloud API</name>
 

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractPresenceManager.java (from r1098845, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractPresenceManager.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractPresenceManager.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractPresenceManager.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractPresenceManager.java&r1=1098845&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractPresenceManager.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractPresenceManager.java Sat May  7 23:03:14 2011
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.common;
+package org.apache.nuvem.cloud.xmpp;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceListener;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceManager;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceListener;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceManager;
 
 /**
  * Holds common code between various cloud platform to avoid duplication.

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractXMPPEndPoint.java (from r1098845, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractXMPPEndPoint.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractXMPPEndPoint.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractXMPPEndPoint.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractXMPPEndPoint.java&r1=1098845&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/AbstractXMPPEndPoint.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/AbstractXMPPEndPoint.java Sat May  7 23:03:14 2011
@@ -18,16 +18,14 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.common;
+package org.apache.nuvem.cloud.xmpp;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.nuvem.cloud.xmpp.api.JID;
-import org.apache.nuvem.cloud.xmpp.api.Status;
-import org.apache.nuvem.cloud.xmpp.api.message.Message;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageBuilder;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageListener;
+import org.apache.nuvem.cloud.xmpp.message.Message;
+import org.apache.nuvem.cloud.xmpp.message.MessageBuilder;
+import org.apache.nuvem.cloud.xmpp.message.MessageListener;
 
 /**
  * Encloses the common code for various types of end points irrespective of the
@@ -79,7 +77,7 @@ public abstract class AbstractXMPPEndPoi
 	}
 
 	public abstract Status sendMessage(
-			org.apache.nuvem.cloud.xmpp.api.message.Message message);
+			org.apache.nuvem.cloud.xmpp.message.Message message);
 
 	/**
 	 * 

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Error.java (from r1070056, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Error.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Error.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Error.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Error.java&r1=1070056&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Error.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Error.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 import java.io.Serializable;
 

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/ErrorCode.java (from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/ErrorCode.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/ErrorCode.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/ErrorCode.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/ErrorCode.java&r1=1098843&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/ErrorCode.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/ErrorCode.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 /**
  * XMPP error codes.

Added: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Event.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Event.java?rev=1100650&view=auto
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Event.java (added)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Event.java Sat May  7 23:03:14 2011
@@ -0,0 +1,45 @@
+/*
+ * 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.nuvem.cloud.xmpp;
+
+/**
+ * Represents an event generated by the XMPP Server which is propagated to all
+ * subscribed XMPP Clients.
+ * 
+ */
+public interface Event<T> {
+
+	T data();
+
+	Type type();
+
+	/**
+	 * The type of the event.
+	 * 
+	 */
+	public enum Type {
+
+		/** Represents just an event with no payload. */
+		PLAIN_EVENT,
+		/** Represents an event with payload. */
+		WITH_PAYLOAD;
+	}
+}

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/JID.java (from r1086391, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/JID.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/JID.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/JID.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/JID.java&r1=1086391&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/JID.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/JID.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 import java.io.Serializable;
 import java.util.regex.Pattern;

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Status.java (from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Status.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Status.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Status.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Status.java&r1=1098843&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/Status.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/Status.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnectException.java (from r1086391, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnectException.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnectException.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnectException.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnectException.java&r1=1086391&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnectException.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnectException.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 /**
  * Signals an error during an attempt to connect to an XMPP Server.

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnector.java (from r1092551, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnector.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnector.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnector.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnector.java&r1=1092551&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPConnector.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPConnector.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 import java.util.Map;
 

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPoint.java (from r1098843, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPEndPoint.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPoint.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPoint.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPEndPoint.java&r1=1098843&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPEndPoint.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPoint.java Sat May  7 23:03:14 2011
@@ -18,12 +18,12 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
-import org.apache.nuvem.cloud.xmpp.api.message.Message;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageBuilder;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageListener;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceManager;
+import org.apache.nuvem.cloud.xmpp.message.Message;
+import org.apache.nuvem.cloud.xmpp.message.MessageBuilder;
+import org.apache.nuvem.cloud.xmpp.message.MessageListener;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceManager;
 
 /**
  * Represents An EndPoint for client to send and receive XMPP messages.
@@ -66,7 +66,7 @@ public interface XMPPEndPoint {
 	 *         message.
 	 * @throws XMPPConnectException
 	 *             if an error occurs when trying to connect to the XMPP Server.
-	 * @see org.apache.nuvem.cloud.xmpp.api.message.Message
+	 * @see org.apache.nuvem.cloud.xmpp.message.Message
 	 */
 	Status sendMessage(Message message);
 
@@ -132,7 +132,7 @@ public interface XMPPEndPoint {
 	 * @param id
 	 *            the JID in string format
 	 * @return true if the JID is present, false otherwise.
-	 * @see org.apache.nuvem.cloud.xmpp.api.JID
+	 * @see org.apache.nuvem.cloud.xmpp.JID
 	 */
 	boolean isPresent(String id);
 

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPointFactory.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPointFactory.java?rev=1100650&r1=1100649&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPointFactory.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPEndPointFactory.java Sat May  7 23:03:14 2011
@@ -19,7 +19,6 @@
 
 package org.apache.nuvem.cloud.xmpp;
 
-import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
 
 public final class XMPPEndPointFactory {
 

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPException.java (from r1037386, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPException.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPException.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPException.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPException.java&r1=1037386&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPException.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPException.java Sat May  7 23:03:14 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 /**
  * Thrown when unknown exception occurs at the layer beneath nuvem.

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPServer.java (from r1086391, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPServer.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPServer.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPServer.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPServer.java&r1=1086391&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/api/XMPPServer.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/XMPPServer.java Sat May  7 23:03:14 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api;
+package org.apache.nuvem.cloud.xmpp;
 
 /**
  * Entry point for interacting with the XMPP Server implementation. Each cloud

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/ContentType.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/ContentType.java?rev=1100650&r1=1098843&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/ContentType.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/ContentType.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.message;
+package org.apache.nuvem.cloud.xmpp.message;
 
 /**
  * Used to label the type of content present in the payload of a message.

Copied: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/LoggingMessageListener.java (from r1098845, incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/LoggingMessageListener.java)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/LoggingMessageListener.java?p2=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/LoggingMessageListener.java&p1=incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/LoggingMessageListener.java&r1=1098845&r2=1100650&rev=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/common/LoggingMessageListener.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/LoggingMessageListener.java Sat May  7 23:03:14 2011
@@ -17,13 +17,11 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.common;
+package org.apache.nuvem.cloud.xmpp.message;
 
 import java.util.logging.Logger;
 
-import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
-import org.apache.nuvem.cloud.xmpp.api.message.Message;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageListener;
+import org.apache.nuvem.cloud.xmpp.XMPPEndPoint;
 
 /**
  * Default message listener which will log the message information.

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/Message.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/Message.java?rev=1100650&r1=1098843&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/Message.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/Message.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.message;
+package org.apache.nuvem.cloud.xmpp.message;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.nuvem.cloud.xmpp.api.JID;
+import org.apache.nuvem.cloud.xmpp.JID;
 
 /**
  * Encapsulates the complete message that needs to be delivered through the XMPP

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageBuilder.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageBuilder.java?rev=1100650&r1=1098843&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageBuilder.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageBuilder.java Sat May  7 23:03:14 2011
@@ -19,13 +19,13 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.message;
+package org.apache.nuvem.cloud.xmpp.message;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.nuvem.cloud.xmpp.api.JID;
+import org.apache.nuvem.cloud.xmpp.JID;
 
 /**
  * Used to build the message.

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageListener.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageListener.java?rev=1100650&r1=1098843&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageListener.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/MessageListener.java Sat May  7 23:03:14 2011
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.message;
+package org.apache.nuvem.cloud.xmpp.message;
 
-import org.apache.nuvem.cloud.xmpp.api.JID;
-import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
-import org.apache.nuvem.cloud.xmpp.common.LoggingMessageListener;
+import org.apache.nuvem.cloud.xmpp.JID;
+import org.apache.nuvem.cloud.xmpp.XMPPEndPoint;
 
 /**
  * Listens to XMPP messages of a specific type.

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/PayLoad.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/PayLoad.java?rev=1100650&r1=1098843&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/PayLoad.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/message/PayLoad.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.message;
+package org.apache.nuvem.cloud.xmpp.message;
 
 import java.util.Locale;
 

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/Presence.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/Presence.java?rev=1100650&r1=1098841&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/Presence.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/Presence.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.presence;
+package org.apache.nuvem.cloud.xmpp.presence;
 
 /**
  * Represents the presence XMPP stanza, it could be one of the below type of

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceAttributes.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceAttributes.java?rev=1100650&r1=1098841&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceAttributes.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceAttributes.java Sat May  7 23:03:14 2011
@@ -18,9 +18,9 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.presence;
+package org.apache.nuvem.cloud.xmpp.presence;
 
-import org.apache.nuvem.cloud.xmpp.api.JID;
+import org.apache.nuvem.cloud.xmpp.JID;
 
 /**
  * Serves as a super class to hold all the attributes related to the presence

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceBuilder.java?rev=1100650&r1=1098841&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceBuilder.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceBuilder.java Sat May  7 23:03:14 2011
@@ -18,9 +18,9 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.presence;
+package org.apache.nuvem.cloud.xmpp.presence;
 
-import org.apache.nuvem.cloud.xmpp.api.JID;
+import org.apache.nuvem.cloud.xmpp.JID;
 
 /**
  * Builds the presence object.

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceListener.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceListener.java?rev=1100650&r1=1098841&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceListener.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceListener.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.presence;
+package org.apache.nuvem.cloud.xmpp.presence;
 
 public interface PresenceListener {
 	

Modified: incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceManager.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceManager.java?rev=1100650&r1=1098841&r2=1100650&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceManager.java (original)
+++ incubator/nuvem/trunk/nuvem-api/src/main/java/org/apache/nuvem/cloud/xmpp/presence/PresenceManager.java Sat May  7 23:03:14 2011
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-package org.apache.nuvem.cloud.xmpp.api.presence;
+package org.apache.nuvem.cloud.xmpp.presence;
 
 import java.util.List;