Author: dims
Date: Thu Dec 22 12:19:27 2005
New Revision: 358616
URL: http://svn.apache.org/viewcvs?rev=358616&view=rev
Log:
someone checked in a class of the same name in core
Added:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils2.java
(contents, props changed)
- copied, changed from r358612,
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils.java
Removed:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils.java
Modified:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
Modified:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java?rev=358616&r1=358615&r2=358616&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
(original)
+++
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
Thu Dec 22 12:19:27 2005
@@ -2,7 +2,7 @@
import org.apache.axis2.om.OMText;
import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.util.SessionUtils;
+import org.apache.axis2.util.SessionUtils2;
import javax.activation.DataHandler;
import javax.activation.UnsupportedDataTypeException;
@@ -18,7 +18,7 @@
* Bulds a new <code>AttachmentPart</code>.
*/
public AttachmentPartImpl() {
- setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
SessionUtils.generateSessionId());
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
SessionUtils2.generateSessionId());
}
/**
@@ -28,7 +28,7 @@
*/
public AttachmentPartImpl(javax.activation.DataHandler dh) {
setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
- SessionUtils.generateSessionId());
+ SessionUtils2.generateSessionId());
dataHandler = dh;
if(dh != null) {
setMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE,
dh.getContentType());
Modified:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?rev=358616&r1=358615&r2=358616&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
(original)
+++
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
Thu Dec 22 12:19:27 2005
@@ -24,7 +24,7 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNode;
import org.apache.axis2.om.OMText;
-import org.apache.axis2.util.SessionUtils;
+import org.apache.axis2.util.SessionUtils2;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -136,7 +136,7 @@
DataHandler actualDH = (DataHandler)
binaryNode.getDataHandler();
if (actualDH != null) {
AttachmentPart ap = soapMsg.createAttachmentPart(actualDH);
- String contentId = SessionUtils.generateSessionId();
+ String contentId = SessionUtils2.generateSessionId();
ap.setContentId(contentId);
ap.setContentType(actualDH.getContentType());
OMElement parent = (OMElement) child.getParent();
Modified:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?rev=358616&r1=358615&r2=358616&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
(original)
+++
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
Thu Dec 22 12:19:27 2005
@@ -17,7 +17,7 @@
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.util.SessionUtils;
+import org.apache.axis2.util.SessionUtils2;
import org.w3c.dom.*;
import javax.xml.soap.MimeHeaders;
@@ -45,7 +45,7 @@
boolean isBodyStream) throws SOAPException {
setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
- SessionUtils.generateSessionId());
+ SessionUtils2.generateSessionId());
setMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE, "text/xml");
StAXSOAPModelBuilder stAXSOAPModelBuilder;
Copied:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils2.java
(from r358612,
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils.java)
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils2.java?p2=webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils2.java&p1=webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils.java&r1=358612&r2=358616&rev=358616&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils.java
(original)
+++
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils2.java
Thu Dec 22 12:19:27 2005
@@ -20,7 +20,7 @@
/**
* Code borrowed from AuthenticatorBase.java for generating a secure id's.
*/
-public class SessionUtils {
+public class SessionUtils2 {
/**
* The number of random bytes to include when generating a
Propchange:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/SessionUtils2.java
------------------------------------------------------------------------------
svn:eol-style = native
