geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r758140 - in /geronimo/server/branches/2.1: ./ repository/ repository/org/apache/axis2/ repository/org/apache/axis2/axis2-jaxws/1.3-G20090310/ repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/ repository/org/apache/axis2/axis2-kernel/ ...
Date Wed, 25 Mar 2009 04:27:39 GMT
Author: gawor
Date: Wed Mar 25 04:27:37 2009
New Revision: 758140

URL: http://svn.apache.org/viewvc?rev=758140&view=rev
Log:
regenerated axis2 jars with fixes for AXIS2-4279

Added:
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/axis2-jaxws-1.3-G20090325.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/axis2-kernel-1.3-G20090325.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/axis2-metadata-1.3-G20090325.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/axis2-saaj-1.3-G20090325.jar
  (with props)
    geronimo/server/branches/2.1/repository/org/apache/axis2/kernel.patch
Removed:
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090310/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090310/
    geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090310/
Modified:
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT
    geronimo/server/branches/2.1/repository/org/apache/axis2/saaj.patch
    geronimo/server/branches/2.1/repository/pom.xml

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=758140&r1=758139&r2=758140&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Mar 25 04:27:37 2009
@@ -1384,7 +1384,7 @@
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-kernel</artifactId>
-                <version>${axis2Version}</version>
+                <version>1.3-G20090325</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.woden</groupId>
@@ -1408,19 +1408,19 @@
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-jaxws</artifactId>
-                <version>1.3-G20090310</version>
+                <version>1.3-G20090325</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-metadata</artifactId>
-                <version>1.3-G20090310</version>
+                <version>1.3-G20090325</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.axis2</groupId>
                 <artifactId>axis2-saaj</artifactId>
-                <version>1.3-G20090310</version>
+                <version>1.3-G20090325</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT?rev=758140&r1=758139&r2=758140&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT (original)
+++ geronimo/server/branches/2.1/repository/org/apache/axis2/README.TXT Wed Mar 25 04:27:37
2009
@@ -1,6 +1,6 @@
 Private Build of Axis2 1.3 for Geronimo.   
 
-How to build Axis2 1.3-G20090310:
+How to build Axis2 1.3-G20090325:
 ---------------------------------
  Checkout the Axis2 1.3 tag
    svn co http://svn.apache.org/repos/asf/webservices/axis2/tags/java/v1.3/ axis2-1.3
@@ -13,7 +13,7 @@
  patch -p0 -i saaj.patch
  patch -p0 -i metadata.patch
  patch -p0 -i jaxws.patch
-
+ patch -p0 -i kernel.patch
 
 Build Axis2 1.3
 ---------------
@@ -31,11 +31,12 @@
  saaj.patch     - contains fixes for AXIS2-3808, AXIS2-4027, and AXIS2-4266
  metadata.patch - contains fixes for SEI with overloaded methods
  jaxws.patch    - contains fixes for AXIS2-3343 and RESTful invocations
-
+ kernel.patch   - contains fixes for AXIS2-4279
 
 Copy patched jar files to appropriate locations
 -----------------------------------------------
   cd axis2-1.3
