You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2007/09/05 10:36:04 UTC
svn commit: r572898 - in /labs/vysper/src:
main/java/org/apache/vysper/xmpp/applicationdomains/base/
main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/
main/java/org/apache/vysper/xmpp/server/response/
main/java/org/apache/vysper/xmpp/st...
Author: berndf
Date: Wed Sep 5 01:36:01 2007
New Revision: 572898
URL: http://svn.apache.org/viewvc?rev=572898&view=rev
Log:
[vysper] move common enums to stanza package, remove unused, smaller refactorings
Added:
labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java
- copied, changed from r542950, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorCondition.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorType.java
- copied, changed from r542950, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorType.java
Removed:
labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/CommonAttribute.java
Modified:
labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/IQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/MessageHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/IQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/IQHandler.java?rev=572898&r1=572897&r2=572898&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/IQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/IQHandler.java Wed Sep 5 01:36:01 2007
@@ -17,8 +17,8 @@
package org.apache.vysper.xmpp.applicationdomains.base.handler;
-import org.apache.vysper.xmpp.applicationdomains.base.StanzaErrorCondition;
-import org.apache.vysper.xmpp.applicationdomains.base.StanzaErrorType;
+import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
+import org.apache.vysper.xmpp.stanza.StanzaErrorType;
import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.server.response.ServerErrorResponses;
import org.apache.vysper.xmpp.stanza.IQStanza;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/MessageHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/MessageHandler.java?rev=572898&r1=572897&r2=572898&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/MessageHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/MessageHandler.java Wed Sep 5 01:36:01 2007
@@ -18,7 +18,6 @@
package org.apache.vysper.xmpp.applicationdomains.base.handler;
import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.delivery.DeliveryException;
import org.apache.vysper.xmpp.delivery.StanzaRelay;
import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.stanza.MessageStanza;
@@ -46,7 +45,7 @@
}
try {
stanzaRelay.relay(to, stanza);
- } catch (DeliveryException e) {
+ } catch (Exception e) {
// TODO return error stanza
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=572898&r1=572897&r2=572898&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java Wed Sep 5 01:36:01 2007
@@ -17,8 +17,8 @@
package org.apache.vysper.xmpp.server.response;
-import org.apache.vysper.xmpp.applicationdomains.base.StanzaErrorCondition;
-import org.apache.vysper.xmpp.applicationdomains.base.StanzaErrorType;
+import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
+import org.apache.vysper.xmpp.stanza.StanzaErrorType;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.StreamErrorCondition;
import org.apache.vysper.xmpp.stanza.Stanza;
Copied: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java (from r542950, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorCondition.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java?p2=labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java&p1=labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorCondition.java&r1=542950&r2=572898&rev=572898&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorCondition.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java Wed Sep 5 01:36:01 2007
@@ -15,7 +15,7 @@
* permissions and limitations under the License. *
***********************************************************************/
-package org.apache.vysper.xmpp.applicationdomains.base;
+package org.apache.vysper.xmpp.stanza;
/**
* inner error for stanzas of type iq, message, presence
Copied: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorType.java (from r542950, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorType.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorType.java?p2=labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorType.java&p1=labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorType.java&r1=542950&r2=572898&rev=572898&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/StanzaErrorType.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorType.java Wed Sep 5 01:36:01 2007
@@ -15,7 +15,7 @@
* permissions and limitations under the License. *
***********************************************************************/
-package org.apache.vysper.xmpp.applicationdomains.base;
+package org.apache.vysper.xmpp.stanza;
/**
*/
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java?rev=572898&r1=572897&r2=572898&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java Wed Sep 5 01:36:01 2007
@@ -26,7 +26,7 @@
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
import org.apache.vysper.xmpp.applicationdomains.base.handler.BaseStreamStanzaDictionary;
-import org.apache.vysper.xmpp.applicationdomains.base.StanzaErrorCondition;
+import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org