You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/04/19 13:29:41 UTC

svn commit: r395215 - in /webservices/axis2/trunk/java/modules: saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java security/src/org/apache/axis2/security/rahas/RahasConfiguration.java

Author: ruchithf
Date: Wed Apr 19 04:29:40 2006
New Revision: 395215

URL: http://svn.apache.org/viewcvs?rev=395215&view=rev
Log:
update saaj to the the latest AXIOM

Modified:
    webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
    webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java

Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=395215&r1=395214&r2=395215&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Wed Apr 19 04:29:40 2006
@@ -289,12 +289,10 @@
             localname = domEle.getTagName().substring(indexOfColon + 1);
 
             ns = new NamespaceImpl(domEle.getNamespaceURI(),
-                                   domEle.getTagName().substring(0, indexOfColon),
-                                   this.element.getOMFactory());
+                                   domEle.getTagName().substring(0, indexOfColon));
         } else {
             localname = domEle.getLocalName();
-            ns = new NamespaceImpl(domEle.getNamespaceURI(), domEle.getPrefix(),
-                    this.element.getOMFactory());
+            ns = new NamespaceImpl(domEle.getNamespaceURI(), domEle.getPrefix());
         }
         ElementImpl eleImpl =
                 new ElementImpl((DocumentImpl) this.getOwnerDocument(), 

Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=395215&r1=395214&r2=395215&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Wed Apr 19 04:29:40 2006
@@ -72,7 +72,7 @@
     * @see javax.xml.soap.SOAPElement#addChildElement(java.lang.String, java.lang.String, java.lang.String)
     */
     public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException {
-        OMNamespace ns = new NamespaceImpl(uri, prefix, this.element.getOMFactory());
+        OMNamespace ns = new NamespaceImpl(uri, prefix);
         SOAPHeaderBlock headerBlock =
                 new SOAP11HeaderBlockImpl(localName, ns, omSOAPHeader, (SOAPFactory)this.element.getOMFactory());
         SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
@@ -94,8 +94,7 @@
     */
     public SOAPElement addChildElement(SOAPElement soapElement) throws SOAPException {
         OMNamespace ns = new NamespaceImpl(soapElement.getNamespaceURI(), 
-                soapElement.getPrefix(),
-                (SOAPFactory)this.element.getOMFactory());
+                soapElement.getPrefix());
         SOAPHeaderBlock headerBlock =
                 new SOAP11HeaderBlockImpl(soapElement.getLocalName(), ns, 
                         omSOAPHeader,
@@ -121,8 +120,7 @@
      * @throws SOAPException if a SOAP error occurs
      */
     public SOAPHeaderElement addHeaderElement(Name name) throws SOAPException {
-        OMNamespace ns = new NamespaceImpl(name.getURI(), name.getPrefix(), 
-                (SOAPFactory)this.element.getOMFactory());
+        OMNamespace ns = new NamespaceImpl(name.getURI(), name.getPrefix());
         SOAPHeaderBlock headerBlock =
                 new SOAP11HeaderBlockImpl(name.getLocalName(), ns, omSOAPHeader,
                         (SOAPFactory)this.element.getOMFactory());

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java?rev=395215&r1=395214&r2=395215&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/rahas/RahasConfiguration.java Wed Apr 19 04:29:40 2006
@@ -133,10 +133,6 @@
     
     private SecurityContextToken sct;
     
-    private byte[] requesterEntropy;
-    
-    private byte[] issuerEntropy;
-    
     private String encryptionUser;
     
     public static RahasConfiguration load(MessageContext msgCtx, boolean sender)
@@ -587,34 +583,6 @@
      */
     public void setPasswordCallbackClass(String passwordCallbackClass) {
         this.passwordCallbackClass = passwordCallbackClass;
-    }
-
-    /**
-     * @return Returns the issuerEntropy.
-     */
-    protected byte[] getIssuerEntropy() {
-        return issuerEntropy;
-    }
-
-    /**
-     * @param issuerEntropy The issuerEntropy to set.
-     */
-    protected void setIssuerEntropy(byte[] issuerEntropy) {
-        this.issuerEntropy = issuerEntropy;
-    }
-
-    /**
-     * @return Returns the requesterEntropy.
-     */
-    protected byte[] getRequesterEntropy() {
-        return requesterEntropy;
-    }
-
-    /**
-     * @param requesterEntropy The requesterEntropy to set.
-     */
-    protected void setRequesterEntropy(byte[] requesterEntropy) {
-        this.requesterEntropy = requesterEntropy;
     }
 
     /**