-  cp modules/saaj/target/axis2-saaj-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-saaj/1.3-G20090310/axis2-saaj-1.3-G20090310.jar
-  cp modules/metadata/target/axis2-metadata-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-metadata/1.3-G20090310/axis2-metadata-1.3-G20090310.jar
-  cp modules/jaxws/target/axis2-jaxws-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-jaxws/1.3-G20090310/axis2-jaxws-1.3-G20090310.jar
+  cp modules/saaj/target/axis2-saaj-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/axis2-saaj-1.3-G20090325.jar
+  cp modules/metadata/target/axis2-metadata-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/axis2-metadata-1.3-G20090325.jar
+  cp modules/jaxws/target/axis2-jaxws-1.3.jar <geronimo-root>/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/axis2-jaxws-1.3-G20090325.jar
+  cp modules/kernel/target/axis2-kernel-1.3.jar  <geronimo-root>/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/axis2-kernel-1.3-G20090325.jar

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/axis2-jaxws-1.3-G20090325.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/axis2-jaxws-1.3-G20090325.jar?rev=758140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-jaxws/1.3-G20090325/axis2-jaxws-1.3-G20090325.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/axis2-kernel-1.3-G20090325.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/axis2-kernel-1.3-G20090325.jar?rev=758140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-kernel/1.3-G20090325/axis2-kernel-1.3-G20090325.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/axis2-metadata-1.3-G20090325.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/axis2-metadata-1.3-G20090325.jar?rev=758140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-metadata/1.3-G20090325/axis2-metadata-1.3-G20090325.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/axis2-saaj-1.3-G20090325.jar
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/axis2-saaj-1.3-G20090325.jar?rev=758140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/branches/2.1/repository/org/apache/axis2/axis2-saaj/1.3-G20090325/axis2-saaj-1.3-G20090325.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/server/branches/2.1/repository/org/apache/axis2/kernel.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/kernel.patch?rev=758140&view=auto
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/axis2/kernel.patch (added)
+++ geronimo/server/branches/2.1/repository/org/apache/axis2/kernel.patch Wed Mar 25 04:27:37
2009
@@ -0,0 +1,113 @@
+Index: modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
+===================================================================
+--- modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java	(revision 751793)
++++ modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java	(working copy)
+@@ -20,7 +20,6 @@
+ 
+ package org.apache.axis2.transport.http;
+ 
+-import org.apache.axiom.attachments.utils.IOUtils;
+ import org.apache.axis2.AxisFault;
+ import org.apache.axis2.Constants;
+ import org.apache.axis2.addressing.EndpointReference;
+@@ -186,9 +185,12 @@
+                 if (stream != null) {
+                     OutputStream out = res.getOutputStream();
+                     res.setContentType("text/xml");
+-                    copy(stream, out);
+-                    out.flush();
+-                    out.close();
++                    try {
++                        copy(stream, out);
++                    } finally {
++                        try { stream.close(); } catch (IOException e) {}
++                        try { out.close(); } catch (IOException e) {}
++                    }
+                     return;
+                 }
+             }
+@@ -202,13 +204,35 @@
+      * @param ostream the <code>OutputStream</code>
+      */
+     public static void copy(InputStream stream, OutputStream ostream) throws IOException
{
+-        int nextValue = stream.read();
+-        while (-1 != nextValue) {
+-            ostream.write(nextValue);
+-            nextValue = stream.read();
++        byte[] buffer = new byte[4096];
++        int count;
++        while ((count = stream.read(buffer)) > 0) {
++            ostream.write(buffer, 0, count);
+         }
+     }
+ 
++    private static void getAsResource(HttpServletResponse res,
++                                      ClassLoader classLoader,
++                                      String extension,
++                                      String file) throws IOException {
++        if (!file.endsWith(extension) || file.indexOf("..") != -1) {
++            res.sendError(HttpServletResponse.SC_BAD_REQUEST);
++        } else {
++            InputStream in = classLoader.getResourceAsStream("META-INF/" + file);
++            if (in == null) {
++                res.sendError(HttpServletResponse.SC_NOT_FOUND);
++            } else {
++                OutputStream out = res.getOutputStream();
++                try {
++                    copy(in, out);
++                } finally {
++                    try { in.close(); } catch (IOException e) {}
++                    try { out.close(); } catch (IOException e) {}
++                }
++            }
++        }
++    }
++
+     public String extractServiceName(String urlString) {
+         int n = urlString.indexOf(configContext.getServiceContextPath());
+         if (n != -1) {
+@@ -244,23 +268,14 @@
+                 boolean isHttp = "http".equals(req.getScheme());
+                 if (wsdl2 >= 0) {
+                     res.setContentType("text/xml");
++                    AxisService axisService = (AxisService) serviceObj;
+                     String ip = extractHostAndPort(url, isHttp);
+                     String wsdlName = req.getParameter("wsdl2");
+                     if (wsdlName != null && wsdlName.length()>0) {
+-                        InputStream in = ((AxisService) serviceObj).getClassLoader()
+-                                .getResourceAsStream(DeploymentConstants.META_INF + "/"
+ wsdlName);
+-                        if (in != null) {
+-                            OutputStream out = res.getOutputStream();
+-                            out.write(IOUtils.getStreamAsByteArray(in));
+-                            out.flush();
+-                            out.close();
+-                        } else {
+-                            res.sendError(HttpServletResponse.SC_NOT_FOUND);
+-                        }
++                        getAsResource(res, axisService.getClassLoader(), ".wsdl", wsdlName);
+                     } else {
+                         OutputStream out = res.getOutputStream();
+-                        ((AxisService) serviceObj)
+-                                .printWSDL2(out, ip);
++                        axisService.printWSDL2(out, ip);
+                         out.flush();
+                         out.close();
+                     }
+@@ -310,16 +325,7 @@
+                             out.flush();
+                             out.close();
+                         } else {
+-                            InputStream in = axisService.getClassLoader()
+-                                    .getResourceAsStream(DeploymentConstants.META_INF +
"/" + xsds);
+-                            if (in != null) {
+-                                OutputStream out = res.getOutputStream();
+-                                out.write(IOUtils.getStreamAsByteArray(in));
+-                                out.flush();
+-                                out.close();
+-                            } else {
+-                                res.sendError(HttpServletResponse.SC_NOT_FOUND);
+-                            }
++                            getAsResource(res, axisService.getClassLoader(), ".xsd", xsds);
+                         }
+ 
+                         //multiple schemas are present and the user specified

Modified: geronimo/server/branches/2.1/repository/org/apache/axis2/saaj.patch
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/org/apache/axis2/saaj.patch?rev=758140&r1=758139&r2=758140&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/org/apache/axis2/saaj.patch (original)
+++ geronimo/server/branches/2.1/repository/org/apache/axis2/saaj.patch Wed Mar 25 04:27:37
2009
@@ -1,6 +1,6 @@
 Index: modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java
 ===================================================================
---- modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java	(revision 749891)
+--- modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java	(revision 758133)
 +++ modules/saaj/test/org/apache/axis2/saaj/SOAPEnvelopeTest.java	(working copy)
 @@ -21,6 +21,8 @@
  
@@ -161,7 +161,7 @@
 +}
 Index: modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java
 ===================================================================
---- modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java	(revision 749891)
+--- modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java	(revision 758133)
 +++ modules/saaj/test/org/apache/axis2/saaj/SOAPHeaderTest.java	(working copy)
 @@ -33,6 +33,11 @@
  import javax.xml.soap.SOAPHeaderElement;
@@ -231,7 +231,7 @@
 \ No newline at end of file
 Index: modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
 ===================================================================
---- modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java	(revision 749891)
+--- modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java	(revision 758133)
 +++ modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java	(working copy)
 @@ -20,6 +20,8 @@
  
@@ -329,7 +329,7 @@
  }
 Index: modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
 ===================================================================
---- modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java	(revision 749891)
+--- modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java	(revision 758133)
 +++ modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java	(working copy)
 @@ -262,5 +262,53 @@
          }
