You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ap...@apache.org on 2009/04/21 12:42:00 UTC
svn commit: r767109 [1/8] - in
/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp: addressing/
authorization/ cryptography/ delivery/ delivery/failure/ modules/
modules/core/base/ modules/core/base/handler/
modules/core/base/handler/async/ modul...
Author: apaliwal
Date: Tue Apr 21 10:41:56 2009
New Revision: 767109
URL: http://svn.apache.org/viewvc?rev=767109&view=rev
Log:
JIRA Issue: DIRMINA-695
Updated Header and added Date and Rev as per MINA header. Updated xmpp package
Submitted By: Ashish Paliwal (apaliwal.at.apache.org)
Modified:
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/Entity.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityFormatException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreation.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreationException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountVerification.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/External.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Plain.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SASLMechanism.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/UserAuthorization.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/AbstractTLSContextFactory.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/FileBasedTLSContextFactory.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TLSContextFactory.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TrustManagerFactory.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveringInboundStanzaRelay.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveryException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveryFailureStrategy.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/LocalDeliveryUtils.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/LocalRecipientOfflineException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/NoSuchLocalUserException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiver.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverQueue.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverRelay.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelay.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/IgnoreFailureStrategy.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/DefaultDiscoAwareModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/DefaultModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/Module.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/ModuleRegistry.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/ServerRuntimeContextService.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/BaseStreamStanzaDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/DefaultIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMLPrologHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/XMPPCoreStanzaHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/AbstractAsyncIQGetHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/ResponseFuture.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/async/RunnableFuture.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/BindResourceDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/JabberIQAuthDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/AbstractPresenceSpecializedHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailabilityHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubscriptionHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/AuthorizationRetriesCounter.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/SASLFailureType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/SASLStanzaDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbstractSASLHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/SessionStanzaDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/StartTLSStanzaDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempPersistenceManager.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeXEP0090IQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/AskSubscriptionType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/MutableRoster.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/Roster.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterBadRequestException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterConfiguration.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterGroup.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterItem.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterNotAcceptableException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterStanzaUtils.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterSubscriptionMutator.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/SubscriptionType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/persistence/AbstractRosterManager.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/persistence/MemoryRosterManager.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/persistence/RosterManager.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/ServiceDiscoveryInfoDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/ServiceDiscoveryItemDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/ServiceDiscoveryModule.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/collection/ServiceCollector.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/collection/ServiceDiscoveryRequestListenerRegistry.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoElement.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequest.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequestListener.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Item.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/ItemRequestListener.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/ServerInfoRequestListener.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/ServiceDiscoveryRequestException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/EncryptionAware.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/InputStreamParser.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/ParsingErrorCondition.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/ParsingException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/StreamParser.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/parser/io/PlainToTLSStreaming.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/HandlerDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/NamespaceHandlerDictionary.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/NamespaceURIs.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/QueuedStanzaProcessor.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainer.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ResponseStanzaContainerImpl.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ResponseWriter.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/ServiceUnavailableStanzaErrorHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateHolder.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/SessionStateModifier.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandler.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaProcessor.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StateAwareProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StreamErrorCondition.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/exception/AuthorizationFailedException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/exception/BadXMLException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/exception/TLSException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AbstractStateAwareProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AuthenticatedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptionStartedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EndOrClosedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InboundStanzaProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InitiatedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/StartedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/UnconnectedProtocolWorker.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/AbstractSessionContext.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/Endpoint.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/ServerFeatures.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/ServerMain.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/ServerRuntimeContext.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionContext.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/SessionState.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPVersion.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanza.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanzaType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/MessageStanza.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/MessageStanzaType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanza.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanzaType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorCondition.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaErrorType.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanzaVerifier.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/BindException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceRegistry.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceState.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/uuid/JVMBuiltinUUIDGenerator.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/uuid/UUIDGenerator.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/writer/StanzaWriter.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/writer/SystemOutStanzaWriter.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/DecodingException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/ParticleDecoder.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/UnsupportedXMLException.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLParticle.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Attribute.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/EqualityVerifier.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/NamespaceAttribute.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/Renderer.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementVerifier.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLFragment.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLSemanticError.java
mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLText.java
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/Entity.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/Entity.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/Entity.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/Entity.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.addressing;
@@ -38,6 +41,9 @@
* node@domain/resource - a FULL JID - client id after resource binding, a CONNECTED RESOURCE<br/>
*
*
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
+ *
*/
// TODO add unit tests for all implementors
public interface Entity {
@@ -55,9 +61,9 @@
* @return string like "node@domain"
*/
Entity getBareJID();
-
+
String getCanonicalizedName();
-
+
boolean isNodeSet();
boolean isResourceSet();
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityConformance.java Tue Apr 21 10:41:56 2009
@@ -1,25 +1,31 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.addressing;
import org.apache.vysper.compliance.SpecCompliant;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
@SpecCompliant(spec="RFC3920", section="3.1")
public class EntityConformance {
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityFormatException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityFormatException.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityFormatException.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityFormatException.java Tue Apr 21 10:41:56 2009
@@ -1,23 +1,29 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.addressing;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class EntityFormatException extends Exception {
public EntityFormatException() {
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.addressing;
@@ -23,6 +26,9 @@
/**
* {@link Entity} implementation. provides consersion helper method {@link #parse(String)} to create Entity from String
* represenation.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class EntityImpl implements Entity {
@@ -32,7 +38,7 @@
private String node;
private String domain;
private String resource;
-
+
protected String fullyQualifiedCached = null;
protected Entity bareEntityCached = null;
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreation.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreation.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreation.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreation.java Tue Apr 21 10:41:56 2009
@@ -1,22 +1,28 @@
-/***********************************************************************
- * Copyright (c) 2006-2008 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public interface AccountCreation {
void addUser(String username, String password) throws AccountCreationException;
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreationException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreationException.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreationException.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountCreationException.java Tue Apr 21 10:41:56 2009
@@ -1,22 +1,28 @@
-/***********************************************************************
- * Copyright (c) 2006-2008 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class AccountCreationException extends Exception {
public AccountCreationException() {
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountVerification.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountVerification.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountVerification.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AccountVerification.java Tue Apr 21 10:41:56 2009
@@ -1,28 +1,34 @@
-/***********************************************************************
- * Copyright (c) 2006-2008 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.addressing.Entity;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public interface AccountVerification {
/**
- * checks if there is this jid is registered with the server
+ * checks if there is this jid is registered with the server
*/
boolean verifyAccountExists(Entity jid);
}
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Anonymous.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -30,6 +33,9 @@
/**
* handles SASL ANONYMOUS mechanism, where no credentials are required
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
@SpecCompliant(spec="rfc4505", status= FINISHED, coverage = COMPLETE)
public class Anonymous implements SASLMechanism {
@@ -42,12 +48,12 @@
public Stanza started(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza authStanza) {
- // assign a self-created node name
+ // assign a self-created node name
EntityImpl initiatingEntity = new EntityImpl(uuidGenerator.create(), sessionContext.getServerJID().getDomain(), null);
sessionContext.setInitiatingEntity(initiatingEntity);
-
+
sessionStateHolder.setState(SessionState.AUTHENTICATED);
- return new AuthorizationResponses().getSuccess();
+ return new AuthorizationResponses().getSuccess();
}
}
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/AuthorizationResponses.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.stanza.Stanza;
@@ -23,15 +26,18 @@
/**
* responses used during SASL authorization
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class AuthorizationResponses {
-
+
public Stanza getSuccess() {
StanzaBuilder stanzaBuilder = new StanzaBuilder("success");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
return stanzaBuilder.getFinalStanza();
}
-
+
public Stanza getFailureNotAuthorized() {
return getFailure(SASLFailureType.NOT_AUTHORIZED);
}
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/External.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/External.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/External.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/External.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.server.SessionContext;
@@ -26,6 +29,9 @@
/**
* handles SASL EXTERNAL mechanism
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
@SpecCompliance( compliant = {
@SpecCompliant(spec="rfc4422", section = "A.", status = NOT_STARTED, coverage = PARTIAL, comment = "only Appendix A. is relevant here"),
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Plain.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Plain.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Plain.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/Plain.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.commons.codec.binary.Base64;
@@ -35,13 +38,16 @@
/**
* handles SASL PLAIN mechanism. this mechanism is standardized in RFC4616
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
@SpecCompliance( compliant = {
@SpecCompliant(spec="rfc4616", status= IN_PROGRESS, coverage = PARTIAL),
@SpecCompliant(spec="rfc3920bis-09", section = "15.6.", status= IN_PROGRESS, coverage = PARTIAL, comment = "PLAIN is mandatory now")
})
public class Plain implements SASLMechanism {
-
+
private static final AuthorizationResponses AUTHORIZATION_RESPONSES = new AuthorizationResponses();
public String getName() {
@@ -49,8 +55,8 @@
}
public Stanza started(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza authStanza) {
- // TODO assure, that connection is secured via TLS. if not, reject SASL PLAIN
-
+ // TODO assure, that connection is secured via TLS. if not, reject SASL PLAIN
+
List<XMLText> innerTexts = authStanza.getInnerTexts();
if (innerTexts == null || innerTexts.isEmpty()) return AUTHORIZATION_RESPONSES.getFailureMalformedRequest();
@@ -63,7 +69,7 @@
return AUTHORIZATION_RESPONSES.getFailure(SASLFailureType.INCORRECT_ENCODING);
}
- // parse clear text, extract parts, which are separated by zeros
+ // parse clear text, extract parts, which are separated by zeros
List<String> decodedParts = new ArrayList<String>();
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < decoded.length; i++) {
@@ -78,9 +84,9 @@
}
if (decodedParts.size() != 3) {
- return AUTHORIZATION_RESPONSES.getFailureMalformedRequest();
+ return AUTHORIZATION_RESPONSES.getFailureMalformedRequest();
}
-
+
String alias = decodedParts.get(0); // "authorization identity (identity to act as)", currently unused
String username = decodedParts.get(1); // "authentication identity (identity whose password will be used)"
String password = decodedParts.get(2);
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SASLMechanism.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SASLMechanism.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SASLMechanism.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SASLMechanism.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
@@ -23,11 +26,14 @@
/**
* describes a SASL mechanism. used to describe server-supported SASL mechanisms, as announced in a
* features/mechanism stanza and activated in a auth-stanza
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public interface SASLMechanism {
/**
- * name of the mechanism, used to uniquely identify the mechanism in server/client communication
+ * name of the mechanism, used to uniquely identify the mechanism in server/client communication
*/
String getName();
@@ -35,5 +41,5 @@
* called by the server to handle mechanism specific logic as client issues a auth-stanza.
*/
Stanza started(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza authStanza);
-
+
}
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -23,23 +26,26 @@
/**
* very simple in-memory {@link org.apache.vysper.xmpp.authorization.UserAuthorization} service
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class SimpleUserAuthorization implements UserAuthorization, AccountVerification, AccountCreation {
-
+
private final Map<String, String> userPasswordMap = new HashMap<String, String>();
-
+
public SimpleUserAuthorization() {
; // empty
}
-
+
public SimpleUserAuthorization(Map<String, String> userPasswordMap) {
this.userPasswordMap.putAll(userPasswordMap);
}
-
+
public void addUser(String username, String password) {
userPasswordMap.put(username, password);
}
-
+
public boolean verifyCredentials(Entity jid, String passwordCleartext, Object credentials) {
return verify(jid.getFullQualifiedName(), passwordCleartext);
}
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/UserAuthorization.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/UserAuthorization.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/UserAuthorization.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/authorization/UserAuthorization.java Tue Apr 21 10:41:56 2009
@@ -1,26 +1,32 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.authorization;
import org.apache.vysper.xmpp.addressing.Entity;
/**
- * interface describing a service for authorizing users
+ * interface describing a service for authorizing users
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public interface UserAuthorization {
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/AbstractTLSContextFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/AbstractTLSContextFactory.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/AbstractTLSContextFactory.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/AbstractTLSContextFactory.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.cryptography;
import javax.net.ssl.KeyManagerFactory;
@@ -26,7 +29,10 @@
/**
* derived from MINA's BogusSSLContextFactory.
- * see http://svn.apache.org/viewvc/mina/branches/1.0/example/src/main/java/org/apache/mina/example/echoserver/ssl/BogusSSLContextFactory.java?view=markup
+ * see http://svn.apache.org/viewvc/mina/branches/1.0/example/src/main/java/org/apache/mina/example/echoserver/ssl/BogusSSLContextFactory.java?view=markup
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public abstract class AbstractTLSContextFactory implements TLSContextFactory {
@@ -42,9 +48,9 @@
private SSLContext sslContext = null;
protected String password = null;
-
+
protected TrustManagerFactory trustManagerFactory = null;
-
+
// NOTE: The keystore was generated using keytool:
// keytool -genkey -alias bogus -keysize 512 -validity 3650
// -keyalg RSA -dname "CN=bogus.com, OU=XXX CA,
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/FileBasedTLSContextFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/FileBasedTLSContextFactory.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/FileBasedTLSContextFactory.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/FileBasedTLSContextFactory.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.cryptography;
import java.io.File;
@@ -22,6 +25,9 @@
import java.io.FileInputStream;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class FileBasedTLSContextFactory extends AbstractTLSContextFactory {
private File file;
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TLSContextFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TLSContextFactory.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TLSContextFactory.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TLSContextFactory.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.cryptography;
import javax.net.ssl.SSLContext;
@@ -21,9 +24,12 @@
import java.io.IOException;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public interface TLSContextFactory {
-
+
SSLContext getSSLContext() throws GeneralSecurityException, IOException;
-
+
}
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TrustManagerFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TrustManagerFactory.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TrustManagerFactory.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/cryptography/TrustManagerFactory.java Tue Apr 21 10:41:56 2009
@@ -1,24 +1,30 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.cryptography;
import javax.net.ssl.TrustManager;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public interface TrustManagerFactory {
TrustManager[] getTrustManagers();
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveringInboundStanzaRelay.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveringInboundStanzaRelay.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveringInboundStanzaRelay.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveringInboundStanzaRelay.java Tue Apr 21 10:41:56 2009
@@ -1,19 +1,22 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
+/*
+ * 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.vysper.xmpp.delivery;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -39,7 +42,10 @@
/**
* relays stanzas to internal sessions, acts as a 'stage' by using a ThreadPoolExecutor
- * TODO: re-work the whole relay result
+ * TODO: re-work the whole relay result
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class DeliveringInboundStanzaRelay implements StanzaRelay {
@@ -59,7 +65,7 @@
int threadTimeoutSeconds = 2 * 60 * 1000;
this.executor = new ThreadPoolExecutor(coreThreadCount, maxThreadCount, threadTimeoutSeconds, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
}
-
+
public void relay(Entity receiver, Stanza stanza, DeliveryFailureStrategy deliveryFailureStrategy) throws DeliveryException {
Future<RelayResult> resultFuture = executor.submit(new Relay(receiver, stanza, deliveryFailureStrategy));
}
@@ -125,10 +131,10 @@
} catch (RuntimeException e) {
return new RelayResult(new DeliveryException(e));
}
-
+
// TODO handle this properly, don't only return the first failure
for (RelayResult relayResult : relayResults) {
- if (!relayResult.isRelayed()) return relayResult;
+ if (!relayResult.isRelayed()) return relayResult;
}
return new RelayResult(); // return success result
}
@@ -152,7 +158,7 @@
}
}
}
-
+
private static class UnmodifyableSessionStateHolder extends SessionStateHolder {
@Override
@@ -165,7 +171,7 @@
return SessionState.AUTHENTICATED;
}
}
-
+
private static class RelayResult {
private DeliveryException processingError;
private boolean relayed;
Modified: mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveryException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveryException.java?rev=767109&r1=767108&r2=767109&view=diff
==============================================================================
--- mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveryException.java (original)
+++ mina/sandbox/vysper/src/main/java/org/apache/vysper/xmpp/delivery/DeliveryException.java Tue Apr 21 10:41:56 2009
@@ -1,23 +1,28 @@
-/***********************************************************************
- * Copyright (c) 2006-2007 The Apache Software Foundation. *
- * All rights reserved. *
- * ------------------------------------------------------------------- *
- * Licensed 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. *
- ***********************************************************************/
-
+/*
+ * 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.vysper.xmpp.delivery;
/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Revision$ , $Date: 2009-04-21 13:13:19 +0530 (Tue, 21 Apr 2009) $
*/
public class DeliveryException extends Exception {