svn commit: r1186790 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/

[sagara]

Author: sagara
Date: Thu Oct 20 13:17:33 2011
New Revision: 1186790

URL: http://svn.apache.org/viewvc?rev=1186790&view=rev
Log:
Introduced a new package to hold SSLProtocolSocketFactory without making any 
split-package problem. 

Added:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/

svn commit: r1186793 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java transport/http/src/org/apache/axis2/transport/http/security/SSLPr

[sagara]

Author: sagara
Date: Thu Oct 20 13:29:55 2011
New Revision: 1186793

URL: http://svn.apache.org/viewvc?rev=1186793&view=rev
Log:
Move SSLProtocolSocketFactory from kernal to http transport module.

Added:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java
  - copied unchanged from r1186792, 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java
Removed:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/java/security/SSLProtocolSocketFactory.java

svn commit: r1186795 - /axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java

[sagara]

Author: sagara
Date: Thu Oct 20 13:34:20 2011
New Revision: 1186795

URL: http://svn.apache.org/viewvc?rev=1186795&view=rev
Log:
Change the package name in the class according to the new package. 

Modified:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java?rev=1186795&r1=1186794&r2=1186795&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/security/SSLProtocolSocketFactory.java
 Thu Oct 20 13:34:20 2011
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License.  
  */
-package org.apache.axis2.java.security;
+package org.apache.axis2.transport.http.security;
 
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;

svn commit: r1186986 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java

[veithen]

Author: veithen
Date: Thu Oct 20 18:36:11 2011
New Revision: 1186986

URL: http://svn.apache.org/viewvc?rev=1186986&view=rev
Log:
Merged r1186431 to the 1.6 branch.

Modified:
axis/axis2/java/sandesha/branches/1_6/   (props changed)

axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java

Propchange: axis/axis2/java/sandesha/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 18:36:11 2011
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793
+/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793,1186431

Modified: 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java?rev=1186986&r1=1186985&r2=1186986&view=diff
==
--- 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
 (original)
+++ 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
 Thu Oct 20 18:36:11 2011
@@ -27,12 +27,11 @@ import java.util.MissingResourceExceptio
 
 import javax.xml.namespace.QName;
 
+import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
-import org.apache.axiom.soap.impl.llom.soap12.SOAP12Factory;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
@@ -857,10 +856,10 @@ public class SandeshaClient {
SOAPFactory factory = null;
SOAPEnvelope dummyEnvelope = null;
if 
(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespaceURI)) {
-   factory = new SOAP12Factory();
+   factory = OMAbstractFactory.getSOAP12Factory();
dummyEnvelope = factory.getDefaultEnvelope();
} else {
-   factory = new SOAP11Factory();
+   factory = OMAbstractFactory.getSOAP11Factory();
dummyEnvelope = factory.getDefaultEnvelope();
}
 
@@ -1022,10 +1021,10 @@ public class SandeshaClient {
soapNamespaceURI = 
getSOAPNamespaceURI(storageManager, internalSequenceID);
 
if 
(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespaceURI)) {
-   factory = new SOAP12Factory();
+   factory = OMAbstractFactory.getSOAP12Factory();
dummyEnvelope = factory.getDefaultEnvelope();
} else {
-   factory = new SOAP11Factory();
+   factory = OMAbstractFactory.getSOAP11Factory();
dummyEnvelope = factory.getDefaultEnvelope();
}
 
@@ -1178,10 +1177,10 @@ public class SandeshaClient {
if (soapNamespaceURI == null) 
soapNamespaceURI = getSOAPNamespaceURI(storageManager, 
internalSequenceID);
if 
(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespaceURI)) {
-   factory = new SOAP12Factory();
+   factory = OMAbstractFactory.getSOAP12Factory();
dummyEnvelope = factory.getDefaultEnvelope();
} else {
-   factory = new SOAP11Factory();
+   factory = OMAbstractFactory.getSOAP11Factory();
dummyEnvelope = factory.getDefaultEnvelope();
}