@@ -388,7 +388,7 @@
  }
 Index: modules/saaj/test/org/apache/axis2/saaj/TextTest.java
 ===================================================================
---- modules/saaj/test/org/apache/axis2/saaj/TextTest.java	(revision 749891)
+--- modules/saaj/test/org/apache/axis2/saaj/TextTest.java	(revision 758133)
 +++ modules/saaj/test/org/apache/axis2/saaj/TextTest.java	(working copy)
 @@ -20,6 +20,7 @@
  package org.apache.axis2.saaj;
@@ -411,7 +411,7 @@
      }
 Index: modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java
 ===================================================================
---- modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java	(revision 749891)
+--- modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java	(revision 758133)
 +++ modules/saaj/test/org/apache/axis2/saaj/SOAPPartTest.java	(working copy)
 @@ -21,6 +21,7 @@
  import junit.framework.TestCase;
@@ -499,7 +499,7 @@
  }
 Index: modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
 ===================================================================
---- modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java	(revision 749891)
+--- modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java	(revision 758133)
 +++ modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java	(working copy)
 @@ -96,6 +96,22 @@
          return childEle;
@@ -535,7 +535,7 @@
          int indexOfColon = domEle.getTagName().indexOf(":");
 Index: modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
 ===================================================================
---- modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java	(revision 749891)
+--- modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java	(revision 758133)
 +++ modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java	(working copy)
 @@ -160,30 +160,37 @@
       * @return the SAAJ Node corresponding to the domNode
@@ -600,7 +600,7 @@
              ((NodeImpl)domNode).setUserData(SAAJ_NODE, saajTextNode, null);
 Index: modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
 ===================================================================
---- modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java	(revision 749891)
+--- modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java	(revision 758133)
 +++ modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java	(working copy)
 @@ -841,7 +841,7 @@
       * been removed from the tree, this is <code>null</code>.
@@ -676,9 +676,68 @@
 +        return NodeImplEx.toSAAJNode(domNode, this);
 +    }
  }
+Index: modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java
+===================================================================
+--- modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java	(revision 0)
++++ modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java	(revision 0)
+@@ -0,0 +1,48 @@
++/*
++ * 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.axis2.saaj;
++
++import javax.xml.soap.SOAPElement;
++import javax.xml.soap.Text;
++
++import org.w3c.dom.Comment;
++
++public class CommentImpl extends TextImplEx implements Comment {
++
++    public CommentImpl(String data, SOAPElement parent) {
++        super(data, parent);
++    }
++
++    public CommentImpl(String data, SOAPElement parent,
++                       org.w3c.dom.Node prevSibling, org.w3c.dom.Node nextSibling) {
++        super(data, parent, prevSibling, nextSibling);
++    }
++
++    public boolean isComment() {
++        return true;
++    }
++
++    public String getNodeName() {
++        return "#comment";
++    }
++
++    public short getNodeType() {
++        return Text.COMMENT_NODE;
++    }
++}
+
+Property changes on: modules/saaj/src/org/apache/axis2/saaj/CommentImpl.java
+___________________________________________________________________
+Name: svn:eol-style
+   + native
+
 Index: modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
 ===================================================================
---- modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java	(revision 749891)
+--- modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java	(revision 758133)
 +++ modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java	(working copy)
 @@ -30,6 +30,7 @@
  import org.apache.axiom.soap.impl.dom.soap12.SOAP12Factory;
@@ -721,7 +780,7 @@
       * adds it to this <CODE>SOAPHeader</CODE> object.
 Index: modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
 ===================================================================
---- modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java	(revision 749891)
+--- modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java	(revision 758133)
 +++ modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java	(working copy)
 @@ -35,6 +35,7 @@
  import org.w3c.dom.Attr;

Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=758140&r1=758139&r2=758140&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Wed Mar 25 04:27:37 2009
@@ -171,6 +171,11 @@
             <artifactId>axis2-saaj</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+        </dependency>
+
     </dependencies>
 
     <repositories>



Mime
View raw message