svn commit: r963044 - /axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 10:41:11 2010
New Revision: 963044

URL: http://svn.apache.org/viewvc?rev=963044&view=rev
Log:
Switched the 1.5 branch to Axiom 1.2.9 (release).

Modified:
axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml

Modified: axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml?rev=963044&r1=963043&r2=963044&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml Sun Jul 11 
10:41:11 2010
@@ -92,7 +92,7 @@
 
 1.7.0
 2.7.7
-1.2.9-SNAPSHOT
+1.2.9
 5.2
 2.4.0
 1.3

svn commit: r963081 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.jav

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 14:36:42 2010
New Revision: 963081

URL: http://svn.apache.org/viewvc?rev=963081&view=rev
Log:
AXIS2-4768: Make sure that for a POJO, ADB produces an XMLStreamReader that 
returns the same value for the IsDatahandlersAwareParsing property regardless 
of the position in the stream. Axiom 1.2.9 checks the property only once (in 
order to avoid repeated calls to XMLStreamReader#getProperty) and may therefore 
fail to optimize binary data if the value of this property changes during the 
lifecycle of the XMLStreamReader object.

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java

axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=963081&r1=963080&r2=963081&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
 Sun Jul 11 14:36:42 2010
@@ -170,12 +170,8 @@ public class ADBXMLStreamReaderImpl impl
  * @throws IllegalArgumentException
  */
 public Object getProperty(String key) throws IllegalArgumentException {
-if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-if (OPTIMIZATION_ENABLED.equals(key)) {
-return Boolean.TRUE;
-} else {
-return null;
-}
+if (OPTIMIZATION_ENABLED.equals(key)) {
+return Boolean.TRUE;
 } else if (state == TEXT_STATE) {
 if (IS_BINARY.equals(key)) {
 return Boolean.FALSE;

Modified: 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java?rev=963081&r1=963080&r2=963081&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java
 Sun Jul 11 14:36:42 2010
@@ -20,12 +20,14 @@
 package org.apache.axis2.databinding.utils;
 
 import org.apache.axiom.om.*;
+import org.apache.axis2.description.java2wsdl.TypeTable;
 import org.apache.axis2.engine.DefaultObjectSupplier;
 import org.apache.axis2.engine.ObjectSupplier;
 
 import junit.framework.TestCase;
 
 import javax.activation.DataHandler;
+import javax.mail.util.ByteArrayDataSource;
 import javax.xml.namespace.QName;
 
 import java.util.List;
@@ -131,4 +133,18 @@ public class BeanUtilTest extends TestCa
 private OMAttribute createTypeAttribute(String value) {
 return omFactory.createOMAttribute("type", xsiNamespace, value);
 }
+
+/**
+ * Test that for a {...@link DataHandler} object, {...@link BeanUtil} 
creates sequence of
+ * events that allows Axiom to recognize the optimized binary.
+ */
+public void testGetOMElementWithDataHandlerArg() {
+DataHandler dh = new DataHandler(new ByteArrayDataSource(new 
byte[4096],
+"application/octet-stream"));
+OMElement element = BeanUtil.getOMElement(new QName("urn:ns1", "myop"),
+new Object[] { dh }, new QName("urn:ns1", "part"), true, new 
TypeTable());
+OMText text = (OMText)element.getFirstElement().getFirstOMChild();
+assertTrue(text.isOptimized());
+assertSame(dh, text.getDataHandler());
+}
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java?rev=963081&r1=963080&r2=963081&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
 Sun Jul 11 14:36:42 2010
@@ -308,11 +308,7 @@ public class StreamWrapper implements XM
 }
 
 public Object getProperty(String s) throws IllegalArgumentException {
-if (state != STATE_INIT) {
-return realReader.getProperty(s);
-} else {
-throw new IllegalArgume

svn commit: r963098 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/adb/src/org/apache/axis2/databinding/utils/reader/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 16:10:48 2010
New Revision: 963098

URL: http://svn.apache.org/viewvc?rev=963098&view=rev
Log:
AXIS2-4768: Merged r963081 to the 1.5 branch because the issue causes a 
regression when upgrading from Axiom 1.2.8 to 1.2.9.

Modified:
axis/axis2/java/core/branches/java/1_5/   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java

axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java

axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/   (props 
changed)

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:944347,944915,951385
+/axis/axis2/java/core/trunk:944347,944915,951385,963081
 
/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058,904780

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=963098&r1=963097&r2=963098&view=diff
==
--- 
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
 Sun Jul 11 16:10:48 2010
@@ -170,12 +170,8 @@ public class ADBXMLStreamReaderImpl impl
  * @throws IllegalArgumentException
  */
 public Object getProperty(String key) throws IllegalArgumentException {
-if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-if (OPTIMIZATION_ENABLED.equals(key)) {
-return Boolean.TRUE;
-} else {
-return null;
-}
+if (OPTIMIZATION_ENABLED.equals(key)) {
+return Boolean.TRUE;
 } else if (state == TEXT_STATE) {
 if (IS_BINARY.equals(key)) {
 return Boolean.FALSE;

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 16:10:48 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385,963081
 
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058,904780

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java?rev=963098&r1=963097&r2=963098&view=diff
==
--- 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/StreamWrapper.java
 Sun Jul 11 16:10:48 2010
@@ -308,11 +308,7 @@ public class StreamWrapper implements XM
 }
 
 public Object getProperty(String s) throws IllegalArgumentException {
-if (state != STATE_INIT) {
-return realReader.getProperty(s);
-} else {
-throw new IllegalArgumentException();
-}
+return realReader.getProperty(s);
 }
 
 public String getText()

svn commit: r963107 - /axis/axis2/java/core/trunk/modules/jaxws/test-resources/wsdl/RespectBinding.wsdl

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 16:39:01 2010
New Revision: 963107

URL: http://svn.apache.org/viewvc?rev=963107&view=rev
Log:
The schema that defines WSDL binding extensions should not be imported into 
wsdl:types, although it may be referenced by schemaLocation. This solves part 
of AXIS2-4767.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/test-resources/wsdl/RespectBinding.wsdl

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/wsdl/RespectBinding.wsdl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/wsdl/RespectBinding.wsdl?rev=963107&r1=963106&r2=963107&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/wsdl/RespectBinding.wsdl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/wsdl/RespectBinding.wsdl
 Sun Jul 11 16:39:01 2010
@@ -2,9 +2,6 @@
 http://RespectBinding.jaxws22"; 
xmlns:ns1="http://extension.RespectBinding.jaxws22"; 
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:tns="http://RespectBinding.jaxws22"; 
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>

http://RespectBinding.jaxws22"; 
xmlns="http://www.w3.org/2001/XMLSchema";>
-   
-   http://extension.RespectBinding.jaxws22"; 
schemaLocation="../xsd/extension.xsd"/>
-

svn commit: r963112 - in /axis/axis2/java/transports/trunk: modules/base/pom.xml pom.xml

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 17:05:59 2010
New Revision: 963112

URL: http://svn.apache.org/viewvc?rev=963112&view=rev
Log:
Let Maven handle Axiom as a transitive dependeny of Axis2. No need to use a 
dependency or dependencyManagement here.

Modified:
axis/axis2/java/transports/trunk/modules/base/pom.xml
axis/axis2/java/transports/trunk/pom.xml

Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=963112&r1=963111&r2=963112&view=diff
==
--- axis/axis2/java/transports/trunk/modules/base/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/base/pom.xml Sun Jul 11 17:05:59 
2010
@@ -76,29 +76,6 @@
 
 
 
-
-
-org.apache.ws.commons.axiom
-axiom-api
-
-
-org.apache.geronimo.specs
-geronimo-javamail_1.4_spec
-
-
-org.apache.geronimo.specs
-geronimo-activation_1.1_spec
-
-
-
-
-org.apache.ws.commons.axiom
-axiom-impl
-
-
-org.apache.ws.commons.axiom
-axiom-dom
-
 
 
 org.apache.axis2

Modified: axis/axis2/java/transports/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=963112&r1=963111&r2=963112&view=diff
==
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Sun Jul 11 17:05:59 2010
@@ -285,26 +285,6 @@
 ${axis2.version}
 
 
-org.apache.ws.commons.axiom
-axiom-api
-${axiom.version}
-
-
-org.apache.ws.commons.axiom
-axiom-impl
-${axiom.version}
-
-
-org.apache.ws.commons.axiom
-axiom-dom
-${axiom.version}
-
-
-org.apache.geronimo.specs
-geronimo-ws-metadata_2.0_spec
-1.1.2
-
-
 javax.servlet
 servlet-api
 2.3
@@ -495,7 +475,6 @@
 
 
 
-1.2.9-SNAPSHOT
 SNAPSHOT
 false

svn commit: r963115 - /axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/endpoint/BasicEndpointTests.java

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 17:38:02 2010
New Revision: 963115

URL: http://svn.apache.org/viewvc?rev=963115&view=rev
Log:
AXIS2-4767: Don't try to download non existing WSDL from 
http://test.wsdl.com/Test.wsdl. Anyway, the content of the WSDL is never read 
in the test case.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/endpoint/BasicEndpointTests.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/endpoint/BasicEndpointTests.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/endpoint/BasicEndpointTests.java?rev=963115&r1=963114&r2=963115&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/endpoint/BasicEndpointTests.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/endpoint/BasicEndpointTests.java
 Sun Jul 11 17:38:02 2010
@@ -19,6 +19,7 @@
 
 package org.apache.axis2.jaxws.endpoint;
 
+import java.io.ByteArrayInputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
@@ -94,10 +95,9 @@ public class BasicEndpointTests extends 
 ep.publish("test");
 assertTrue("The endpoint was not published successfully", 
ep.isPublished());
 
-URL wsdl = new URL("http://test.wsdl.com/Test.wsdl";);
-String wsdlLocation = wsdl.toExternalForm();
+String wsdlLocation = "http://test.wsdl.com/Test.wsdl";; // Dummy URL
 List metadata = new ArrayList();
-Source source = new StreamSource(wsdl.openStream());  
+Source source = new StreamSource(new ByteArrayInputStream(new 
byte[0])); // Dummy content  
 source.setSystemId(wsdlLocation);  
 metadata.add(source);
 ep.setMetadata(metadata);

svn commit: r963147 - /axis/axis2/java/core/trunk/modules/parent/pom.xml

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 20:52:59 2010
New Revision: 963147

URL: http://svn.apache.org/viewvc?rev=963147&view=rev
Log:
Realign the versions of some dependencies to those used (and tested) by the 
Axiom project.

Modified:
axis/axis2/java/core/trunk/modules/parent/pom.xml

Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=963147&r1=963146&r2=963147&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Jul 11 20:52:59 2010
@@ -112,7 +112,7 @@
 1.4.0
 3.2.0
 1.1.8
-
1.0.1
+
1.0.2
 
1.1
 1.6
 1.0.1
@@ -142,7 +142,7 @@
 1.0.1
 wstx-asl
 org.codehaus.woodstox
-3.2.4
+3.2.9
 6.0.16
 1.6.2
 2.7.0

svn commit: r963148 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util/ modules/parent/

2010-07-11 Thread veithen 
Author: veithen
Date: Sun Jul 11 20:57:25 2010
New Revision: 963148

URL: http://svn.apache.org/viewvc?rev=963148&view=rev
Log:
Merged r963147 to the 1.5 branch.

Modified:
axis/axis2/java/core/branches/java/1_5/   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/   (props 
changed)

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:944347,944915,951385,963081
+/axis/axis2/java/core/trunk:944347,944915,951385,963081,963147
 
/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058,904780

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385,963081,963147
 
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058,904780

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385,963081,963147
 
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058,904780

Modified: axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml?rev=963148&r1=963147&r2=963148&view=diff
==
--- axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml Sun Jul 11 
20:57:25 2010
@@ -103,7 +103,7 @@
 1.4.0
 3.2.0
 1.1.8
-
1.0.1
+
1.0.2
 
1.1
 1.6
 1.0.1
@@ -137,7 +137,7 @@
 1.0.1
 wstx-asl
 org.codehaus.woodstox
-3.2.4
+3.2.9
 6.0.16
 1.0M8
 1.6.2

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385,963081,963147
 
/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,803725,834058,904780

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 11 20:57:25 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385,963081
+/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385,963081,963147
 
/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,803725,834058,904780

Propchange: axis/a