[axis-axis1-java] 03/08: Merged latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit e995dd6a69af8dcf6ce4267c1be1a2862b544154
Merge: cf18b49 9e16c33
Author: Andreas Veithen
AuthorDate: Fri Dec 7 17:23:31 2012 +
Merged latest changes from trunk.
.../tools/ant/wsdl/CustomGeneratorFactoryTest.java |2 +-
.../java/test/wsdl/clash/VerifyFilesTestCase.java |3 +-
.../java/test/wsdl/extra/ExtraClassesTestCase.java |3 +-
.../java/test/wsdl/filegen/AllOptionTestCase.java |3 +-
.../java/test/wsdl/filegen/FileGenTestCase.java|3 +-
.../test/java/test/wsdl/groups/GroupsTestCase.java |3 +-
.../java/test/wsdl/header/VerifyFilesTestCase.java |3 +-
.../literal/SalesRankNPrice_ServiceTestCase.java |3 +-
.../wsdl/multibinding/VerifyFilesTestCase.java |3 +-
.../wsdl/schemaImport/SchemaImportTestCase.java|3 +-
.../test/java/test/wsdl/split/SplitTestCase.java |3 +-
axis-codegen/pom.xml |9 +
.../apache/axis/wsdl/toJava/JavaDeployWriter.java | 326 +-
axis-model/model/axis.genmodel | 117 +
axis-model/model/soap.ecore|8 +
axis-model/model/wsdd.ecore| 209 ++
axis-model/model/xml.ecore |7 +
{axis => axis-model}/pom.xml | 76 +-
.../org/apache/axis/model/soap/SOAPFactory.java| 26 +
.../axis/model/soap/impl/SOAPFactoryImpl.java | 146 +
.../axis/model/soap/impl/SOAPPackageImpl.java | 302 ++
.../org/apache/axis/model/util/AxisXMLHelper.java | 106 +
.../apache/axis/model/util/AxisXMLResource.java| 67 +
.../org/apache/axis/model/wsdd/ArrayMapping.java | 53 +
.../org/apache/axis/model/wsdd/BeanMapping.java| 20 +
.../org/apache/axis/model/wsdd/DeployableItem.java | 78 +
.../org/apache/axis/model/wsdd/Deployment.java | 138 +
.../java/org/apache/axis/model/wsdd/Fault.java | 130 +
.../main/java/org/apache/axis/model/wsdd/Flow.java | 44 +
.../axis/model/wsdd/GlobalConfiguration.java | 20 +
.../java/org/apache/axis/model/wsdd/Handler.java | 79 +
.../java/org/apache/axis/model/wsdd/Mapping.java | 104 +
.../java/org/apache/axis/model/wsdd/Operation.java | 295 ++
.../apache/axis/model/wsdd/OperationParameter.java | 211 ++
.../java/org/apache/axis/model/wsdd/Parameter.java | 76 +
.../org/apache/axis/model/wsdd/ParameterMode.java | 194 ++
.../apache/axis/model/wsdd/Parameterizable.java| 51 +
.../java/org/apache/axis/model/wsdd/Service.java | 217 ++
.../java/org/apache/axis/model/wsdd/Transport.java | 79 +
.../org/apache/axis/model/wsdd/TypeMapping.java| 77 +
.../org/apache/axis/model/wsdd/WSDDFactory.java| 150 +
.../java/org/apache/axis/model/wsdd/WSDDUtil.java | 64 +
.../axis/model/wsdd/impl/ArrayMappingImpl.java | 153 +
.../axis/model/wsdd/impl/BeanMappingImpl.java | 41 +
.../axis/model/wsdd/impl/DeployableItemImpl.java | 222 ++
.../axis/model/wsdd/impl/DeploymentImpl.java | 354 +++
.../org/apache/axis/model/wsdd/impl/FaultImpl.java | 308 ++
.../org/apache/axis/model/wsdd/impl/FlowImpl.java | 145 +
.../model/wsdd/impl/GlobalConfigurationImpl.java | 41 +
.../apache/axis/model/wsdd/impl/HandlerImpl.java | 201 ++
.../apache/axis/model/wsdd/impl/MappingImpl.java | 257 ++
.../apache/axis/model/wsdd/impl/OperationImpl.java | 659 +
.../model/wsdd/impl/OperationParameterImpl.java| 462 +++
.../apache/axis/model/wsdd/impl/ParameterImpl.java | 205 ++
.../axis/model/wsdd/impl/ParameterizableImpl.java | 165 ++
.../apache/axis/model/wsdd/impl/ServiceImpl.java | 514
.../apache/axis/model/wsdd/impl/TransportImpl.java | 204 ++
.../axis/model/wsdd/impl/TypeMappingImpl.java | 203 ++
.../axis/model/wsdd/impl/WSDDFactoryImpl.java | 297 ++
.../axis/model/wsdd/impl/WSDDPackageImpl.java | 3110
.../java/org/apache/axis/model/xml/XmlFactory.java | 26 +
.../apache/axis/model/xml/impl/XmlFactoryImpl.java | 134 +
.../apache/axis/model/xml/impl/XmlPackageImpl.java | 258 ++
.../java/org/apache/axis/model/wsdd/LoadTest.java | 83 +-
axis-model/src/test/wsdd/client-config.wsdd| 13 +
axis-model/src/test/wsdd/schema2.wsdd | 83 +
.../src/test/wsdd}/server-config.wsdd | 171 +-
.../axis/deployment/wsdd/WSDDArrayMapping.java |8 +
.../axis/deployment/wsdd/WSDDDeployment.java | 55 +-
.../apache/axis/deployment/wsdd/WSDDService.java | 60 +-
.../axis/deployment/wsdd/WSDDTypeMapping.java | 69 +-
.../org/apache/axis/wsdl/symbolTable/Utils.java| 35 -
.../src/test/java/test/utils/TestMessages.java |3 +-
.../src/test/java/test/utils/TestSrcContent.java |3 +-
.../src/test/java/test/utils/TestXMLUtils.j
[axis-axis1-java] 06/08: Removed two files that should have been deleted by the last merge from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit 348b6bb4cf35dc4808fae3d2dc02dbaa876d8b53
Author: Andreas Veithen
AuthorDate: Mon Dec 10 12:39:58 2012 +
Removed two files that should have been deleted by the last merge from
trunk.
---
.../main/java/org/apache/axis/model/wsdd/Flow.java | 44 ---
.../org/apache/axis/model/wsdd/impl/FlowImpl.java | 145 -
2 files changed, 189 deletions(-)
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
b/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
deleted file mode 100644
index a0f5486..000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *
- *
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-
-
-/**
- *
- * A representation of the model object 'Flow'.
- *
- *
- *
- * The following features are supported:
- *
- * {@link org.apache.axis.model.wsdd.Flow#getHandlers
Handlers}
- *
- *
- *
- * @model
- * @generated
- */
-public interface Flow {
-
-/**
- * Returns the value of the 'Handlers' containment
reference list.
- * The list contents are of type {@link
org.apache.axis.model.wsdd.Handler}.
- *
- *
- * If the meaning of the 'Handlers' reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Handlers' containment reference list.
- * @model type="org.apache.axis.model.wsdd.Handler" containment="true"
- *extendedMetaData="name='handler' kind='element'
namespace='##targetNamespace'"
- * @generated
- */
-List getHandlers();
-} // Flow
diff --git
a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
deleted file mode 100644
index d94d913..000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- *
- *
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-import java.util.List;
-import org.apache.axis.model.wsdd.Flow;
-
-import org.apache.axis.model.wsdd.Handler;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- *
- * An implementation of the model object 'Flow'.
- *
- *
- * The following features are implemented:
- *
- * {@link org.apache.axis.model.wsdd.impl.FlowImpl#getHandlers
Handlers}
- *
- *
- *
- * @generated
- */
-public class FlowImpl extends EObjectImpl implements Flow {
-/**
- * The cached value of the '{@link #getHandlers() Handlers}'
containment reference list.
- *
- *
- * @see #getHandlers()
- * @generated
- * @ordered
- */
-protected EList handlers;
-
-/**
- *
- *
- * @generated
- */
-protected FlowImpl() {
-super();
-}
-
-/**
- *
- *
- * @generated
- */
-protected EClass eStaticClass() {
-return WSDDPackageImpl.Literals.FLOW;
-}
-
-/**
- *
- *
- * @generated
- */
-public List getHandlers() {
-if (handlers == null) {
-handlers = new BasicInternalEList(Handler.class);
-}
-return handlers;
-}
-
-/**
- *
- *
- * @generated
- */
-public NotificationChain eInverseRemove(InternalEObject otherEnd, int
featureID, NotificationChain msgs) {
-switch (featureID) {
-case WSDDPackageImpl.FLOW__HANDLERS:
-return ((InternalEList)getHandlers()).basicRemove(otherEnd,
msgs);
-}
-return super.eInverseRemove(otherEnd, featureID, msgs);
-}
-
-/**
- *
- *
- * @generated
- */
-public Object eGet(int featureID, boolean resolve, boolean coreType) {
-switch (featureID) {
-case WSDDPackageImpl.FLOW__HANDLERS:
-return getHandlers();
-}
-return super.eGet(featureID, resolve, coreType);
-}
-
-/**
- *
- *
- * @generated
- */
-public void eSet(int featureID, Object newValue) {
-switch (featureID) {
-case WSDDPackageImpl.FLOW__HANDLERS:
-getHandlers().clear();
-getHandlers().addAll((Collection)newValue);
-return;
-}
-super.eSet(featureID, newValue);
-}
[axis-axis1-java] 01/08: Created a development branch to work on AXIS-2882.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS-2882 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit a4e0151a43f96247638cb3c6f2d8c0ee53d28b4f Author: Andreas Veithen AuthorDate: Sun Nov 18 16:32:51 2012 + Created a development branch to work on AXIS-2882.
[axis-axis1-java] 02/08: Some initial changes.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit cf18b499c4e400f6e2bc6803a7f14b9956fb
Author: Andreas Veithen
AuthorDate: Sun Nov 18 17:28:33 2012 +
Some initial changes.
---
.../src/main/java/org/apache/axis/client/Call.java | 51 ++
.../main/java/org/apache/axis/client/Service.java | 10 ++---
2 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
index 9a0ce97..aaadedc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
@@ -82,6 +82,8 @@ import javax.xml.soap.SOAPMessage;
import java.io.StringWriter;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -332,17 +334,17 @@ public class Call implements javax.xml.rpc.Call {
/**
* Build a call from a URL string.
*
- * This is handy so that you don't have to manually call Call.initialize()
- * in order to register custom transports. In other words, whereas doing
- * a new URL("local:...") would fail, new Call("local:...") works because
- * we do the initialization of our own and any configured custom
protocols.
- *
* @param url the target endpoint URL
* @exception MalformedURLException
*/
public Call(String url) throws MalformedURLException {
this(new Service());
-setTargetEndpointAddress(new URL(url));
+try {
+setTargetEndpointAddress(new URI(url));
+} catch (URISyntaxException ex) {
+// The method used to use new URL(...). Need this to ensure source
code compatibility:
+throw new MalformedURLException(ex.getMessage());
+}
}
/**
@@ -803,31 +805,47 @@ public class Call implements javax.xml.rpc.Call {
* as URI
*/
public void setTargetEndpointAddress(String address) {
-URL urlAddress;
+// Special case: Since Axis 1.4 used java.net.URL, it accepted
":" (e.g. "local:")
+// as a valid URL. However this is not a valid URI. If we encounter
this case, we add a
+// slash to make it a valid URI: ":/".
+if (address.indexOf(':') == address.length() - 1) {
+address += '/';
+}
try {
-urlAddress = new URL(address);
+setTargetEndpointAddress(new URI(address));
}
-catch (MalformedURLException mue) {
+catch (URISyntaxException mue) {
throw new JAXRPCException(mue);
}
-setTargetEndpointAddress(urlAddress);
}
/**
* Sets the URL of the target Web Service.
+ *
+ * Note: Not part of JAX-RPC specification.
*
+ * @param address URL of the target Web Service
+ */
+public void setTargetEndpointAddress(URL address) {
+// Note: the URL#toURI method is not available in Java 1.4
+setTargetEndpointAddress(address == null ? null : address.toString());
+}
+
+/**
+ * Sets the URL of the target Web Service.
+ *
* Note: Not part of JAX-RPC specification.
*
* @param address URL of the target Web Service
*/
-public void setTargetEndpointAddress(java.net.URL address) {
+public void setTargetEndpointAddress(URI address) {
try {
if ( address == null ) {
setTransport(null);
return ;
}
-String protocol = address.getProtocol();
+String protocol = address.getScheme();
// Handle the case where the protocol is the same but we
// just want to change the URL - if so just set the URL,
@@ -840,8 +858,8 @@ public class Call implements javax.xml.rpc.Call {
if ( this.transport != null ) {
String oldAddr = this.transport.getUrl();
if ( oldAddr != null && !oldAddr.equals("") ) {
-URL tmpURL = new URL( oldAddr );
-String oldProto = tmpURL.getProtocol();
+URI tmpURL = new URI( oldAddr );
+String oldProto = tmpURL.getScheme();
if ( protocol.equals(oldProto) ) {
this.transport.setUrl( address.toString() );
return ;
@@ -1623,7 +1641,7 @@ public class Call implements javax.xml.rpc.Call {
}
// we reinitialize target endpoint only if we have wsdl
-this.setTargetEndpointAddress( (URL) null );
+
[axis-axis1-java] 07/08: More work on AXIS-2882.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit aa4f91675de1abf2d6f5c658ab0cc9cf083c2dc6
Author: Andreas Veithen
AuthorDate: Mon Dec 10 14:00:31 2012 +
More work on AXIS-2882.
---
.../axis/wsdl/toJava/JavaServiceImplWriter.java| 32 ++
.../apache/axis/wsdl/toJava/JavaStubWriter.java| 11 +++
.../apache/axis/utils/DummyURLStreamHandler.java | 31 ++
.../main/java/org/apache/axis/utils/IOUtils.java | 18 ++
.../java/org/apache/axis/utils/IOUtilsTest.java| 38 ++
.../main/java/samples/jms/stub/JMSURLStubTest.java | 6 +---
6 files changed, 131 insertions(+), 5 deletions(-)
diff --git
a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
index 1bfaa7b..43266b7 100644
---
a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
+++
b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
@@ -256,6 +256,8 @@ public class JavaServiceImplWriter extends JavaClassWriter {
writeGetPortName(pw, bindingType, portName);
writeGetPortNameURL(pw, bindingType, portName, stubClass,
wsddServiceName);
+writeGetPortNameString(pw, bindingType, portName, stubClass,
+wsddServiceName);
writeSetPortEndpointAddress(pw, portName);
}
@@ -410,6 +412,36 @@ public class JavaServiceImplWriter extends JavaClassWriter
{
}// writeGetPortNameURL
/**
+ * Write the get(String) method.
+ *
+ * @param pw
+ * @param bindingType
+ * @param portName
+ * @param stubClass
+ * @param wsddServiceName
+ */
+protected void writeGetPortNameString(PrintWriter pw, String bindingType,
+ String portName, String stubClass,
+ String wsddServiceName) {
+
+pw.println("public " + bindingType + " get" + portName
++ "(java.lang.String portAddress) throws "
++ javax.xml.rpc.ServiceException.class.getName() + " {");
+pw.println("try {");
+pw.println("" + stubClass + " _stub = new " + stubClass
++ "(portAddress, this);");
+pw.println("_stub.setPortName(get" + wsddServiceName
++ "());");
+pw.println("return _stub;");
+pw.println("}");
+pw.println("catch (org.apache.axis.AxisFault e) {");
+pw.println("return null;");
+pw.println("}");
+pw.println("}");
+pw.println();
+}// writeGetPortNameURL
+
+/**
* Write the setEndpointAddress(String) method.
*
* @param pw
diff --git
a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
index a93cd98..83666a1 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
@@ -189,6 +189,17 @@ public class JavaStubWriter extends JavaClassWriter {
pw.println();
pw.println(
"public " + className
++ "(java.lang.String endpoint, javax.xml.rpc.Service service)
throws org.apache.axis.AxisFault {");
+pw.println(" this(service);");
+pw.println(" try {");
+pw.println(" super.cachedEndpoint =
org.apache.axis.utils.IOUtils.toURL(endpoint);");
+pw.println(" } catch (java.net.MalformedURLException ex) {");
+pw.println(" throw
org.apache.axis.AxisFault.makeFault(ex);");
+pw.println(" }");
+pw.println("}");
+pw.println();
+pw.println(
+"public " + className
+ "(javax.xml.rpc.Service service) throws
org.apache.axis.AxisFault {");
pw.println("if (service == null) {");
pw.println(
diff --git
a/axis-rt-core/src/main/java/org/apache/axis/utils/DummyURLStreamHandler.java
b/axis-rt-core/src/main/java/org/apache/axis/utils/DummyURLStreamHandler.java
new file mode 100644
index 000..328629e
--- /dev/null
+++
b/axis-rt-core/src/main/java/org/apache/axis/utils/DummyURLStreamHandler.jav
[axis-axis1-java] branch AXIS-2882 created (now 8f7b440)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch AXIS-2882 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at 8f7b440 More work on AXIS-2882. This branch includes the following new commits: new a4e0151 Created a development branch to work on AXIS-2882. new cf18b49 Some initial changes. new e995dd6 Merged latest changes from trunk. new 985dac4 More work on AXIS-2882. new a629d1a Merged latest changes from trunk. new 348b6bb Removed two files that should have been deleted by the last merge from trunk. new aa4f916 More work on AXIS-2882. new 8f7b440 More work on AXIS-2882. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis1-java] 05/08: Merged latest changes from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit a629d1a6c9cb3e41ee2ce54edc28d77f27e33155
Merge: 985dac4 e0bde98
Author: Andreas Veithen
AuthorDate: Mon Dec 10 12:01:10 2012 +
Merged latest changes from trunk.
axis-model/model/wsdd.ecore| 62 +--
.../java/org/apache/axis/model/wsdd/Chain.java | 97
.../org/apache/axis/model/wsdd/DeployableItem.java | 12 +-
.../org/apache/axis/model/wsdd/Deployment.java | 2 +-
.../apache/axis/model/wsdd/MappingContainer.java | 77 +++
.../java/org/apache/axis/model/wsdd/Service.java | 53 +-
.../axis/model/wsdd/WSDDExtendedMetaData.java | 31 +-
.../org/apache/axis/model/wsdd/WSDDFactory.java| 27 +-
.../java/org/apache/axis/model/wsdd/WSDDUtil.java | 58 ++-
.../org/apache/axis/model/wsdd/impl/ChainImpl.java | 257 ++
.../axis/model/wsdd/impl/DeployableItemImpl.java | 30 +-
.../axis/model/wsdd/impl/DeploymentImpl.java | 7 +-
.../axis/model/wsdd/impl/MappingContainerImpl.java | 223
.../apache/axis/model/wsdd/impl/ServiceImpl.java | 171 ---
.../axis/model/wsdd/impl/WSDDFactoryImpl.java | 33 +-
.../axis/model/wsdd/impl/WSDDPackageImpl.java | 561 ++---
.../apache/axis/model/wsdd/DeprecationTest.java| 30 +-
.../axis/model/wsdd/languageSpecificType.wsdd | 8 +
axis-model/src/test/wsdd/bidbuy.wsdd | 23 +
axis-model/src/test/wsdd/stock.wsdd| 31 ++
.../META-INF/axis/default-server-config.wsdd | 0
axis-rt-transport-http-javanet/pom.xml | 6 -
.../server/standalone/StandaloneAxisServer.java| 1 -
.../server/standalone/StandaloneAxisServlet.java | 4 -
.../pom.xml| 48 +-
.../axis/tools/daemon/ControlConnectionReader.java | 76 +++
.../axis/tools/daemon/DaemonContextImpl.java | 32 +-
.../org/apache/axis/tools/daemon/Launcher.java | 101
.../axis/tools/daemon/LauncherException.java | 11 +-
distribution/src/main/assembly/bin.xml | 12 +
integration/pom.xml| 11 -
maven/maven-axis-server-plugin/pom.xml | 22 +
.../maven/server/AbstractStartProcessMojo.java | 157 +-
...rtAction.java => AxisServerProcessControl.java} | 17 +-
.../tools/maven/server/DaemonProcessControl.java | 74 +++
.../tools/maven/server/DefaultProcessManager.java | 10 +-
.../axis/tools/maven/server/ManagedProcess.java| 10 +-
...{ProcessStopAction.java => ProcessControl.java} | 32 +-
.../axis/tools/maven/server/ProcessManager.java| 2 +-
...{StartProcessMojo.java => StartDaemonMojo.java} | 29 +-
.../axis/tools/maven/server/StartServerMojo.java | 120 +++--
.../axis/tools/maven/wsdd/GenerateWSDDMojo.java| 42 +-
.../maven/wsdl2java/AbstractWsdl2JavaMojo.java | 9 +-
pom.xml| 42 ++
samples/addr-sample/pom.xml| 6 -
samples/attachments-sample/pom.xml | 8 +-
samples/bidbuy-sample/pom.xml | 5 -
samples/encoding-sample/pom.xml| 7 +-
samples/faults-sample/pom.xml | 7 +-
samples/handler-sample/pom.xml | 5 -
samples/jaxrpc-sample/pom.xml | 9 +-
samples/jms-sample/pom.xml | 207
.../src/main/java}/samples/jms/JMSTest.java| 1 +
.../src/main/java}/samples/jms/dii/JMSURLTest.java | 29 +-
.../java}/samples/jms/stub/JMSURLStubTest.java | 21 +-
.../jms-sample/src/main/wsdd}/client-config.wsdd | 0
.../jms-sample/src/main/wsdd}/server-config.wsdd | 0
.../jms-sample/src/main/wsdl}/GetQuote.wsdl| 0
.../conf/activemq-connection-factory.properties| 3 +
.../src/test/java/samples/jms/ActiveMQDaemon.java | 32 +-
samples/message-sample/pom.xml | 7 +-
samples/misc-sample/pom.xml| 7 +-
samples/pom.xml| 1 +
samples/proxy-sample/pom.xml | 5 -
samples/stock-sample/pom.xml | 12 +-
samples/transport-sample/pom.xml | 9 +-
.../java/samples/transport/tcp/TCPListener.java| 6 +-
.../samples/transport/tcp/TCPListenerDaemon.java | 31 +-
68 files changed, 2311 insertions(+), 768 deletions(-)
[axis-axis1-java] branch EMF created (now 7e8720a)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch EMF in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at 7e8720a Fixed a build failure. No new revisions were added by this update.
[axis-axis1-java] 08/08: More work on AXIS-2882.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit 8f7b440d1b64ec4108eded50a2cde7742544d129
Author: Andreas Veithen
AuthorDate: Mon Dec 10 15:50:26 2012 +
More work on AXIS-2882.
---
.../src/main/java/org/apache/axis/transport/local/LocalSender.java | 7 ---
samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java | 7 +--
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git
a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
index 1e9cec0..26962fb 100644
---
a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
+++
b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
@@ -26,10 +26,11 @@ import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPFault;
import org.apache.axis.server.AxisServer;
+import org.apache.axis.utils.IOUtils;
import org.apache.axis.utils.Messages;
import org.apache.commons.logging.Log;
-import java.net.URL;
+import java.net.URI;
/**
* This is meant to be used on a SOAP Client to call a SOAP server.
@@ -114,8 +115,8 @@ public class LocalSender extends BasicHandler {
String transURL = clientContext.getStrProp(MessageContext.TRANS_URL);
if (transURL != null) {
try {
-URL url = new URL(transURL);
-String file = url.getFile();
+URI url = IOUtils.toURI(transURL);
+String file = url.getPath();
if (file.length()>0 && file.charAt(0)=='/') {
file = file.substring(1);
}
diff --git a/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
b/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
index 409ba46..b79f63c 100644
--- a/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
+++ b/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
@@ -108,8 +108,7 @@ public class JMSURLTest {
try
{
-java.net.URL jmsurl = new java.net.URL(sampleJmsUrl);
-call.setTargetEndpointAddress(jmsurl);
+call.setTargetEndpointAddress(sampleJmsUrl);
// set additional params on the call if desired
call.setUsername(username);
@@ -118,10 +117,6 @@ public class JMSURLTest {
res = (Float) call.invoke(new Object[] {ticker});
}
-catch (java.net.MalformedURLException e)
-{
-throw new AxisFault("Invalid JMS URL", e);
-}
catch (java.rmi.RemoteException e)
{
throw new AxisFault("Failed in getQuote()", e);
[axis-axis1-java] branch trunk created (now a596f2c)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at a596f2c AXIS-2295 Apply community suggested fixes to http proxy parameters caching mechanism No new revisions were added by this update.
[axis-axis1-java] branch AXIS-1984 created (now 8c587d3)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch AXIS-1984 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at 8c587d3 Attempting to fix mergeinfo. No new revisions were added by this update.
[axis-axis1-java] 04/08: More work on AXIS-2882.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit 985dac4296711ebc81ff789c90dbaa97db5986d6
Author: Andreas Veithen
AuthorDate: Fri Dec 7 20:24:34 2012 +
More work on AXIS-2882.
---
.../java/org/apache/axis/client/AdminClient.java | 13 +++-
.../src/main/java/org/apache/axis/client/Call.java | 15 --
.../main/java/org/apache/axis/client/Service.java | 4 +--
.../main/java/org/apache/axis/utils/IOUtils.java | 24 +++
.../main/java/org/apache/axis/utils/Options.java | 17 ++-
.../java/samples/transport/tcp/AdminClient.java| 1 -
.../main/java/samples/transport/tcp/GetQuote.java | 4 +--
.../main/java/samples/transport/tcp/Handler.java | 35 --
.../java/samples/transport/tcp/TCPTransport.java | 12
.../test/functional/TestTCPTransportSample.java| 3 +-
10 files changed, 62 insertions(+), 66 deletions(-)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
b/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
index 319d145..d06b890 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
@@ -21,6 +21,7 @@ import org.apache.axis.EngineConfiguration;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.deployment.wsdd.WSDDConstants;
import org.apache.axis.message.SOAPBodyElement;
+import org.apache.axis.utils.IOUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.Options;
import org.apache.axis.utils.StringUtils;
@@ -30,6 +31,7 @@ import javax.xml.rpc.ServiceException;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.net.URI;
import java.net.URL;
import java.util.Vector;
@@ -346,7 +348,7 @@ public class AdminClient
throw new Exception(Messages.getMessage("nullCall00"));
}
-URL address = new URL(opts.getURL());
+URI address = IOUtils.toURI(opts.getURL());
setTargetEndpointAddress(address);
setLogin(opts.getUser(), opts.getPassword());
@@ -375,6 +377,15 @@ public class AdminClient
}
/**
+ * set the URL to deploy to
+ * requires that call!=null
+ * @param address
+ */
+public void setTargetEndpointAddress(URI address) {
+call.setTargetEndpointAddress( address );
+}
+
+/**
* set the transport to deploy with.
* requires that call!=null
* @param transportName a null or empty value does not trigger a setting
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
index aaadedc..80702ff 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
@@ -51,6 +51,7 @@ import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.transport.http.HTTPTransport;
import org.apache.axis.utils.ClassUtils;
+import org.apache.axis.utils.IOUtils;
import org.apache.axis.utils.JavaUtils;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.LockableHashtable;
@@ -340,7 +341,7 @@ public class Call implements javax.xml.rpc.Call {
public Call(String url) throws MalformedURLException {
this(new Service());
try {
-setTargetEndpointAddress(new URI(url));
+setTargetEndpointAddress(IOUtils.toURI(url));
} catch (URISyntaxException ex) {
// The method used to use new URL(...). Need this to ensure source
code compatibility:
throw new MalformedURLException(ex.getMessage());
@@ -805,14 +806,8 @@ public class Call implements javax.xml.rpc.Call {
* as URI
*/
public void setTargetEndpointAddress(String address) {
-// Special case: Since Axis 1.4 used java.net.URL, it accepted
":" (e.g. "local:")
-// as a valid URL. However this is not a valid URI. If we encounter
this case, we add a
-// slash to make it a valid URI: ":/".
-if (address.indexOf(':') == address.length() - 1) {
-address += '/';
-}
try {
-setTargetEndpointAddress(new URI(address));
+setTargetEndpointAddress(IOUtils.toURI(address));
}
catch (URISyntaxException mue) {
throw new JAXRPCException(mue);
@@ -858,7 +853,7 @@ public class Call implements javax.xml.rpc.Call {
if ( this.transport != null ) {
String oldAddr = this.transport.getUrl();
if ( oldAddr != null && !oldAddr.equals("") ) {
-
[axis-axis1-java] tag 1.2.1 created (now 4c895e9)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to tag 1.2.1 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at 4c895e9 (commit) This tag includes the following new commits: new 77c92a2 This commit was manufactured by cvs2svn to create branch 'AXIS_1_2_1_FINAL'. new c07d27c Move Axis 1.X new 4c895e9 Moving the Axis 1.2.1 branch/tag. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis1-java] 07/07: Moving the Axis 1.3 branch/tag.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.3 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 18eca4b9835f84f4208772e164c86669e47a8a03 Author: Andreas Veithen AuthorDate: Sat Jan 7 17:15:17 2012 + Moving the Axis 1.3 branch/tag.
[axis-axis1-java] 03/07: fix target jvm
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.3 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 56de3a58865cdefcc2096e683159077439191b65 Author: Davanum Srinivas AuthorDate: Thu Sep 29 03:43:53 2005 + fix target jvm --- build.xml | 1 + xmls/properties.xml | 1 + xmls/targets.xml| 1 + 3 files changed, 3 insertions(+) diff --git a/build.xml b/build.xml index 980bce3..5e22433 100644 --- a/build.xml +++ b/build.xml @@ -95,6 +95,7 @@ Copyright: diff --git a/xmls/properties.xml b/xmls/properties.xml index 867cf29..3e7c3f9 100644 --- a/xmls/properties.xml +++ b/xmls/properties.xml @@ -30,6 +30,7 @@ + diff --git a/xmls/targets.xml b/xmls/targets.xml index 01ab57b..a7ac2d9 100644 --- a/xmls/targets.xml +++ b/xmls/targets.xml @@ -374,6 +374,7 @@ +
[axis-axis1-java] 01/07: Branch for Axis 1.3 Final
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.3 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit fdcf0d16319a96baeb3f088625f618d626f10d9b Author: Davanum Srinivas AuthorDate: Mon Sep 26 15:15:24 2005 + Branch for Axis 1.3 Final
[axis-axis1-java] 05/07: fix changelog html
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to tag 1.3
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit 1f573f0e3eacc400ea0195d7bf79d03771d14e58
Author: Davanum Srinivas
AuthorDate: Tue Oct 4 03:46:12 2005 +
fix changelog html
---
changelog.html | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/changelog.html b/changelog.html
index e034e48..aa36c25 100644
--- a/changelog.html
+++ b/changelog.html
@@ -18,21 +18,22 @@ h1 { margin-left: -30px}
Axis 1.3
-Changes from 1.2final
-Support Axis inside Applets
-Upgrade versions of dependency jars
-Updated xmlbeans serializer/deserializer
-Fixes for SAAJ
-Fixes for Code Generation
-Fixes for tools
-Fixes for Runtime
-Fixes for Performance
-Fixes for various attachments problems
-Fixes for Memory Leaks
-Cleanup support for JavaBeans with array-type properties
-Extract attachment streams directly from http request (w/o intermediate
files)
-GC Fixes for long standing servers (Geronimo)
-Preliminary support for MTOM
+Changes from 1.2.1 final
+
+Support Axis inside Applets
+Upgrade versions of dependency jars
+Updated xmlbeans serializer/deserializer
+Fixes for SAAJ
+Fixes for Code Generation
+Fixes for tools
+Fixes for Runtime
+Fixes for Performance
+Fixes for various attachments problems
+Fixes for Memory Leaks
+Cleanup support for JavaBeans with array-type properties
+Extract attachment streams directly from http request (w/o intermediate
files)
+GC Fixes for long standing servers (Geronimo)
+Preliminary support for MTOM
Axis 1.2.1
[axis-axis1-java] 04/07: Update release notes for 1.3.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to tag 1.3
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit 8dd89ddd559f2e66ca412e12ce76790135343737
Author: Glen Daniels
AuthorDate: Sun Oct 2 18:22:07 2005 +
Update release notes for 1.3.
---
release-notes.html | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/release-notes.html b/release-notes.html
index 80f6355..baa7875 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -14,18 +14,16 @@ h1 { margin-left: -30px}
-Axis 1.2 Release Notes
+Axis 1.3 Release Notes
-This is the http://ws.apache.org/axis/releases.html";>1.2
release
+This is the http://ws.apache.org/axis/releases.html";>1.3
release
of the http://ws.apache.org/axis";>Axis SOAP toolkit.
About this release
-This is the Final release of Axis 1.2. Please kick the tires,
+This is the Final release of Axis 1.3. Please kick the tires,
put it through it's paces, and let us know via our mailing lists or
http://issues.apache.org/jira/browse/AXIS";>bug tracking system if
there are problems.
-Please Note: It's been much too long between 1.1 and 1.2, and
as such we are releasing 1.2 in order to distribute an "official" release
incorporating all the fixes and improvements. We do realize that there are
still some issues to be resolved, and we expect to follow the "release early
and often" mantra in a much more rigorous way than we have been over the past
year. The net of this : expect to see a follow-on 1.2.1 or 1.3 release
sometime soon as well.
-
Change History
Here is the change log (a high-level list of
changes). You can also read the cvs change log
(which lists actual diffs).
JAX-RPC
[axis-axis1-java] 05/05: Moving the Axis 1.2 branch/tag.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 7a8af6bc105755c61697e7998262daa846f15da6 Author: Andreas Veithen AuthorDate: Sat Jan 7 17:50:32 2012 + Moving the Axis 1.2 branch/tag.
[axis-axis1-java] 04/05: Move Axis 1.X
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit e143b2b0eed3e2c271dc1afca8648a7090a39178 Author: Davanum Srinivas AuthorDate: Tue Aug 30 19:13:52 2005 + Move Axis 1.X
[axis-axis1-java] 02/03: Move Axis 1.X
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2.1 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit c07d27c2476597f249055e05820a28af042fba60 Author: Davanum Srinivas AuthorDate: Tue Aug 30 19:13:52 2005 + Move Axis 1.X
[axis-axis1-java] 01/03: This commit was manufactured by cvs2svn to create branch 'AXIS_1_2_1_FINAL'.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2.1 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 77c92a2610621c51d4bb8e989baf04e24da05a76 Author: dev-n...@apache.org AuthorDate: Wed Jun 15 02:47:53 2005 + This commit was manufactured by cvs2svn to create branch 'AXIS_1_2_1_FINAL'.
[axis-axis1-java] tag 1.3 created (now 18eca4b)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to tag 1.3 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at 18eca4b (commit) This tag includes the following new commits: new fdcf0d1 Branch for Axis 1.3 Final new 35532cc Sync with HEAD new 56de3a5 fix target jvm new 8dd89dd Update release notes for 1.3. new 1f573f0 fix changelog html new 4afa2aa Tiny HTML fix new 18eca4b Moving the Axis 1.3 branch/tag. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis1-java] tag 1.2 created (now 7a8af6b)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to tag 1.2 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at 7a8af6b (commit) This tag includes the following new commits: new 940ef10 This commit was manufactured by cvs2svn to create branch 'axis1_2'. new 284c8f2 updating license new d5004bd Merging over HEAD changes to 1.2 branch new e143b2b Move Axis 1.X new 7a8af6b Moving the Axis 1.2 branch/tag. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis1-java] 03/05: Merging over HEAD changes to 1.2 branch
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to tag 1.2
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit d5004bdb8b7b865a99c2e2d433bac0d42ca6b668
Author: Glen Daniels
AuthorDate: Tue May 3 18:16:43 2005 +
Merging over HEAD changes to 1.2 branch
---
changelog.html | 17 -
docs/reference.html | 17 +
release-notes.html | 8 +---
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/changelog.html b/changelog.html
index bda2f01..7f1ddaf 100644
--- a/changelog.html
+++ b/changelog.html
@@ -16,7 +16,22 @@ h1 { margin-left: -30px}
Axis Change Log
-Axis 1.2 beta 3
+Axis 1.2
+
+Changes from 1.2rc3
+
+ Tons of changes to typemapping system to better support jax-rpc1.1 and
.NET
+ Improved SAAJ 1.2 support
+ Much better for rpc/lit and doc/lit (especially for arrays)
+ Map schema "wrapped" arrays (with inner <item> elements) into
arrays of the item type, instead of JavaBeans, by default. Introduce the "-w"
or "--wrapArrays" option to WSDL2Java to switch back to the earlier behavior.
+ Fix some WS-I related bugs. Makes it easier to deploy WS-I BP compatible
services.
+ Internationalized happyaxis jsp pages.
+ Updated to latest dependency jars. (ex wsdl4j-1.5.1.jar)
+ Improved commons httpclient support.
+ Support for sending and receiving multiple cookies
+ Lots of fixes for performance enhancements (including eliminating
ThreadLocal's)
+ Improved JMX support - Start/Stop server/services and deploy/modify
services
+
Changes from 1.2beta2
diff --git a/docs/reference.html b/docs/reference.html
index c11bb81..5fd64ce 100644
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -126,6 +126,10 @@ password to access the WSDL-URI
<argument>
use this as the implementation class
+ -w, --wrapArrays
+
+
+Prefer generating JavaBean classes like "ArrayOfString" for certain
schema array patterns (default is to use String [])
-h, --help
Print the usage statement and exit
@@ -284,6 +288,19 @@ that your implementation class implements the port type
name interface generated
by wsdl2java. You should also make sure that all your exported methods
throws
java.lang.RemoteException.
+ -w, --wrapArrays
+When processing a schema like this:
+
+<element name="array">
+ <complexType>
+ <sequence>
+ <element name="item" type="xs:string"/>
+ </sequence>
+ </complexType>
+</element>
+
+The default behavior (as of Axis 1.2 final) is to map this XML construct to a
Java String array (String[]). If you would rather a specific JavaBean class
(i.e. ArrayOfString) be generated for these types of schemas, you may specify
the -w or --wrapArrays option.
+
Java2WSDL Reference
Here is the help message generated from the current tool:
diff --git a/release-notes.html b/release-notes.html
index 52a5819..80f6355 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -22,10 +22,12 @@ h1 { margin-left: -30px}
About this release
This is the Final release of Axis 1.2. Please kick the tires,
put it through it's paces, and let us know via our mailing lists or
-bug tracking system if there are problems.
+http://issues.apache.org/jira/browse/AXIS";>bug tracking system if
there are problems.
+
+Please Note: It's been much too long between 1.1 and 1.2, and
as such we are releasing 1.2 in order to distribute an "official" release
incorporating all the fixes and improvements. We do realize that there are
still some issues to be resolved, and we expect to follow the "release early
and often" mantra in a much more rigorous way than we have been over the past
year. The net of this : expect to see a follow-on 1.2.1 or 1.3 release
sometime soon as well.
Change History
-Click to read the cvs change log.
+Here is the change log (a high-level list of
changes). You can also read the cvs change log
(which lists actual diffs).
JAX-RPC
This release is intended to be 100% compliant with the http://java.sun.com/xml/jaxrpc";>JAX-RPC
and http://java.sun.com/xml/saaj/";>SAAJ specifications from
Sun.
@@ -39,7 +41,7 @@ bug tracking system if there are problems.
How You Can Help
Coding, testing, and helping to answer questions on axis-user are all
greatly
appreciated. We particularly encourage you to submit improvements to the
documentation,
- however large or small and in any format, to axis-...@ws.apache.org. Also,
+ however large or small and in any format, to mailto:axis-...@ws.apache.org";>axis-...@ws.apache.org. Also,
interoperability is always a concern, so please report all replicable
bugs.
Thanks for your interest in Axis!
[axis-axis1-java] 02/05: updating license
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 284c8f2b8fe5a9ab1ab7bf8b7312b7efbbe3bf2c Author: Davanum Srinivas AuthorDate: Tue May 3 10:47:36 2005 + updating license --- LICENSE | 218 +++- 1 file changed, 203 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index d90fc12..6b0b127 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,203 @@ -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed 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. - */ \ No newline at end of file + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Su
[axis-axis1-java] 01/05: This commit was manufactured by cvs2svn to create branch 'axis1_2'.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 940ef1026b066cd22840eca460b67516f970e80a Author: dev-n...@apache.org AuthorDate: Mon May 2 19:49:11 2005 + This commit was manufactured by cvs2svn to create branch 'axis1_2'.
[axis-axis1-java] 06/07: Tiny HTML fix
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to tag 1.3
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit 4afa2aa9ef69465c37c5740bc3af7b7d9e0c6386
Author: Glen Daniels
AuthorDate: Thu Oct 6 15:22:57 2005 +
Tiny HTML fix
---
changelog.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/changelog.html b/changelog.html
index aa36c25..2175ea3 100644
--- a/changelog.html
+++ b/changelog.html
@@ -39,7 +39,8 @@ h1 { margin-left: -30px}
Axis 1.2.1
Changes from 1.2final
- Cleanup array handling for rpc/lit and doc/lit
+
+ Cleanup array handling for rpc/lit and doc/lit
Enhancements to HTTPSender/CommonsHTTPSender (including better cookie
support)
Generate array of wrappers for soapenc array nillable elements
Better handling of elementFormDefault during dynamic wsdl generation
[axis-axis1-java] 03/03: Moving the Axis 1.2.1 branch/tag.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to tag 1.2.1 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git commit 4c895e93c6f89087057c44d2ea5baf51aee83d76 Author: Andreas Veithen AuthorDate: Sat Jan 7 17:22:58 2012 + Moving the Axis 1.2.1 branch/tag.
[axis-axis1-java] tag 1.4 created (now d525846)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to tag 1.4 in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git. at d525846 (commit) No new revisions were added by this update.
[axis-axis2-java-core] branch AXIS2-5308 created (now ed56889)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch AXIS2-5308 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at ed56889 Some initial code for AXIS2-5308. This branch includes the following new commits: new 36ef147 Create branch to work on AXIS2-5308. new ed56889 Some initial code for AXIS2-5308. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-core] 02/02: Some initial code for AXIS2-5308.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-5308
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit ed568896db884ef98e5addaa64eaf80ccc3c5833
Author: Andreas Veithen
AuthorDate: Sun Jan 17 20:40:16 2016 +
Some initial code for AXIS2-5308.
---
.../axis2/jaxws/message/impl/MessageImpl.java | 33 ++-
.../axis2/jaxws/message/impl/XMLPartImpl.java | 8 +++-
.../axis2/jaxws/message/util/SAAJConverter.java| 12 --
.../jaxws/message/util/impl/SAAJConverterImpl.java | 47 +-
.../axis2/jaxws/message/SAAJConverterTests.java| 6 +--
.../src/org/apache/axis2/builder/MTOMBuilder.java | 3 --
6 files changed, 60 insertions(+), 49 deletions(-)
diff --git
a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
index 723c897..88b746c 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
@@ -48,7 +48,6 @@ import javax.activation.DataHandler;
import javax.jws.soap.SOAPBinding.Style;
import javax.xml.namespace.QName;
import javax.xml.soap.AttachmentPart;
-import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPEnvelope;
@@ -57,8 +56,6 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -188,36 +185,13 @@ public class MessageImpl implements Message {
// Get OMElement from XMLPart.
OMElement element = xmlPart.getAsOMElement();
+SOAPMessage soapMessage =
getSAAJConverter().toSAAJ((org.apache.axiom.soap.SOAPEnvelope)element, false);
+
// Get the namespace so that we can determine SOAP11 or SOAP12
OMNamespace ns = element.getNamespace();
-ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-element.serialize(outStream);
-
-// In some cases (usually inbound) the builder will not be closed
after
-// serialization. In that case it should be closed manually.
-if (element.getBuilder() != null &&
!element.getBuilder().isCompleted()) {
-element.close(false);
-}
-
-byte[] bytes = outStream.toByteArray();
-
-if (log.isDebugEnabled()) {
-String text = new String(bytes);
-log.debug(" inputstream = " + text);
-}
-
-// Create InputStream
-ByteArrayInputStream inStream = new ByteArrayInputStream(bytes);
-
-// Create MessageFactory that supports the version of SOAP in the
om element
-MessageFactory mf =
getSAAJConverter().createMessageFactory(ns.getNamespaceURI());
-
-// Create soapMessage object from Message Factory using the input
-// stream created from OM.
-
// Get the MimeHeaders from the transportHeaders map
-MimeHeaders defaultHeaders = new MimeHeaders();
+MimeHeaders defaultHeaders = soapMessage.getMimeHeaders();
if (transportHeaders != null) {
Iterator it = transportHeaders.entrySet().iterator();
while (it.hasNext()) {
@@ -266,7 +240,6 @@ public class MessageImpl implements Message {
if (log.isDebugEnabled()) {
log.debug(" setContentType =" + ctValue);
}
-SOAPMessage soapMessage = mf.createMessage(defaultHeaders,
inStream);
// At this point the XMLPart is still an OMElement.
// We need to change it to the new SOAPEnvelope.
diff --git
a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartImpl.java
b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartImpl.java
index 331d2a3..dc1d6c9 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartImpl.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartImpl.java
@@ -21,6 +21,7 @@ package org.apache.axis2.jaxws.message.impl;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMElement;
+import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.message.Message;
import org.apache.axis2.jaxws.message.Protocol;
import org.apache.axis2.jaxws.message.factory.SAAJConverterFactory;
@@ -28,6 +29,7 @@ import org.apache.axis2.jaxws.message
[axis-axis2-java-core] 01/02: Create branch to work on AXIS2-5308.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS2-5308 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 36ef1470cd5e412108b15d0e474eacd1a7ad3879 Author: Andreas Veithen AuthorDate: Sun Jan 17 20:38:54 2016 + Create branch to work on AXIS2-5308.
[axis-axis2-java-core] 02/02: Tentative solution for AXIS2-5904.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-5904
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit c121777003ecaea924af7e0f3b845c0a8a849339
Author: Andreas Veithen
AuthorDate: Fri Jan 12 00:55:54 2018 +
Tentative solution for AXIS2-5904.
---
.../axis2/description/AxisBindingMessage.java | 4 +--
.../org/apache/axis2/description/AxisMessage.java | 5 ++--
.../apache/axis2/description/OpaqueInstant.java| 35 ++
.../apache/axis2/description/PolicySubject.java| 17 +--
4 files changed, 47 insertions(+), 14 deletions(-)
diff --git
a/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
b/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
index e358cbb..87b374e 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
@@ -53,7 +53,7 @@ public class AxisBindingMessage extends AxisDescription {
private boolean fault = false;
private volatile Policy effectivePolicy = null;
-private volatile Date lastPolicyCalculatedTime = null;
+private volatile OpaqueInstant lastPolicyCalculatedTime = null;
public boolean isFault() {
return fault;
@@ -225,7 +225,7 @@ public class AxisBindingMessage extends AxisDescription {
synchronized (this) {
if (lastPolicyCalculatedTime == null || isPolicyUpdated()) {
effectivePolicy = calculateEffectivePolicy();
-lastPolicyCalculatedTime = new Date();
+lastPolicyCalculatedTime = new OpaqueInstant();
}
}
}
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
b/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
index f7a1d07..eb8d85c 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
@@ -37,7 +37,6 @@ import org.apache.ws.commons.schema.XmlSchemaObject;
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Date;
import java.util.List;
@@ -67,7 +66,7 @@ public class AxisMessage extends AxisDescription {
private boolean wrapped = true;
private volatile Policy effectivePolicy = null;
-private volatile Date lastPolicyCalculatedTime = null;
+private volatile OpaqueInstant lastPolicyCalculatedTime = null;
public String getMessagePartName() {
return messagePartName;
@@ -241,7 +240,7 @@ public class AxisMessage extends AxisDescription {
synchronized (this) {
if (lastPolicyCalculatedTime == null || isPolicyUpdated()) {
effectivePolicy = calculateEffectivePolicy();
-lastPolicyCalculatedTime = new Date();
+lastPolicyCalculatedTime = new OpaqueInstant();
}
}
}
diff --git a/modules/kernel/src/org/apache/axis2/description/OpaqueInstant.java
b/modules/kernel/src/org/apache/axis2/description/OpaqueInstant.java
new file mode 100644
index 000..b28e024
--- /dev/null
+++ b/modules/kernel/src/org/apache/axis2/description/OpaqueInstant.java
@@ -0,0 +1,35 @@
+/*
+ * 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.description;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class OpaqueInstant {
+private static final AtomicInteger nextSequence = new AtomicInteger();
+
+private final int sequence;
+
+public OpaqueInstant() {
+sequence = nextSequence.getAndIncrement();
+}
+
+public boolean after(OpaqueInstant when) {
+return sequence > when.sequence;
+}
+}
diff --git a/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
b/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
index 49e0b59..3bcaab0 100644
--- a/modules/kernel/src/org/apache/axis2/description/PolicySubject.java
+++ b/modules/kernel/src/org/a
[axis-axis2-java-core] branch AXIOM-420 created (now d5ec9d9)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch AXIOM-420 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at d5ec9d9 Merged latest changes from trunk. No new revisions were added by this update.
[axis-axis2-java-core] branch AXIS2-5904 created (now c121777)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch AXIS2-5904 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at c121777 Tentative solution for AXIS2-5904. This branch includes the following new commits: new c3e7ff7 Create development branch for AXIS2-5904. new c121777 Tentative solution for AXIS2-5904. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-core] 01/08: Create branch for AXIS2-4091.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS2-4091 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 63b5b6c3aae514177e96a7d6d214bd728d17ab12 Author: Andreas Veithen AuthorDate: Sun Dec 17 21:11:56 2017 + Create branch for AXIS2-4091.
[axis-axis2-java-core] branch google-java-format created (now d156708)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch google-java-format in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at d156708 Fix axis2-wsdl2code-maven-plugin. No new revisions were added by this update.
[axis-axis2-java-core] 07/08: Remove files from a botched merge.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-4091
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit c1d109dec878bb97ddf685fa79b73fc5cff5ee24
Author: Andreas Veithen
AuthorDate: Sun Dec 17 22:37:10 2017 +
Remove files from a botched merge.
---
modules/parent/pom.xml | 1193
1 file changed, 1193 deletions(-)
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
deleted file mode 100644
index 42c70a2..000
--- a/modules/parent/pom.xml
+++ /dev/null
@@ -1,1193 +0,0 @@
-
-
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
-org.apache
-apache
-8
-
-4.0.0
-org.apache.axis2
-axis2-parent
-1.7.0-SNAPSHOT
-pom
-Apache Axis2 - Parent
-2004
-Axis2 is an effort to re-design and totally re-implement both
Axis/Java and
-(eventually) Axis/C++ on a new architecture. Evolving from the now
standard "handler chain"
-model which Axis1 pioneered, Axis2 is developing a more flexible
pipeline architecture which
-can yet be managed and packaged in a more organized manner. This new
design acknowledges the
-maturing of the Web services space in terms of new protocols such as
WS-ReliableMessaging,
-WS-Security and WS-Addressing that are built on top of the base SOAP
system. At the time
-Axis1 was designed, while it was fully expected that other protocols
such as
-WS-ReliableMessaging would be built on top of it, there was not a
proper extension
-architecture defined to enable clean composition of such layers. Thus,
one of the key
-motivations for Axis2 is to provide a clean and simple environment for
like Apache Sandesha
-and Apache WSS4J to layer on top of the base SOAP system. Another
driving force for Axis2 as
-well as the move away from RPC oriented Web services towards more
document-oriented, message
-style asynchronous service interactions. The Axis2 project is centered
on a new
-representation for SOAP messages called AXIOM (AXIs Object Model).
AXIOM consists of two
-parts: a complete XML Infoset representation and a SOAP Infoset
representation on top of
-that. The XML Infoset representation provides a JDOM-like simple API
but is built on a
-deferred model via a StAX-based (Streaming API for XML) pull parsing
API. A key feature of
-AXIOM is that it allows one to stop building the XML tree and just
access the pull stream
-directly; thus enabling both maximum flexibility and maximum
performance. This approach
-allows us to support multiple levels of abstraction for consuming and
offering Web services:
-using plain AXIOM, using generated code and statically data-bound data
types and so on. At
-the time of Axis1's design, RPC-style, synchronous, request-response
interactions were the
-order of the day for Web services. Today service interactions are much
more message
--oriented and exploit many different message exchange patterns. The
Axis2 engine
-architecture is careful to not build in any assumptions of
request-response patterns to
-ensure that it can be used easily to support arbitrary message exchange
-patterns.
-
-http://axis.apache.org/axis2/java/core/
-
-jira
-http://issues.apache.org/jira/browse/AXIS2
-
-
-
-1.2.15-SNAPSHOT
-3.0.3-SNAPSHOT
-1.0-SNAPSHOT
-2.0.3
-
-
-1.7.0
-2.7.7
-2.4.0
-1.3
-1.2
-3.1
-2.1
-1.1.1
-1.2.7
-
1.0.2
-
1.1
-1.6
-1.0.1
-1.1.2
-1.0.1
-1.0
-2.1
-4.2.1
-4.2.1
-5.0
-1.5rc3
-2.2.4
-2.2.4
-1.3
-1.2
-3.8.2
-4.4
-1.2.15
-2.2
-2.0.8
-1.1
-2.0.7
-
2.0.7
-2.2
-2.4
-1.4.9
-1.6R7
-2.3
-2.5.1
-1.0.1
-wstx-asl
-org.codehaus.woodstox
-3.2.9
-6.0.16
-1.6.2
-2.7.0
-2.5.0
-1.2
-1.3
-2.3
-1.4
-1.2
-
-false
-'${settings.localRepository}'
-1.1
-2.2.5
-2.2.5
-1.1.1
-
-
-
-Axis2 Developer List
-java-dev-subscr...@axis.apache.org
-java-dev-unsubscr...@axis.apache.org
-java-...@axis.apache.org
-
http://mail-archives.apache.org/mod_mbo
[axis-axis2-java-core] 08/08: Use generics.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-4091
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit bb97c6fa7ff040b3c3ceea80fc707f34de537870
Author: Andreas Veithen
AuthorDate: Sun Dec 17 22:42:11 2017 +
Use generics.
---
.../axis2/description/WSDL11ToAxisServiceBuilderTest.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
b/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
index 9e896fe..f8bb920 100644
---
a/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
+++
b/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
@@ -78,19 +78,18 @@ public class WSDL11ToAxisServiceBuilderTest extends
TestCase {
final String portName = "FooHttpGetPort";
AxisService service = new WSDL11ToAxisServiceBuilder(in, serviceName,
portName).populateService();
-List schemaDocuments = service.getSchema();
-List duplicatedGlobalElements =
findDuplicatedGlobalElements(schemaDocuments);
+List schemaDocuments = service.getSchema();
+List duplicatedGlobalElements =
findDuplicatedGlobalElements(schemaDocuments);
// NO duplicated element should exists
assertTrue("Duplicated global element declarations found in '" +
wsdlPath,
duplicatedGlobalElements.isEmpty());
}
-protected List findDuplicatedGlobalElements(List schemaDocuments) {
-List duplicatedGlobalElementDeclarations = new ArrayList();
-Set globalElementDeclarations = new HashSet();
+protected List findDuplicatedGlobalElements(List
schemaDocuments) {
+List duplicatedGlobalElementDeclarations = new
ArrayList();
+Set globalElementDeclarations = new HashSet();
// Iterate over all schema documents
-for (int i = 0; i < schemaDocuments.size(); i++) {
-XmlSchema schemaDocument = (XmlSchema)schemaDocuments.get(i);
+for (XmlSchema schemaDocument : schemaDocuments) {
for (XmlSchemaObject xmlSchemaObject : schemaDocument.getItems()) {
// Check only XML schema elements
if (xmlSchemaObject instanceof XmlSchemaElement) {
[axis-axis2-java-core] 06/08: Merge remaining changes from trunk.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-4091
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 351f97b76d956f3d221e5ec47bab5b3e542cd124
Merge: d341fa3 845f7ec
Author: Andreas Veithen
AuthorDate: Sun Dec 17 22:34:08 2017 +
Merge remaining changes from trunk.
.gitignore |4 +
apidocs/pom.xml| 390 +++
databinding-tests/jaxbri-tests/pom.xml | 282 +++
.../java/org/apache/axis2/jaxbri/Test01Impl.java |0
.../java/org/apache/axis2/jaxbri/Test01Test.java |0
.../IdentityLinkingServiceImpl.java|0
.../identityservice/IdentityServiceTest.java |0
.../org/apache/axis2/jaxbri/mtom/MtomImpl.java | 49 +
.../org/apache/axis2/jaxbri/mtom/MtomTest.java |0
.../axis2/jaxbri/processor/ProcessorImpl.java |0
.../axis2/jaxbri/processor/ProcessorTest.java |0
.../jaxbri-tests/src/test/repo/conf/axis2.xml | 163 ++
.../org/apache/axis2/jaxbri/processor/request.xml |0
.../org/apache/axis2/jaxbri/processor/response.xml |0
.../jaxbri-tests/src/test/wsdl/Test01.wsdl | 64 +
.../jaxbri-tests}/src/test/wsdl/identity.xsd |0
.../src/test/wsdl/identityService.wsdl |0
.../jaxbri-tests}/src/test/wsdl/mtom.wsdl |0
.../jaxbri-tests}/src/test/wsdl/processor.wsdl |0
databinding-tests/pom.xml | 46 +
etc/dist.py| 51 +
etc/doap_Axis2.rdf | 12 +-
legal/XmlSchema-LICENSE.txt| 202 --
legal/activation-LICENSE.txt | 119 -
...oden-impl-dom-LICENSE.txt => axiom-LICENSE.txt} |0
legal/axiom-api-LICENSE.txt| 202 --
legal/axiom-dom-LICENSE.txt| 202 --
legal/axiom-impl-LICENSE.txt | 202 --
legal/commons-httpclient-LICENSE.txt | 202 --
legal/geronimo-saaj-LICENSE.txt| 203 --
legal/geronimo-stax-api-LICENSE.txt| 203 --
legal/gson-LICENSE.txt | 202 ++
...-commons-LICENSE.txt => httpclient-LICENSE.txt} |0
legal/jalopy-LICENSE.txt | 43 -
legal/{mail-LICENSE.txt => javax.mail-LICENSE.txt} |0
legal/stax2-api.LICENSE.txt| 26 +
...oden-api-LICENSE.txt => woden-core-LICENSE.txt} |0
...x-LICENSE.txt => woodstox-core-asl-LICENSE.txt} |0
...gexp-LICENSE.txt => xmlschema-core-LICENSE.txt} |0
modules/adb-codegen/pom.xml| 73 +-
.../axis2/schema/BeanWriterMetaInfoHolder.java | 31 +-
.../org/apache/axis2/schema/SchemaCompiler.java| 165 +-
.../axis2/schema/template/ADBBeanTemplate-bean.xsl | 53 +-
.../schema/template/ADBBeanTemplate-helpermode.xsl | 44 +-
.../schema/template/ADBDatabindingTemplate.xsl | 12 +-
.../org/apache/axis2/schema/typemap/CTypeMap.java | 101 -
.../apache/axis2/schema/typemap/JavaTypeMap.java | 110 -
.../org/apache/axis2/schema/typemap/TypeMap.java |2 -
.../apache/axis2/schema/writer/JavaBeanWriter.java | 10 +-
modules/adb-codegen/sub-build.xml | 127 -
.../test-resources/testsuite/base64binary.xsd |2 +-
.../test-resources/testsuite/soapencoding.xsd | 43 -
.../org/apache/axis2/schema/AbstractTestCase.java | 419
.../apache/axis2/schema/ExtensionUtilityTest.java |4 +-
.../schema/base64binary/Base64BinaryTest.java | 90 -
.../compile/AbstractSchemaCompilerTester.java |2 +-
.../defaultnamespaces/DefaultNamespacesTest.java | 87 -
.../schema/extension/SimpleExtensionTest.java | 174 --
.../axis2/schema/populate/other/ADBInOutTest.java | 79 -
.../schema/soapencoding/SoapEncodingTest.java | 261 --
modules/adb-tests/pom.xml | 520
.../apache/axis2/schema/testsuite/TrackerTest.java |0
.../axis2/databinding/axis2_5741/ServiceTest.java | 43 +
.../axis2_5741/service/FiverxLinkServiceImpl.java | 34 +
.../axis2/databinding/axis2_5749/ServiceTest.java | 46 +
.../axis2_5749/service/ColorServiceImpl.java | 36 +
.../axis2/databinding/axis2_5750/ServiceTest.java | 49 +
.../axis2_5750/service/FixedValueServiceImpl.java | 35 +
.../axis2/databinding/axis2_5758/ServiceTest.java | 48 +
.../axis2_5758/service/StockQuoteServiceImpl.java | 33 +
.../axis2/databinding/axis2_5799/ServiceTest.java | 46 +
.../databinding/axis2_5799/service/EchoImpl.java | 29 +
.../databinding/axis2_5809/EchoServiceImpl.java| 32 +
.../axis2/databinding/axis2_5809/ServiceTest.java | 61 +
.../axis2/databinding/axis2_5887/ParseTest.java| 45 +
.../apache/axis2/databinding/
[axis-axis2-java-core] 01/02: Create development branch for AXIS2-5904.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS2-5904 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit c3e7ff7a36e4e201ae376453907672138a126b6e Author: Andreas Veithen AuthorDate: Fri Jan 12 00:55:06 2018 + Create development branch for AXIS2-5904.
[axis-axis2-java-core] 02/08: Apply patch for AXIS2-4091 provided by Antonio Andrade and Matt Fluet.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-4091
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 415e34a9591adfb3b2efe0111d4d28fbc9aa7ae6
Author: Andreas Veithen
AuthorDate: Sun Dec 17 21:14:43 2017 +
Apply patch for AXIS2-4091 provided by Antonio Andrade and Matt Fluet.
---
.../description/WSDL11ToAxisServiceBuilder.java| 17 +++-
.../WSDL11ToAxisServiceBuilderTest.java| 50 ++
2 files changed, 66 insertions(+), 1 deletion(-)
diff --git
a/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
b/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
index 4c86c88..2b22013 100644
---
a/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
+++
b/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
@@ -1760,6 +1760,11 @@ public class WSDL11ToAxisServiceBuilder extends
WSDLToAxisServiceBuilder {
namespacePrefixMap,
boEntry);
+// No wrapped element needs to be created
+if (!boEntry.isWrappedInput()) {
+ continue;
+}
+
elementDeclaration.appendChild(newComplexType);
String namespaceToUse = namespaceURI;
@@ -1849,6 +1854,12 @@ public class WSDL11ToAxisServiceBuilder extends
WSDLToAxisServiceBuilder {
namespaceImportsMap,
namespacePrefixMap,
boEntry);
+
+// No wrapped element needs to be created
+if (!boEntry.isWrappedInput()) {
+ continue;
+}
+
elementDeclaration.appendChild(newComplexType);
String namespaceToUse = namespaceURI;
@@ -2253,7 +2264,11 @@ public class WSDL11ToAxisServiceBuilder extends
WSDLToAxisServiceBuilder {
"and use the type attribute.");
} else {
// The presense of an element means that a wrapper xsd element
is not needed.
-boe.setWrappedOutput(false);
+if (isOutMessage){
+boe.setWrappedOutput(false);
+} else {
+boe.setWrappedInput(false);
+}
if (log.isDebugEnabled()) {
log.debug("The binding operation " + bindingOperationName
+
" references message part " +
diff --git
a/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
b/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
index 4854c97..7f64d71 100644
---
a/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
+++
b/modules/kernel/test/org/apache/axis2/description/WSDL11ToAxisServiceBuilderTest.java
@@ -21,9 +21,18 @@ package org.apache.axis2.description;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.HashSet;
import javax.xml.namespace.QName;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+
import junit.framework.TestCase;
public class WSDL11ToAxisServiceBuilderTest extends TestCase {
@@ -54,4 +63,45 @@ public class WSDL11ToAxisServiceBuilderTest extends TestCase
{
in.close();
}
}
+
+public void testNonDuplicatedElementsHttpBinding() throws Exception {
+final String wsdlPath =
"test-resources/wsdl/nonduplicatedElements.wsdl";
+InputStream in = new FileInputStream(wsdlPath);
+final String targetNamespace = "http://www.example.org";;
+final QName serviceName = new QName(targetNamespace, "FooService");
+final String portName = "FooHttpGetPort";
+
+AxisService service = new WSDL11ToAxisServiceBuilder(in, serviceName,
portName).populateService();
+List schemaDocuments = service.getSchema();
+List duplicatedGlobalElements =
findDuplicatedGlobalElements(schemaDocuments);
+// NO duplicated element should exists
+assertTrue("Duplicated global element declarations found in '" +
wsdlPath,
+duplicatedGlobalElements.isEmpty());
+}
+
+protected List findDuplicatedGlobalElements(List schemaDocuments) {
+List duplicatedGlobalElemen
[axis-axis2-java-core] 04/08: Merge changes from trunk up to r1536049.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS2-4091
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 9c54c8a76eb414cb1fd3abce528ea1d3535e6eae
Merge: 129ba3f a29a36b
Author: Andreas Veithen
AuthorDate: Sun Dec 17 21:35:47 2017 +
Merge changes from trunk up to r1536049.
README.txt | 20 +-
build.xml | 115 --
modules/adb-codegen/pom.xml| 5 +
.../axis2/schema/template/ADBBeanTemplate-bean.xsl | 3 +-
modules/adb/pom.xml| 5 +
.../axis2/databinding/utils/ConverterUtil.java | 4 +-
.../rpc/receivers/RPCInOnlyMessageReceiver.java| 8 +-
.../receivers/RPCInOutAsyncMessageReceiver.java| 8 +-
.../axis2/rpc/receivers/RPCMessageReceiver.java| 8 +-
modules/all/pom.xml| 21 ++
modules/distribution/pom.xml | 59 ++-
.../test/org/apache/axis2/mtom/EchoService2.java | 4 +-
...ComplexDataTypesComplexDataTypesSOAP11Test.java | 4 +-
.../complex/ComplexDataTypesDocLitBareTest.java| 4 +-
.../org/apache/axis2/jaxws/proxy/ProxyTests.java | 405 +
.../DispatchXMessageDataSourceTests.java | 1 -
modules/jaxws/pom.xml | 4 +
.../axis2/jaxws/message/util/Reader2Writer.java| 6 +-
.../axis2/json/gson/GsonXMLStreamReader.java | 42 +--
.../axis2/json/gson/GsonXMLStreamWriter.java | 2 +-
.../apache/axis2/json/gson/JSONMessageHandler.java | 3 +-
.../org/apache/axis2/json/gson/JsonBuilder.java| 5 +-
.../org/apache/axis2/json/gson/JsonFormatter.java | 5 +-
.../apache/axis2/json/gson/factory/XmlNode.java| 2 +-
.../axis2/json/gson/factory/XmlNodeGenerator.java | 4 +-
.../gson/rpc/JsonInOnlyRPCMessageReceiver.java | 99 ++---
.../json/gson/rpc/JsonRpcMessageReceiver.java | 73 ++--
.../json/gson/{factory => rpc}/JsonUtils.java | 2 +-
.../gson/axis2.xml}| 0
.../JSONPOJOService.aar}/META-INF/services.xml | 18 +-
.../json}/axis2.xml| 0
.../EchoXMLService.aar}/META-INF/services.xml | 19 +-
.../services/POJOService.aar/META-INF/services.xml | 0
.../org/apache/axis2/json/JSONIntegrationTest.java | 41 +--
.../org/apache/axis2/json/JSONTestConstants.java | 8 -
.../axis2/json/gson/JSONXMLStreamAPITest.java | 22 +-
.../test/org/apache/axis2/json/gson/UtilTest.java | 44 +++
.../rpc/JSONPOJOService.java} | 23 +-
.../json/gson/rpc/JSONRPCIntegrationTest.java | 60 +++
.../rpc/Person.java} | 40 +-
modules/kernel/pom.xml | 5 +
.../src/org/apache/axis2/builder/BuilderUtil.java | 13 +-
.../apache/axis2/builder/DataSourceBuilder.java| 3 +-
.../src/org/apache/axis2/builder/MIMEBuilder.java | 4 +-
.../axis2/deployment/DeploymentClassLoader.java| 8 +-
.../apache/axis2/description/WSDL2Constants.java | 6 +-
.../apache/axis2/engine/DefaultObjectSupplier.java | 9 +
.../src/org/apache/axis2/i18n/resource.properties | 2 +-
.../kernel/src/org/apache/axis2/util/Utils.java| 50 ++-
.../org/apache/axis2/util/XMLPrettyPrinter.java| 4 +-
modules/parent/pom.xml | 2 +-
.../src/org/apache/axis2/saaj/SOAPMessageImpl.java | 51 ++-
.../src/org/apache/axis2/saaj/SOAPPartImpl.java| 22 +-
.../test/org/apache/axis2/saaj/AttachmentTest.java | 4 +-
.../org/apache/axis2/saaj/SOAPMessageTest.java | 13 +-
modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 3 +
.../axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java | 16 +-
.../src/test/test2/pom.xml | 45 +++
.../test2/src/main/axis2/test dir/service.wsdl | 106 ++
.../test2/src/main/axis2/test dir/service.xsd} | 28 +-
.../axis2/format/TextMessageBuilderAdapter.java| 5 +-
modules/transport/http/pom.xml | 4 -
.../transport/http/HTTPTransportReceiver.java | 39 +-
.../http/impl/httpclient3/HTTPSenderImpl.java | 56 ++-
.../http/impl/httpclient4/HTTPSenderImpl.java | 55 ++-
.../org/apache/axis2/transport/jms/JMSUtils.java | 4 +-
modules/transport/testkit/pom.xml | 4 +
.../src/main/webapp/axis2-web/listServices.jsp | 3 +
pom.xml| 7 +
src/site/apt/docs/jms-transport.apt| 343 +
src/site/apt/docs/tcp-transport.apt| 150
src/site/apt/docs/udp-transport.apt| 119 ++
src/site/xdoc/docs/mail-transport.xml | 200 ++
src/site/xdoc/docs/toc.xml | 7 +-
src/site/xdoc/docs/xmpp-transport.
[axis-axis2-java-core] 03/08: Add file missing in r1818512.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS2-4091 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 129ba3fde1d102684e18393f5fc0f6df77cb5553 Author: Andreas Veithen AuthorDate: Sun Dec 17 21:15:24 2017 + Add file missing in r1818512. --- .../test-resources/wsdl/nonduplicatedElements.wsdl | 55 ++ 1 file changed, 55 insertions(+) diff --git a/modules/kernel/test-resources/wsdl/nonduplicatedElements.wsdl b/modules/kernel/test-resources/wsdl/nonduplicatedElements.wsdl new file mode 100644 index 000..93d9b45 --- /dev/null +++ b/modules/kernel/test-resources/wsdl/nonduplicatedElements.wsdl @@ -0,0 +1,55 @@ + +http://www.example.org"; + xmlns:tns="http://www.example.org"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; + xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/";> + + +http://www.example.org";> + + + + + + + Message part referencing a global element declaration + + + + + + Message part referencing a type definition + + + + + + + + + + + + + + + + + + + + + + + + + + + http://www.example.org/"; /> + + + +
[axis-axis2-java-core] 05/08: Merge r1536050 from the trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch AXIS2-4091 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit d341fa3de89d70761bb9ed9d335c33654a2ba31b Merge: 9c54c8a 25ae0f1 Author: Andreas Veithen AuthorDate: Sun Dec 17 22:16:04 2017 + Merge r1536050 from the trunk. modules/adb-codegen/pom.xml|5 +- .../org/apache/axis2/schema/ExtensionUtility.java | 49 +- .../org/apache/axis2/schema/SchemaCompiler.java| 1548 +++- .../axis2/schema/template/ADBBeanTemplate-bean.xsl |3 +- .../org/apache/axis2/schema/XMLSchemaTest.java | 29 +- .../schema/extension/SimpleExtensionTest.java |9 +- .../codegen/extension/JAXWSWapperExtension.java| 45 +- .../extension/SchemaUnwrapperExtension.java| 48 +- .../codegen/extension/WSDLValidatorExtension.java |8 +- .../AxisServiceTopElementSchemaGenerator.java | 34 +- .../apache/axis2/wsdl/codegen/XMLSchemaTest.java | 27 +- .../extension/SchemaUnwrapperExtensionTest.java|2 +- .../extension/WSDLValidatorExtensionTest.java | 12 +- .../axis2/corba/deployer/CorbaConstants.java |1 + .../axis2/corba/deployer/SchemaGenerator.java | 149 +- modules/fastinfoset/pom.xml|4 +- modules/integration/pom.xml|5 + modules/java2wsdl/pom.xml |4 +- .../apache/axis2/jaxbri/CodeGenerationUtility.java |2 +- .../apache/axis2/jaxbri/JaxbSchemaGenerator.java | 31 +- .../src/test/java/org/temp/XMLSchemaTest.java | 27 +- .../apache/axis2/jibx/CodeGenerationUtility.java | 12 +- .../axis2/json/gson/factory/XmlNodeGenerator.java | 12 +- .../axis2/json/gson/GsonXMLStreamReaderTest.java |2 +- .../axis2/json/gson/GsonXMLStreamWriterTest.java |2 +- .../axis2/json/gson/JSONMessageHandlerTest.java|3 +- .../apache/axis2/json/gson/JsonFormatterTest.java |2 +- .../json/gson/factory/XmlNodeGeneratorTest.java|4 +- modules/kernel/pom.xml | 11 +- .../src/org/apache/axis2/builder/BuilderUtil.java | 136 +- .../org/apache/axis2/description/AxisMessage.java | 35 +- .../org/apache/axis2/description/AxisService.java | 62 +- .../axis2/description/AxisService2WSDL20.java | 61 +- .../java2wsdl/DefaultSchemaGenerator.java | 250 ++-- .../java2wsdl/DocLitBareSchemaGenerator.java | 114 +- .../src/org/apache/axis2/util/SchemaUtil.java | 28 +- .../test-resources/wsdl/printWSDLreference.wsdl|6 +- ...stGenerateInterfaceOperationElement11_WSDL.wsdl |6 +- ...testGenerateInterfaceOperationElement_WSDL.wsdl |6 +- .../apache/axis2/description/AxisServiceTest.java | 23 +- .../WSDL11ToAxisServiceBuilderTest.java|6 +- .../java2wsdl/DefaultSchemaGeneratorTest.java | 17 +- .../axis2/description/java2wsdl/XMLSchemaTest.java | 22 +- modules/parent/pom.xml | 13 +- modules/tool/axis2-ant-plugin/pom.xml |4 +- modules/tool/axis2-idea-plugin/pom.xml |6 +- .../apache/axis2/transport/http/XMLSchemaTest.java | 27 +- .../apache/axis2/transport/xmpp/XMPPSender.java| 63 +- .../axis2/xmlbeans/CodeGenerationUtility.java | 10 +- 49 files changed, 1611 insertions(+), 1374 deletions(-) diff --cc modules/kernel/test-resources/wsdl/printWSDLreference.wsdl index c5f46eb,c5f46eb..7ea26e5 --- a/modules/kernel/test-resources/wsdl/printWSDLreference.wsdl +++ b/modules/kernel/test-resources/wsdl/printWSDLreference.wsdl @@@ -1,5 -1,5 +1,4 @@@ -- -- --http://schemas.xmlsoap.org/wsdl/"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:tns="http://ws.apache.org/axis2"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://ws.apache.org/axis2";> ++ -->http://schemas.xmlsoap.org/wsdl/"; xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; xmlns:tns="http://ws.apache.org/axis2"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; targetNamespace="http://ws.apache.org/axis2";> diff --cc modules/kernel/test-resources/wsdl/testGenerateInterfaceOperationElement11_WSDL.wsdl index c5f46eb,c5f46eb..7ea26e5 --- a/modules/kernel/test-resources/wsdl/testGenerateInterfaceOperationElement11_WSDL.wsdl +++ b/modules/kernel/test-resources/wsdl/testGe
[axis-axis2-java-core] branch AXIS2-4091 created (now bb97c6f)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch AXIS2-4091 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at bb97c6f Use generics. This branch includes the following new commits: new 63b5b6c Create branch for AXIS2-4091. new 415e34a Apply patch for AXIS2-4091 provided by Antonio Andrade and Matt Fluet. new 129ba3f Add file missing in r1818512. new 9c54c8a Merge changes from trunk up to r1536049. new d341fa3 Merge r1536050 from the trunk. new 351f97b Merge remaining changes from trunk. new c1d109d Remove files from a botched merge. new bb97c6f Use generics. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-core] branch 1_5 created (now 93c490c)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at 93c490c Merged 1359504 to 1.5 branch. This branch includes the following new commits: new 0a34148 [maven-release-plugin] prepare for next development iteration new 3309b80 Merged r1037135 and r1037218 to the 1.5 branch to fix the ConcurrentModificationException that sometimes causes the Hudson build to fail. new 0c5cb2a Merged r1174618 to the 1.5 branch. new 1147e97 Merged r1150055 to the 1.5 branch to ensure compatibility with Axiom 1.2.13. new bff447b Merged r1147485, r1149224, r1149491 and r1149578 to the 1.5 branch to ensure compatibility with Axiom 1.2.13. new 0847de1 Switched Axiom to 1.2.13-SNAPSHOT. new e929313 Backported r795789 and part of r1042244 to the 1.5 branch to reduce the coupling to Axiom internals. This should solve AXIS2-4363 and AXIS2-4387. new b29d549 Merged r1185504 to the 1.5 branch. new 7ed1570 Merged r1190469 to the 1.5 branch. new 7be8bc9 AXIS2-5173: Merged r835745 to the 1.5 branch. new 8f3d0ce Merged r922830 to the 1.5 branch to set up svn:ignore for the axis2-kernel module. new 783eae3 Merged r922828 to the 1.5 branch to be able to import axis2-kernel into Eclipse. new 6c7a3dc Merged r1201957 to the 1.5 branch. new 0ce4c8f Merged r1201467 to the 1.5 branch to make sure that the build succeeds with Axiom 1.2.13-SNAPSHOT. new 15d9a12 Merged r1220630 to the 1.5 branch for use in the Sandesha2 build. new c480fe3 Merged r1231465 to the 1.5 branch. new fe0e2ae Merged r1231470 to the 1.5 branch. new 950a1d8 Merged r1242249 to the 1.5 branch. new 6de6035 Merged r1296062 to the 1.5 branch. new a5455e4 Merged r1297744 to the 1.5 branch. new fde252c Merged r1297765 to the 1.5 branch. new 04a183e Merged r1298550 to the 1.5 branch. new f163826 Merged r1173869 and r1299356 to the 1.5 branch. new d113d79 Merged r1299392 to the 1.5 branch to avoid hanging builds. new a41bfca Merged r1300358 to the 1.5 branch. new 27919d3 Switched the Axis2 1.5 branch to Axiom 1.2.13. new 9997c20 Merged r1326968 to the 1.5 branch. new 79d7495 Merged r1331616 to the 1.5 branch. new 09be564 Mark r1341780 merged to 1.5 and applied given patch. new bbdf4b7 Merged r1332587 to the 1.5 branch. new 64bf4ca Merged r1341805 to the 1.5 branch. new 0b99cd8 AXIS2-5345 - Merged r1351218 to 1.5 branch. new 18e5409 AXIS2-5349 - Merged r1352413 to 1.5 branch. new 8fa0853 AXIS2-5348 - Merged r1352413 to 1.5 branch. new afa04b2 AXIS2-5355 - Merged r1356080 to 1.5 branch. new 3a1d4bd AXIS2-5360 - Merged r1358508 to 1.5 branch. new 16c5219 Merged r1359499 to 1.5 branch. new 93c490c Merged 1359504 to 1.5 branch. The 38 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-core] 12/38: Merged r922828 to the 1.5 branch to be able to import axis2-kernel into Eclipse.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 783eae317a86e7f190fd53ebd3977c4c76d26843 Author: Andreas Veithen AuthorDate: Fri Nov 11 11:49:13 2011 + Merged r922828 to the 1.5 branch to be able to import axis2-kernel into Eclipse. --- modules/kernel/pom.xml | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml index 0e607bb..b14f94d 100644 --- a/modules/kernel/pom.xml +++ b/modules/kernel/pom.xml @@ -122,13 +122,6 @@ -../test-resources -test-resources - -**/** - - - test-resources/deployment/ClasspathModule **/** @@ -192,6 +185,9 @@ process-test-resources + + +
[axis-axis2-java-core] 16/38: Merged r1231465 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit c480fe37b6908a9b93205f0b8331b92749634bbb
Author: Sagara Gunathunga
AuthorDate: Sat Jan 14 09:07:40 2012 +
Merged r1231465 to the 1.5 branch.
---
.../userguide/clients/EchoNonBlockingClient.java | 65 ++
.../clients/EchoNonBlockingDualClient.java | 63 +
2 files changed, 82 insertions(+), 46 deletions(-)
diff --git
a/modules/samples/userguide/src/userguide/clients/EchoNonBlockingClient.java
b/modules/samples/userguide/src/userguide/clients/EchoNonBlockingClient.java
index cae78e6..ba47eeb 100644
--- a/modules/samples/userguide/src/userguide/clients/EchoNonBlockingClient.java
+++ b/modules/samples/userguide/src/userguide/clients/EchoNonBlockingClient.java
@@ -25,16 +25,15 @@ import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.client.async.AsyncResult;
-import org.apache.axis2.client.async.Callback;
+import org.apache.axis2.client.async.AxisCallback;
/**
* Sample for asynchronous single channel non-blocking service invocation.
- * Message Exchage Pattern IN-OUT
+ * Message Exchange Pattern IN-OUT
*/
public class EchoNonBlockingClient {
private static EndpointReference targetEPR = new
EndpointReference("http://127.0.0.1:8080/axis2/services/MyService";);
-
+
public static void main(String[] args) {
ServiceClient sender = null;
try {
@@ -43,38 +42,58 @@ public class EchoNonBlockingClient {
options.setTo(targetEPR);
options.setAction("urn:echo");
-//Callback to handle the response
-Callback callback = new Callback() {
-public void onComplete(AsyncResult result) {
-System.out.println(result.getResponseEnvelope());
-}
-
-public void onError(Exception e) {
-e.printStackTrace();
-}
-};
-
+TestCallback axisCallback = new TestCallback("CallBack1") ;
+
//Non-Blocking Invocation
sender = new ServiceClient();
sender.setOptions(options);
-sender.sendReceiveNonBlocking(payload, callback);
-
-//Wait till the callback receives the response.
-while (!callback.isComplete()) {
-Thread.sleep(1000);
+sender.sendReceiveNonBlocking(payload, axisCallback);
+
+while ( ! axisCallback.isComplete( ) ) {
+Thread.sleep(100);
}
-} catch (AxisFault axisFault) {
-axisFault.printStackTrace();
} catch (Exception ex) {
ex.printStackTrace();
} finally {
try {
sender.cleanup();
} catch (AxisFault axisFault) {
-//
+axisFault.printStackTrace();
}
}
}
+
+static class TestCallback implements AxisCallback {
+
+private String name = null;
+private boolean complete = false;
+
+public TestCallback (String name) {
+this.name = name;
+}
+
+public void onError (Exception e) {
+e.printStackTrace();
+}
+
+public void onComplete() {
+ System.out.println( "Message transmission complete") ;
+complete = true;
+}
+
+public boolean isComplete() {
+return complete;
+}
+
+public void onMessage(org.apache.axis2.context.MessageContext arg0) {
+ System.out.println( "Call Back " + name + " got Result: " +
arg0.getEnvelope() ) ;
+}
+
+public void onFault(org.apache.axis2.context.MessageContext arg0) {
+ System.out.println( "Call Back " + name + " got Fault: " +
arg0.getEnvelope() ) ;
+}
+}
+
}
diff --git
a/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java
b/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java
index 7f5a5ad..b13a331 100644
---
a/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java
+++
b/modules/samples/userguide/src/userguide/clients/EchoNonBlockingDualClient.java
@@ -23,13 +23,11 @@ package userguide.clients;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceCli
[axis-axis2-java-core] 19/38: Merged r1296062 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 6de603584232ef75241f7f9b9b4f9635719e6cb8 Author: Andreas Veithen AuthorDate: Sun Mar 4 11:29:09 2012 + Merged r1296062 to the 1.5 branch. --- modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java index 2f9032c..328fae0 100644 --- a/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java +++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java @@ -20,6 +20,7 @@ package org.apache.axis2.saaj; import org.apache.axiom.om.OMNode; +import org.apache.axiom.om.impl.dom.ChildNode; import org.apache.axiom.om.impl.dom.DocumentImpl; import org.apache.axiom.om.impl.dom.NodeImpl; import org.apache.axiom.om.impl.dom.TextImpl; @@ -201,7 +202,7 @@ public class SOAPEnvelopeImpl extends SOAPElementImpl implements javax.xml.soap. doomText.setNextOMSibling((OMNode)firstChild); doomText.setPreviousOMSibling(null); element.setFirstChild(doomText); -((NodeImpl)firstChild).setPreviousOMSibling(doomText); +((ChildNode)firstChild).setPreviousOMSibling(doomText); } return this; }
[axis-axis2-java-core] 04/38: Merged r1150055 to the 1.5 branch to ensure compatibility with Axiom 1.2.13.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 1147e979bdc01b398ec1d7cda296b7e466ad6f0e
Author: Andreas Veithen
AuthorDate: Thu Sep 29 21:57:08 2011 +
Merged r1150055 to the 1.5 branch to ensure compatibility with Axiom 1.2.13.
---
.../src/org/apache/axis2/scripting/ScriptMessageContext.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
b/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
index 30c9d86..2e5a2f3 100644
--- a/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
+++ b/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
@@ -19,6 +19,9 @@
package org.apache.axis2.scripting;
+import java.util.Iterator;
+
+import org.apache.axiom.soap.SOAPBody;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.scripting.convertors.OMElementConvertor;
@@ -59,7 +62,12 @@ public class ScriptMessageContext extends MessageContext {
* @throws XMLStreamException
*/
public void setPayloadXML(Object payload) {
-
mc.getEnvelope().getBody().setFirstChild(convertor.fromScript(payload));
+SOAPBody body = mc.getEnvelope().getBody();
+for (Iterator it = body.getChildren(); it.hasNext(); ) {
+it.next();
+it.remove();
+}
+body.addChild(convertor.fromScript(payload));
}
/**
[axis-axis2-java-core] 24/38: Merged r1299392 to the 1.5 branch to avoid hanging builds.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit d113d79f55ccde75e87455e3dde11ae3ec0a5c3b
Author: Andreas Veithen
AuthorDate: Sun Mar 11 18:50:06 2012 +
Merged r1299392 to the 1.5 branch to avoid hanging builds.
---
.../axis2/transport/http/server/DefaultConnectionListener.java | 6 +++---
.../org/apache/axis2/transport/http/server/SimpleHttpServer.java| 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
index 2c39991..da095b2 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
@@ -106,7 +106,7 @@ public class DefaultConnectionListener implements
IOProcessor {
}
public synchronized void awaitSocketOpen() throws InterruptedException {
-while (serversocket == null) {
+while (serversocket == null && !destroyed) {
wait();
}
}
@@ -122,7 +122,7 @@ public class DefaultConnectionListener implements
IOProcessor {
}
}
-public void destroy() {
+public synchronized void destroy() {
this.destroyed = true;
try {
close();
@@ -133,7 +133,7 @@ public class DefaultConnectionListener implements
IOProcessor {
}
}
-public boolean isDestroyed() {
+public synchronized boolean isDestroyed() {
return this.destroyed;
}
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
index 7debb56..0ad04c3 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
@@ -100,7 +100,9 @@ public class SimpleHttpServer {
this.listenerExecutor.execute(listener);
try {
listener.awaitSocketOpen();
-port = listener.getPort();
+if (!listener.isDestroyed()) {
+port = listener.getPort();
+}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
[axis-axis2-java-core] 30/38: Merged r1332587 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit bbdf4b7ed5cc5c7b2eb31b97382e904a41230f93
Author: Sagara Gunathunga
AuthorDate: Wed May 23 09:10:07 2012 +
Merged r1332587 to the 1.5 branch.
---
.../axis2/deployment/util/TempFileManager.java | 29 ++
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git
a/modules/kernel/src/org/apache/axis2/deployment/util/TempFileManager.java
b/modules/kernel/src/org/apache/axis2/deployment/util/TempFileManager.java
index b26a272..3517a06 100644
--- a/modules/kernel/src/org/apache/axis2/deployment/util/TempFileManager.java
+++ b/modules/kernel/src/org/apache/axis2/deployment/util/TempFileManager.java
@@ -18,7 +18,12 @@
*/
package org.apache.axis2.deployment.util;
-import java.io.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.io.PrintStream;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -135,16 +140,18 @@ public class TempFileManager {
throws IOException {
// Select all the files
File[] files = rootDir.listFiles();
-for (File file : files) {
-// If the file is a directory, we will
-// recursively call delete on it.
-if (file.isDirectory()) {
-recursiveDelete(file);
-} else {
-// It is just a file so we are safe to
-// delete it
-if (!file.delete()) {
-throw new IOException("Could not delete: " +
file.getAbsolutePath());
+if (files != null) {
+for (File file : files) {
+// If the file is a directory, we will
+// recursively call delete on it.
+if (file.isDirectory()) {
+recursiveDelete(file);
+} else {
+// It is just a file so we are safe to
+// delete it
+if (!file.delete()) {
+throw new IOException("Could not delete: " +
file.getAbsolutePath());
+}
}
}
}
[axis-axis2-java-core] 06/12: Merge r1686090 to the 1.6 branch for compatibility with recent Axiom versions.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit f6ddc6db9c81ccb0e60c21beff4e1c4a17456556
Author: Andreas Veithen
AuthorDate: Sun Feb 14 21:53:25 2016 +
Merge r1686090 to the 1.6 branch for compatibility with recent Axiom
versions.
---
.../addressing/EndpointReferenceHelperTest.java| 41 --
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git
a/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
b/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
index 48c5db1..f161e09 100644
---
a/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
+++
b/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java
@@ -33,6 +33,11 @@ import java.util.ArrayList;
import java.util.Map;
public class EndpointReferenceHelperTest extends TestCase {
+private void compareAttributes(OMAttribute expected, OMAttribute actual) {
+assertEquals(expected.getNamespace(), actual.getNamespace());
+assertEquals(expected.getLocalName(), actual.getLocalName());
+assertEquals(expected.getAttributeValue(), actual.getAttributeValue());
+}
public void testToAndFromOMForFinalSpecEPR() throws Exception {
String address = "http://ws.apache.org/axis2";;
@@ -77,19 +82,19 @@ public class EndpointReferenceHelperTest extends TestCase {
assertEquals(epr.getAddress(), deser.getAddress());
ArrayList addrAttrs = deser.getAddressAttributes();
-assertEquals(attr1, addrAttrs.get(0));
-assertEquals(attr2, addrAttrs.get(1));
+compareAttributes(attr1, (OMAttribute)addrAttrs.get(0));
+compareAttributes(attr2, (OMAttribute)addrAttrs.get(1));
ArrayList attrs = deser.getAttributes();
-assertEquals(attr1, attrs.get(0));
-assertEquals(attr2, attrs.get(1));
+compareAttributes(attr1, (OMAttribute)attrs.get(0));
+compareAttributes(attr2, (OMAttribute)attrs.get(1));
ArrayList metadata = deser.getMetaData();
assertEquals(md1, metadata.get(0));
assertEquals(md2, metadata.get(1));
ArrayList mdAttrs = deser.getMetadataAttributes();
-assertEquals(attr1, mdAttrs.get(0));
-assertEquals(attr2, mdAttrs.get(1));
+compareAttributes(attr1, (OMAttribute)mdAttrs.get(0));
+compareAttributes(attr2, (OMAttribute)mdAttrs.get(1));
ArrayList extelts = deser.getExtensibleElements();
assertEquals(ext1, extelts.get(0));
@@ -109,15 +114,15 @@ public class EndpointReferenceHelperTest extends TestCase
{
assertEquals(attr2, addrAttrs.get(1));
attrs = deser.getAttributes();
-assertEquals(attr1, attrs.get(0));
-assertEquals(attr2, attrs.get(1));
+compareAttributes(attr1, (OMAttribute)attrs.get(0));
+compareAttributes(attr2, (OMAttribute)attrs.get(1));
metadata = deser.getMetaData();
assertEquals(md1, metadata.get(0));
assertEquals(md2, metadata.get(1));
mdAttrs = deser.getMetadataAttributes();
-assertEquals(attr1, mdAttrs.get(0));
-assertEquals(attr2, mdAttrs.get(1));
+compareAttributes(attr1, (OMAttribute)mdAttrs.get(0));
+compareAttributes(attr2, (OMAttribute)mdAttrs.get(1));
extelts = deser.getExtensibleElements();
assertEquals(ext1, extelts.get(0));
@@ -187,12 +192,12 @@ public class EndpointReferenceHelperTest extends TestCase
{
assertEquals(epr.getAddress(), deser.getAddress());
ArrayList addrAttrs = deser.getAddressAttributes();
-assertEquals(attr1, addrAttrs.get(0));
-assertEquals(attr2, addrAttrs.get(1));
+compareAttributes(attr1, (OMAttribute)addrAttrs.get(0));
+compareAttributes(attr2, (OMAttribute)addrAttrs.get(1));
ArrayList attrs = deser.getAttributes();
-assertEquals(attr1, attrs.get(0));
-assertEquals(attr2, attrs.get(1));
+compareAttributes(attr1, (OMAttribute)attrs.get(0));
+compareAttributes(attr2, (OMAttribute)attrs.get(1));
//Metadata will be lost unless it is saved as an extensibility element.
ArrayList metadata = deser.getMetaData();
@@ -216,12 +221,12 @@ public class EndpointReferenceHelperTest extends TestCase
{
assertEquals(epr.getAddress(), deser.getAddress());
addrAttrs = deser.getAddressAttributes();
-assertEquals(attr1, addrAttrs.get(0));
-assertEquals(attr2, addrAttrs.get(1));
+compareAttributes(attr1, (OMAttribute)addrAttrs.get(0));
+compareAttributes(attr2, (OMAttribute)addrAttrs.get(1));
attrs = deser.getAttributes();
-assertEquals(attr1, attrs.get(0));
-assertEquals(attr2, a
[axis-axis2-java-core] 21/38: Merged r1297765 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit fde252cad0415a0fe21ffd025cf707ac76691681
Author: Andreas Veithen
AuthorDate: Wed Mar 7 20:59:11 2012 +
Merged r1297765 to the 1.5 branch.
---
modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java | 6 --
1 file changed, 6 deletions(-)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
index 328fae0..9d70ef2 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
@@ -21,7 +21,6 @@ package org.apache.axis2.saaj;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.ChildNode;
-import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.impl.dom.NodeImpl;
import org.apache.axiom.om.impl.dom.TextImpl;
import org.apache.axiom.soap.SOAPFactory;
@@ -30,7 +29,6 @@ import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11HeaderImpl;
import org.apache.axiom.soap.impl.dom.soap12.SOAP12Factory;
import org.apache.axiom.soap.impl.dom.soap12.SOAP12HeaderImpl;
-import org.w3c.dom.Document;
import org.w3c.dom.Node;
import javax.xml.soap.Name;
@@ -52,10 +50,6 @@ public class SOAPEnvelopeImpl extends SOAPElementImpl
implements javax.xml.soap.
omSOAPEnvelope = envelope;
}
-public void setOwnerDocument(Document document) {
-super.setOwnerDocument((DocumentImpl)document);
-}
-
public org.apache.axiom.soap.SOAPEnvelope getOMEnvelope() {
return omSOAPEnvelope;
}
[axis-axis2-java-core] 10/12: AXIS2-5741: Merge r1730369 and r1730427 to the 1.6 branch and enable the unit test (The regression is in 1.7.0).
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 82c7e753a8601839e1e637bb60c93b47e63e51a1
Author: Andreas Veithen
AuthorDate: Sun Feb 14 23:27:07 2016 +
AXIS2-5741: Merge r1730369 and r1730427 to the 1.6 branch and enable the
unit test (The regression is in 1.7.0).
---
modules/adb-tests/pom.xml | 61 +++-
.../axis2/databinding/axis2_5741/ServiceTest.java | 51
.../axis2_5741/service/FiverxLinkServiceImpl.java | 34 +++
modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl| 309 +
modules/adb-tests/src/test/xslt/AXIS2-5741.xsl | 11 +
5 files changed, 464 insertions(+), 2 deletions(-)
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index 46d24ea..43a11ef 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -79,15 +79,58 @@
${project.version}
+wsdl2code-mtom
generate-test-sources
wsdl2code
src/test/wsdl/MTOMService.wsdl
-adb
sync
org.apache.axis2.databinding.mtom.client
+
${project.build.directory}/wsdl2code/mtom
+
+
+
+wsdl2code-axis2-5741
+generate-test-sources
+
+wsdl2code
+
+
+src/test/wsdl/AXIS2-5741.wsdl
+
org.apache.axis2.databinding.axis2_5741.service
+true
+true
+
${project.build.directory}/wsdl2code/AXIS2-5741
+
+
+
+
+adb
+
+
+
+org.codehaus.mojo
+xml-maven-plugin
+1.0.1
+
+
+generate-test-resources
+
+transform
+
+
+
+
+
${project.build.directory}/wsdl2code/AXIS2-5741/resources
+
+services.xml
+
+
src/test/xslt/AXIS2-5741.xsl
+
${project.build.directory}/repo/AXIS2-5741/services/FiverxLinkService/META-INF
+
+
@@ -98,6 +141,7 @@
2.4.1
+wsimport-mtom
wsimport-test
@@ -108,6 +152,18 @@
org.apache.axis2.databinding.mtom.service
+
+wsimport-axis2-5741
+
+wsimport-test
+
+
+
+
${basedir}/src/test/wsdl/AXIS2-5741.wsdl
+
+
org.apache.axis2.databinding.axis2_5741.client
+
+
@@ -128,7 +184,8 @@
-
${project.build.directory}/generated-sources/axis2/wsdl2code/src
+
${project.build.directory}/wsdl2code/mtom/src
+
${project.build.directory}/wsdl2code/AXIS2-5741/src
diff --git
a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
new file mode 100644
index 000..23caa81
--- /dev/null
+++
b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for
[axis-axis2-java-core] 37/38: Merged r1359499 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 16c5219a8cc1df3741d3e3879f1a55f7058b952f
Author: Sagara Gunathunga
AuthorDate: Tue Jul 10 07:16:42 2012 +
Merged r1359499 to 1.5 branch.
---
modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
b/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
index ca0ba93..e4a903f 100644
--- a/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
+++ b/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
@@ -80,7 +80,14 @@
axis2-xmlbeans
${project.version}
-
+
+jalopy
+jalopy
+
+
+ log4j
+log4j
+
org.apache.maven.shared
maven-plugin-testing-harness
[axis-axis2-java-core] 18/38: Merged r1242249 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 950a1d870a7f9731a43520a35d3cbb3393349ed0
Author: Sagara Gunathunga
AuthorDate: Thu Feb 9 09:24:01 2012 +
Merged r1242249 to the 1.5 branch.
---
.../src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
b/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
index 7bf632e..c198eb7 100644
---
a/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
+++
b/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
@@ -128,7 +128,7 @@ public class Java2WSDLMojo extends AbstractMojo {
/**
* Schema Generator
- * @parameter expression="${axis2.java2wsdl.nsGenClassName}"
+ * @parameter expression="${axis2.java2wsdl.schemaGenClassName}"
*/
private String schemaGenClassName;
[axis-axis2-java-core] 38/38: Merged 1359504 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 93c490c3c647996a2ed6640feef3f6fd61eb1599
Author: Sagara Gunathunga
AuthorDate: Tue Jul 10 07:29:46 2012 +
Merged 1359504 to 1.5 branch.
---
.../src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
b/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
index d2cb02d..414361e 100644
---
a/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
+++
b/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
@@ -72,8 +72,7 @@ public class WSDL2CodeMojo extends AbstractMojo {
* Package name of the generated sources; will be used to create a package
structure below the
* output directory.
*
- * @parameter expression="${axis2.wsdl2code.package}"
- * @required
+ * @parameter expression="${axis2.wsdl2code.package}" *
*/
private String packageName;
[axis-axis2-java-core] 36/38: AXIS2-5360 - Merged r1358508 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 3a1d4bddabfeefd71fa4619c337e26bc0f48caf4
Author: Sagara Gunathunga
AuthorDate: Sat Jul 7 06:17:13 2012 +
AXIS2-5360 - Merged r1358508 to 1.5 branch.
---
modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
b/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
index 440e000..d3004e3 100644
--- a/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
+++ b/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
@@ -47,7 +47,7 @@ public class PrettyPrinter {
// If the user has set "axis2.jalopy=false" on the system property,
// then just return back to caller
String property = System.getProperty("axis2.jalopy");
-if((property == null) || !JavaUtils.isTrueExplicitly(property)){
+if((property != null) && !JavaUtils.isTrueExplicitly(property)){
return;
}
PrintStream backupOutputStream = System.out;
@@ -55,7 +55,7 @@ public class PrettyPrinter {
System.setOut(new PrintStream(new ByteArrayOutputStream()));
System.setErr(new PrintStream(new ByteArrayOutputStream()));
try {
-Class clazzConfigurator =
Loader.loadClass("org.apache.log4j.PropertyConfigurator");
+Class clazzConfigurator =
Loader.loadClass("org.apache.log4j.PropertyConfigurator");
Method configure = clazzConfigurator.getMethod("configure", new
Class[]{Properties.class});
Properties properties = new Properties();
properties.setProperty("log4j.logger.de.hunsicker.jalopy.io",
@@ -63,7 +63,7 @@ public class PrettyPrinter {
configure.invoke(null, new Object[]{properties});
// Create an instance of the Jalopy bean
-Class clazz = Loader.loadClass("de.hunsicker.jalopy.Jalopy");
+Class clazz = Loader.loadClass("de.hunsicker.jalopy.Jalopy");
Object prettifier = clazz.newInstance();
// Set the input file
@@ -74,11 +74,11 @@ public class PrettyPrinter {
Method output = clazz.getMethod("setOutput", new
Class[]{File.class});
output.invoke(prettifier, new Object[]{file});
-Class clazz2 =
Loader.loadClass("de.hunsicker.jalopy.storage.Convention");
+Class clazz2 =
Loader.loadClass("de.hunsicker.jalopy.storage.Convention");
Method instance = clazz2.getMethod("getInstance", new Class[]{});
Object settings = instance.invoke(null, new Object[]{});
-Class clazz3 =
Loader.loadClass("de.hunsicker.jalopy.storage.ConventionKeys");
+Class clazz3 =
Loader.loadClass("de.hunsicker.jalopy.storage.ConventionKeys");
Field field = clazz3.getField("COMMENT_FORMAT_MULTI_LINE");
Object key = field.get(null);
Method put = clazz2.getMethod("put", new Class[]{key.getClass(),
String.class});
[axis-axis2-java-core] 09/12: AXIS2-5694: Merge r1730180 to the 1.6 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit bd7f0e6071390ad57538127d8faa3a20f4c64872
Author: Andreas Veithen
AuthorDate: Sun Feb 14 23:07:00 2016 +
AXIS2-5694: Merge r1730180 to the 1.6 branch.
---
modules/adb-tests/pom.xml | 145 +
.../apache/axis2/databinding/mtom/MTOMTest.java| 53
.../databinding/mtom/service/MTOMServiceImpl.java | 34 +
modules/adb-tests/src/test/wsdl/MTOMService.wsdl | 48 +++
pom.xml| 6 +
5 files changed, 286 insertions(+)
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
new file mode 100644
index 000..46d24ea
--- /dev/null
+++ b/modules/adb-tests/pom.xml
@@ -0,0 +1,145 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.axis2
+axis2
+1.6.5-SNAPSHOT
+../../pom.xml
+
+
+axis2-adb-tests
+Apache Axis2 - ADB Tests
+ADB Tests
+http://axis.apache.org/axis2/java/core/
+
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/adb-tests
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/adb-tests
+
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests
+
+
+
+${project.groupId}
+axis2-adb
+${project.version}
+test
+
+
+${project.groupId}
+axis2-transport-local
+${project.version}
+test
+
+
+${project.groupId}
+axis2-transport-http
+${project.version}
+test
+
+
+junit
+junit
+test
+
+
+org.apache.ws.commons.axiom
+testutils
+test
+
+
+com.sun.xml.ws
+jaxws-rt
+2.2.6
+
+
+
+
+
+
+${project.groupId}
+axis2-wsdl2code-maven-plugin
+${project.version}
+
+
+generate-test-sources
+
+wsdl2code
+
+
+src/test/wsdl/MTOMService.wsdl
+adb
+sync
+
org.apache.axis2.databinding.mtom.client
+
+
+
+
+
+org.codehaus.mojo
+jaxws-maven-plugin
+2.4.1
+
+
+
+wsimport-test
+
+
+
+
${basedir}/src/test/wsdl/MTOMService.wsdl
+
+
org.apache.axis2.databinding.mtom.service
+
+
+
+
+
+com.sun.xml.ws
+jaxws-tools
+2.2.6
+
+
+
+
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+process-test-resources
+
+add-test-source
+
+
+
+
${project.build.directory}/generated-sources/axis2/wsdl2code/src
+
+
+
+
+
+
+maven-deploy-plugin
+
+true
+
+
+
+
+
diff --git
a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
new file mode 100644
index 000..6ae0a79
--- /dev/null
+++
b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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
[axis-axis2-java-core] 05/38: Merged r1147485, r1149224, r1149491 and r1149578 to the 1.5 branch to ensure compatibility with Axiom 1.2.13.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit bff447b0a7f756c29bced965eb98f8af0fafe0bd
Author: Andreas Veithen
AuthorDate: Fri Sep 30 19:41:44 2011 +
Merged r1147485, r1149224, r1149491 and r1149578 to the 1.5 branch to
ensure compatibility with Axiom 1.2.13.
---
modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java| 10 ++
modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java | 12 +---
modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java | 7 +--
.../saaj/test/org/apache/axis2/saaj/SOAPElementTest.java| 13 +
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
index d6ed3d0..e9535b3 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
@@ -164,11 +164,14 @@ public class SOAPBodyImpl extends SOAPElementImpl
implements SOAPBody {
if (omSOAPBody.hasFault()) {
throw new SOAPException("A SOAPFault has been already added to
this SOAPBody");
}
+if (prefix == null) {
+prefix = "";
+}
SOAPBodyElementImpl childEle;
if (uri == null || "".equals(uri)) {
childEle = new SOAPBodyElementImpl(
(ElementImpl)getOwnerDocument().createElement(localName));
-} else if (prefix == null || "".equals(prefix)) {
+} else if (prefix.length() == 0) {
childEle = new SOAPBodyElementImpl(
(ElementImpl)getOwnerDocument().createElementNS(uri,
localName));
@@ -178,7 +181,7 @@ public class SOAPBodyImpl extends SOAPElementImpl
implements SOAPBody {
prefix +
":" + localName));
}
childEle.element.setUserData(SAAJ_NODE, childEle, null);
-childEle.element.setNamespace(childEle.element.declareNamespace(uri,
prefix));
+childEle.element.setNamespace(getOMFactory().createOMNamespace(uri,
prefix));
element.appendChild(childEle.element);
((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE,
this, null);
isBodyElementAdded = true;
@@ -546,8 +549,7 @@ public class SOAPBodyImpl extends SOAPElementImpl
implements SOAPBody {
qname.getLocalPart()));
}
childEle.element.setUserData(SAAJ_NODE, childEle, null);
-childEle.element.setNamespace(childEle.element.declareNamespace(
-qname.getNamespaceURI(), qname.getPrefix()));
+
childEle.element.setNamespace(getOMFactory().createOMNamespace(qname.getNamespaceURI(),
qname.getPrefix()));
element.appendChild(childEle.element);
((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE,
this, null);
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
index 065b980..991b8c8 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
@@ -175,7 +175,7 @@ public class SOAPElementImpl extends NodeImplEx implements
SOAPElement {
*/
public SOAPElement addChildElement(String localName, String prefix, String
uri)
throws SOAPException {
-OMNamespace omNamespace = element.declareNamespace(uri, prefix);
+OMNamespace omNamespace = prefix == null || prefix.length() == 0 ?
element.declareDefaultNamespace(uri) : element.declareNamespace(uri, prefix);
return addChildElement(localName, omNamespace.getPrefix());
}
@@ -194,7 +194,9 @@ public class SOAPElementImpl extends NodeImplEx implements
SOAPElement {
createElementNS(namespaceURI, prefix + ":" +
localName));
childEle.element.setUserData(SAAJ_NODE, childEle, null);
-
childEle.element.setNamespace(childEle.element.declareNamespace(namespaceURI,
prefix));
+childEle.element.setNamespace(prefix == null || prefix.length() == 0
+? childEle.element.declareDefaultNamespace(namespaceURI)
+: childEle.element.declareNamespace(namespaceURI, prefix));
element.appendChild(childEle.element);
((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE,
this, null);
childEle.setParentElement(this);
@@ -218,7 +220,11 @@ public class SOAPElementImpl extends NodeImplEx implements
SOAPElement {
* @see
javax.xml.soap.SOAPElement#addNamespaceDeclaration(java.lang.
[axis-axis2-java-core] 29/38: Mark r1341780 merged to 1.5 and applied given patch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 09be5641e4deaddc9d29b4ff8f16e27a9b7cc4fc
Author: Sagara Gunathunga
AuthorDate: Wed May 23 08:48:50 2012 +
Mark r1341780 merged to 1.5 and applied given patch.
---
.../axis2/databinding/utils/ConverterUtil.java | 18 +-
.../axis2/databinding/utils/ConverterUtilTest.java | 347 ++---
2 files changed, 317 insertions(+), 48 deletions(-)
diff --git
a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
index 9968867..6d845f3 100644
--- a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
+++ b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
@@ -882,6 +882,7 @@ public class ConverterUtil {
int second = 0;
long miliSecond = 0;
int timeZoneOffSet = TimeZone.getDefault().getRawOffset();
+boolean haveTimeZone;
if ((source != null) && (source.length() >= 19)) {
@@ -901,18 +902,22 @@ public class ConverterUtil {
int milliSecondPartLength = 0;
-if (source.length() > 19) {
+if (source.length() == 19) {
+haveTimeZone = false;
+} else {
String rest = source.substring(19);
if (rest.startsWith(".")) {
// i.e this have the ('.'s+) part
if (rest.endsWith("Z")) {
// this is in gmt time zone
+haveTimeZone = true;
timeZoneOffSet = 0;
calendar.setTimeZone(TimeZone.getTimeZone("GMT"));
miliSecond = Integer.parseInt(rest.substring(1,
rest.lastIndexOf("Z")));
milliSecondPartLength =
rest.substring(1,rest.lastIndexOf("Z")).trim().length();
} else if ((rest.lastIndexOf("+") > 0) ||
(rest.lastIndexOf("-") > 0)) {
// this is given in a general time zione
+haveTimeZone = true;
String timeOffSet = null;
if (rest.lastIndexOf("+") > 0) {
timeOffSet = rest.substring(rest.lastIndexOf("+")
+ 1);
@@ -938,6 +943,7 @@ public class ConverterUtil {
} else {
// i.e it does not have time zone
+haveTimeZone = false;
miliSecond = Integer.parseInt(rest.substring(1));
milliSecondPartLength =
rest.substring(1).trim().length();
}
@@ -946,9 +952,11 @@ public class ConverterUtil {
if (rest.startsWith("Z")) {
calendar.setTimeZone(TimeZone.getTimeZone("GMT"));
// this is in gmt time zone
+haveTimeZone = true;
timeZoneOffSet = 0;
} else if (rest.startsWith("+") || rest.startsWith("-")) {
// this is given in a general time zione
+haveTimeZone = true;
if (rest.charAt(3) != ':') {
throw new RuntimeException("invalid time zone
format (" + source
+ ") without : at correct place");
@@ -982,12 +990,14 @@ public class ConverterUtil {
}
calendar.set(Calendar.MILLISECOND, (int)miliSecond);
calendar.set(Calendar.ZONE_OFFSET, timeZoneOffSet);
-calendar.set(Calendar.DST_OFFSET, 0);
-
+// set the day light offset only if the time zone is present
+if (haveTimeZone) {
+calendar.set(Calendar.DST_OFFSET, 0);
+}
} else {
-throw new NumberFormatException("date string can not be less than
19 charactors");
+throw new NumberFormatException("date string can not be less than
19 characters");
}
return calendar;
diff --git
a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
index fc5ef08..49e62d6 100644
--- a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
+++ b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
@@ -84,53 +84,312 @@ public class ConverterUtilTest extends TestCase {
assertTrue(convertedObj.getClass().equals(boolean[].class));
}
+
+/**
+ * Used to by formatCa
[axis-axis2-java-core] 02/38: Merged r1037135 and r1037218 to the 1.5 branch to fix the ConcurrentModificationException that sometimes causes the Hudson build to fail.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 3309b80ebefdae766ee9bfc8edaa21d58be7
Author: Andreas Veithen
AuthorDate: Mon Sep 5 09:50:02 2011 +
Merged r1037135 and r1037218 to the 1.5 branch to fix the
ConcurrentModificationException that sometimes causes the Hudson build to fail.
---
.../axis2/jaxws/client/ReleaseServiceTests.java| 8 ---
.../description/impl/DescriptionFactoryImpl.java | 28 --
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git
a/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
b/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
index 803393a..36e143c 100644
--- a/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
+++ b/modules/jaxws/test/org/apache/axis2/jaxws/client/ReleaseServiceTests.java
@@ -84,8 +84,6 @@ public class ReleaseServiceTests extends TestCase {
epDesc= svcDesc.getEndpointDescription(portQN, delegate);
assertNull(epDesc);
-} catch (Throwable t) {
-fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
@@ -107,8 +105,6 @@ public class ReleaseServiceTests extends TestCase {
svc1.addPort(portQN, bindingID1, epr1);
}
org.apache.axis2.jaxws.spi.ServiceDelegate.releaseService(svc1);
-} catch (Throwable t) {
-fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
@@ -135,8 +131,6 @@ public class ReleaseServiceTests extends TestCase {
}
org.apache.axis2.jaxws.spi.ServiceDelegate.releaseService(svc1);
}
-} catch (Throwable t) {
-fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
@@ -541,8 +535,6 @@ public class ReleaseServiceTests extends TestCase {
ClientMetadataPortSEI port =
genSvc.getPort(ClientMetadataPortSEI.class);
org.apache.axis2.jaxws.spi.ServiceDelegate.releaseService(genSvc);
}
-} catch (Throwable t) {
-fail("Caught throwable " + t);
} finally {
ClientMetadataTest.restoreOriginalFactory();
}
diff --git
a/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
b/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
index 51e352f..7003807 100644
---
a/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
+++
b/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
@@ -503,18 +503,22 @@ public class DescriptionFactoryImpl {
log.debug("ServiceDescription not in use; will be removed
from cache");
}
svcDescRemoved = true;
-Set>
cacheEntrySet =
-cache.entrySet();
-Iterator>
cacheEntryIterator =
-cacheEntrySet.iterator();
-while (cacheEntryIterator.hasNext()) {
-Map.Entry entry =
-cacheEntryIterator.next();
-ServiceDescription entrySvcDescValue = entry.getValue();
-if (svcDesc == entrySvcDescValue) {
-cacheEntryIterator.remove();
-if (log.isDebugEnabled()) {
-log.debug("Removed service description from
cache");
+// Even if we use a Hashtable, we need to synchronize here to
avoid
+// ConcurrentModificationException when iterating over the
entries.
+synchronized (cache) {
+Set>
cacheEntrySet =
+cache.entrySet();
+Iterator>
cacheEntryIterator =
+cacheEntrySet.iterator();
+while (cacheEntryIterator.hasNext()) {
+Map.Entry entry =
+cacheEntryIterator.next();
+ServiceDescription entrySvcDescValue =
entry.getValue();
+if (svcDesc == entrySvcDescValue) {
+cacheEntryIterator.remove();
+if (log.isDebugEnabled()) {
+log.debug("Removed service description from
cache");
+}
}
}
}
[axis-axis2-java-core] 09/38: Merged r1190469 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 7ed1570ac8c39bc478b21e198f48b2c512231a61
Author: Andreas Veithen
AuthorDate: Fri Oct 28 17:53:48 2011 +
Merged r1190469 to the 1.5 branch.
---
modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
index 044532a..2f9032c 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
@@ -19,6 +19,7 @@
package org.apache.axis2.saaj;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.impl.dom.NodeImpl;
import org.apache.axiom.om.impl.dom.TextImpl;
@@ -197,7 +198,7 @@ public class SOAPEnvelopeImpl extends SOAPElementImpl
implements javax.xml.soap.
} else {
// Else this is a header
TextImpl doomText = new TextImpl(text,
this.element.getOMFactory());
-doomText.setNextOMSibling((NodeImpl)firstChild);
+doomText.setNextOMSibling((OMNode)firstChild);
doomText.setPreviousOMSibling(null);
element.setFirstChild(doomText);
((NodeImpl)firstChild).setPreviousOMSibling(doomText);
[axis-axis2-java-core] 07/38: Backported r795789 and part of r1042244 to the 1.5 branch to reduce the coupling to Axiom internals. This should solve AXIS2-4363 and AXIS2-4387.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit e929313a2986b02a9ff867456c38c1a954bf98c9
Author: Andreas Veithen
AuthorDate: Sat Oct 15 20:53:41 2011 +
Backported r795789 and part of r1042244 to the 1.5 branch to reduce the
coupling to Axiom internals. This should solve AXIS2-4363 and AXIS2-4387.
---
.../axis2/schema/template/ADBBeanTemplate.xsl | 194 +
.../types/soapencoding/Base64Binary.java | 42 +
.../axis2/databinding/types/xsd/Base64Binary.java | 26 +--
.../axis2/databinding/utils/ConverterUtil.java | 29 +--
4 files changed, 12 insertions(+), 279 deletions(-)
diff --git
a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
index 03fd807..2daa034 100644
---
a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
+++
b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
@@ -692,20 +692,6 @@
}
- /**
- * isReaderMTOMAware
- * @return true if the reader supports MTOM
- */
- public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader
reader) {
-boolean isReaderMTOMAware = false;
-
-try{
- isReaderMTOMAware =
java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE));
-}catch(java.lang.IllegalArgumentException e){
- isReaderMTOMAware = false;
-}
-return isReaderMTOMAware;
- }
/**
@@ -3052,33 +3038,7 @@
} else {
-if
(isReaderMTOMAware(reader)
-&&
-
java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_BINARY)))
-{
-//MTOM aware reader -
get the datahandler directly and put it in the object
-.add(
-
(javax.activation.DataHandler)
reader.getProperty(org.apache.axiom.om.OMConstants.DATA_HANDLER));
-} else {
-// Step in
-if
(reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT
&& .equals(reader.getName())) {
-reader.next();
-}
-if
(reader.getEventType() == javax.xml.stream.XMLStreamConstants.START_ELEMENT
&& reader.getName().equals(new
javax.xml.namespace.QName(org.apache.axiom.om.impl.MTOMConstants.XOP_NAMESPACE_URI,
org.apache.axiom.om.impl.MTOMConstants.XOP_INCLUDE)))
-{
-java.lang.String
id = org.apache.axiom.om.util.ElementHelper.getContentID(reader, "UTF-8");
-.add(((org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder)
((org.apache.axiom.om.impl.llom.OMStAXWrapper)
reader).getBuilder()).getDataHandler(id));
-reader.next();
-reader.next();
-} else
if(reader.hasText()) {
-//Do the usual
conversion
-java.lang.String
content = reader.getText();
-.add(
-
org.apache.axis2.databinding.utils.ConverterUtil.convertToBase64Binary(content));
-
reader.next();
-}
-
-}
+.add(org.apache.axiom.util.stax.XMLStreamReaderUtils.getDataHandlerFromElement(reader));
}
@@ -3107,30 +3067,7 @@
[axis-axis2-java-core] 11/38: Merged r922830 to the 1.5 branch to set up svn:ignore for the axis2-kernel module.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 8f3d0ceb594c17a08863dc396c0dc13a87c3f176 Author: Andreas Veithen AuthorDate: Fri Nov 11 11:35:25 2011 + Merged r922830 to the 1.5 branch to set up svn:ignore for the axis2-kernel module.
[axis-axis2-java-core] branch 1_6 created (now 9891c6f)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at 9891c6f Merge r1735371 to the 1.6 branch. This branch includes the following new commits: new 635eba8 [maven-release-plugin] prepare for next development iteration new 265897d Add empty release note for Axis2 1.6.5. new 18ecdef Merge r1722672 to the 1.6 branch. new c837f68 Merge r1723771 to the 1.6 branch. new 8526435 Merge r1725624 and r1730095 to the 1.6 branch. new f6ddc6d Merge r1686090 to the 1.6 branch for compatibility with recent Axiom versions. new e2be4b1 Merge r1703463 to the 1.6 branch. new 7195015 Upgrade the 1.6 branch to Axiom 1.2.17. new bd7f0e6 AXIS2-5694: Merge r1730180 to the 1.6 branch. new 82c7e75 AXIS2-5741: Merge r1730369 and r1730427 to the 1.6 branch and enable the unit test (The regression is in 1.7.0). new 578df91 AXIS2-5749: Merge r1735331 (unit test only) to the 1.6 branch. new 9891c6f Merge r1735371 to the 1.6 branch. The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-core] 26/38: Switched the Axis2 1.5 branch to Axiom 1.2.13.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 27919d3ef76b1668f933f4277853e98fd25d56c6 Author: Andreas Veithen AuthorDate: Mon Apr 9 14:19:03 2012 + Switched the Axis2 1.5 branch to Axiom 1.2.13. --- modules/parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml index 30b02b9..86287c7 100644 --- a/modules/parent/pom.xml +++ b/modules/parent/pom.xml @@ -68,8 +68,7 @@ 1.7.0 2.7.7 - -1.2.13-SNAPSHOT +1.2.13 2.4.0 1.3 1.2
[axis-axis2-java-core] 28/38: Merged r1331616 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 79d7495856c84740c46d53231dd750b669012426
Author: Andreas Veithen
AuthorDate: Sun Apr 29 20:13:24 2012 +
Merged r1331616 to the 1.5 branch.
---
.../kernel/src/org/apache/axis2/util/MessageContextBuilder.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
b/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
index d62fb00..5faa6b3 100644
--- a/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
@@ -482,13 +482,13 @@ public class MessageContextBuilder {
if (faultCodeQName.getLocalPart().indexOf(":") == -1) {
String prefix = faultCodeQName.getPrefix();
String uri = faultCodeQName.getNamespaceURI();
-// Get the specified prefix and uri
-prefix = prefix == null ? "" : prefix;
+// Get the specified uri
uri = uri == null || "" .equals(uri) ?
fault.getNamespace().getNamespaceURI() : uri;
// Make sure the prefix and uri are declared on the
fault, and
-// get the resulting prefix.
-prefix = fault.declareNamespace(uri,
prefix).getPrefix();
+// get the resulting prefix. If no prefix is defined,
let declareNamespace
+// generate one.
+prefix = fault.declareNamespace(uri, prefix.length()
== 0 ? null : prefix).getPrefix();
soapFaultCode = prefix + ":" +
faultCodeQName.getLocalPart();
} else {
soapFaultCode = faultCodeQName.getLocalPart();
[axis-axis2-java-core] 27/38: Merged r1326968 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 9997c20d9b6b2ffd322a85a822197bcef7d67314 Author: Sagara Gunathunga AuthorDate: Tue Apr 17 07:48:03 2012 + Merged r1326968 to the 1.5 branch. --- legal/apache-mime4j-core-LICENSE.txt | 203 +++ 1 file changed, 203 insertions(+) diff --git a/legal/apache-mime4j-core-LICENSE.txt b/legal/apache-mime4j-core-LICENSE.txt new file mode 100644 index 000..6b0b127 --- /dev/null +++ b/legal/apache-mime4j-core-LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, ro
[axis-axis2-java-core] 01/12: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 635eba87c54d09232ca2b0dd775fd752c9c7585a Author: Andreas Veithen AuthorDate: Mon Dec 28 21:56:55 2015 + [maven-release-plugin] prepare for next development iteration --- apidocs/pom.xml | 2 +- modules/adb-codegen/pom.xml | 8 modules/adb/pom.xml | 8 modules/addressing/pom.xml | 8 modules/clustering/pom.xml | 8 modules/codegen/pom.xml | 8 modules/corba/pom.xml | 8 modules/distribution/pom.xml| 8 modules/fastinfoset/pom.xml | 8 modules/integration/pom.xml | 8 modules/java2wsdl/pom.xml | 8 modules/jaxbri/pom.xml | 8 modules/jaxws-integration/pom.xml | 8 modules/jaxws-mar/pom.xml | 8 modules/jaxws/pom.xml | 8 modules/jibx/pom.xml| 8 modules/json/pom.xml| 8 modules/kernel/pom.xml | 8 modules/metadata/pom.xml| 8 modules/mex/pom.xml | 8 modules/mtompolicy-mar/pom.xml | 8 modules/mtompolicy/pom.xml | 8 modules/osgi-tests/pom.xml | 8 modules/osgi/pom.xml| 8 modules/ping/pom.xml| 8 modules/resource-bundle/pom.xml | 8 modules/saaj/pom.xml| 8 modules/samples/java_first_jaxws/pom.xml| 10 +- modules/samples/jaxws-addressbook/pom.xml | 4 ++-- modules/samples/jaxws-calculator/pom.xml| 4 ++-- modules/samples/jaxws-interop/pom.xml | 4 ++-- modules/samples/jaxws-samples/pom.xml | 12 ++-- modules/samples/jaxws-version/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/samples/transport/https-sample/httpsClient/pom.xml | 4 ++-- modules/samples/transport/https-sample/httpsService/pom.xml | 4 ++-- modules/samples/transport/https-sample/pom.xml | 2 +- modules/samples/transport/jms-sample/jmsService/pom.xml | 4 ++-- modules/samples/transport/jms-sample/pom.xml| 2 +- modules/samples/version/pom.xml | 8 modules/scripting/pom.xml | 8 modules/soapmonitor/module/pom.xml | 8 modules/soapmonitor/servlet/pom.xml | 8 modules/spring/pom.xml | 8 modules/testutils/pom.xml | 8 modules/tool/axis2-aar-maven-plugin/pom.xml | 8 modules/tool/axis2-ant-plugin/pom.xml | 8 modules/tool/axis2-eclipse-codegen-plugin/pom.xml | 8 modules/tool/axis2-eclipse-service-plugin/pom.xml | 8 modules/tool/axis2-idea-plugin/pom.xml | 8 modules/tool/axis2-java2wsdl-maven-plugin/pom.xml | 8 modules/tool/axis2-mar-maven-plugin/pom.xml | 8 modules/tool/axis2-repo-maven-plugin/pom.xml| 8 modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 8 modules/tool/simple-server-maven-plugin/pom.xml | 8 modules/transport/base/pom.xml | 8 modules/transport/http/pom.xml | 8 modules/transport/jms/pom.xml | 8 modules/transport/local/pom.xml | 8 modules/transport/mail/pom.xml | 8 modules/transport/tcp/pom.xml | 8 modules/transport/testkit/pom.xml | 8 modules/transport/udp
[axis-axis2-java-core] 10/38: AXIS2-5173: Merged r835745 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 7be8bc96ff719d01beda963ea3f777f5d48e7d9e
Author: Andreas Veithen
AuthorDate: Sat Oct 29 16:04:12 2011 +
AXIS2-5173: Merged r835745 to the 1.5 branch.
---
.../org/apache/axis2/jaxbri/CodeGenerationUtility.java| 15 +++
1 file changed, 15 insertions(+)
diff --git
a/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java
b/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java
index 132c37a..bd19793 100644
--- a/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java
+++ b/modules/jaxbri/src/org/apache/axis2/jaxbri/CodeGenerationUtility.java
@@ -201,6 +201,21 @@ public class CodeGenerationUtility {
});
sc.parseSchema((InputSource) schemaToInputSourceMap.get(key));
+sc.getOptions().addGrammar((InputSource)
schemaToInputSourceMap.get(key));
+
+for (Object property : properties.keySet()){
+String propertyName = (String) property;
+if (propertyName.startsWith("X")) {
+String[] args = null;
+String propertyValue = (String)
properties.get(property);
+if (propertyValue != null) {
+args = new String[]{"-" + propertyName,
propertyValue};
+} else {
+args = new String[]{"-" + propertyName};
+}
+sc.getOptions().parseArguments(args);
+}
+}
// Bind the XML
S2JJAXBModel jaxbModel = sc.bind();
[axis-axis2-java-core] 12/12: Merge r1735371 to the 1.6 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 9891c6ff2820f0e633bc8c3ae930ca1ba1c43ea9 Author: Andreas Veithen AuthorDate: Thu Mar 17 07:54:34 2016 + Merge r1735371 to the 1.6 branch. --- modules/adb-tests/pom.xml | 15 +++ 1 file changed, 15 insertions(+) diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml index 36722f4..671b54a 100644 --- a/modules/adb-tests/pom.xml +++ b/modules/adb-tests/pom.xml @@ -232,6 +232,21 @@ true + + +maven-javadoc-plugin + + +attach-javadocs +none + +jar + + + +
[axis-axis2-java-core] 11/12: AXIS2-5749: Merge r1735331 (unit test only) to the 1.6 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 578df916e85b8b799ab71d58a752d516a022940b
Author: Andreas Veithen
AuthorDate: Wed Mar 16 22:55:13 2016 +
AXIS2-5749: Merge r1735331 (unit test only) to the 1.6 branch.
---
modules/adb-tests/pom.xml | 35
.../axis2/databinding/axis2_5749/ServiceTest.java | 54 +++
.../axis2_5749/service/ColorServiceImpl.java | 36 +
modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl| 62 ++
modules/adb-tests/src/test/xslt/AXIS2-5749.xsl | 11
5 files changed, 198 insertions(+)
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index 43a11ef..36722f4 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -105,6 +105,20 @@
${project.build.directory}/wsdl2code/AXIS2-5741
+
+wsdl2code-axis2-5749
+generate-test-sources
+
+wsdl2code
+
+
+src/test/wsdl/AXIS2-5749.wsdl
+
org.apache.axis2.databinding.axis2_5749.service
+true
+true
+
${project.build.directory}/wsdl2code/AXIS2-5749
+
+
adb
@@ -130,6 +144,14 @@
src/test/xslt/AXIS2-5741.xsl
${project.build.directory}/repo/AXIS2-5741/services/FiverxLinkService/META-INF
+
+
${project.build.directory}/wsdl2code/AXIS2-5749/resources
+
+services.xml
+
+
src/test/xslt/AXIS2-5749.xsl
+
${project.build.directory}/repo/AXIS2-5749/services/ColorService/META-INF
+
@@ -164,6 +186,18 @@
org.apache.axis2.databinding.axis2_5741.client
+
+wsimport-axis2-5749
+
+wsimport-test
+
+
+
+
${basedir}/src/test/wsdl/AXIS2-5749.wsdl
+
+
org.apache.axis2.databinding.axis2_5749.client
+
+
@@ -186,6 +220,7 @@
${project.build.directory}/wsdl2code/mtom/src
${project.build.directory}/wsdl2code/AXIS2-5741/src
+
${project.build.directory}/wsdl2code/AXIS2-5749/src
diff --git
a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
new file mode 100644
index 000..316e389
--- /dev/null
+++
b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.databinding.axis2_5749;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import javax.xml.ws.BindingProvider;
+
+import org.apache.axiom.testutils.PortAllocator;
+import org.apache.axis2.context.ConfigurationContext;
+imp
[axis-axis2-java-core] 04/04: Reintegrated changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch xmlschema2 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 84be3fddaec3461094f3d33e490c5a4229aa96e0 Merge: febefc5 8a17d00 Author: Andreas Veithen AuthorDate: Wed Aug 17 19:15:19 2011 + Reintegrated changes from trunk. .../org/apache/axis2/schema/ExtensionUtility.java | 23 -- .../org/apache/axis2/schema/SchemaCompiler.java| 4 .../java2wsdl/DefaultSchemaGenerator.java | 13 +++- .../java2wsdl/DefaultSchemaGeneratorTest.java | 2 +- 4 files changed, 4 insertions(+), 38 deletions(-)
[axis-axis2-java-core] 02/04: Modified the POMs to refer to XmlSchema 2.0.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch xmlschema2
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 1a72c184414ddc2240bb5847a5aaa48f16644205
Author: Andreas Veithen
AuthorDate: Tue Aug 16 18:43:37 2011 +
Modified the POMs to refer to XmlSchema 2.0.
---
modules/adb-codegen/pom.xml| 4 ++--
modules/fastinfoset/pom.xml| 4 ++--
modules/java2wsdl/pom.xml | 4 ++--
modules/kernel/pom.xml | 4 ++--
modules/parent/pom.xml | 6 +++---
modules/tool/axis2-ant-plugin/pom.xml | 4 ++--
modules/tool/axis2-idea-plugin/pom.xml | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml
index e97cd53..a942da5 100644
--- a/modules/adb-codegen/pom.xml
+++ b/modules/adb-codegen/pom.xml
@@ -47,8 +47,8 @@
${project.version}
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
commons-cli
diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml
index ecedba3..0cb6941 100644
--- a/modules/fastinfoset/pom.xml
+++ b/modules/fastinfoset/pom.xml
@@ -62,8 +62,8 @@
commons-fileupload
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
org.apache.axis2
diff --git a/modules/java2wsdl/pom.xml b/modules/java2wsdl/pom.xml
index 3481b38..904ab8f 100644
--- a/modules/java2wsdl/pom.xml
+++ b/modules/java2wsdl/pom.xml
@@ -58,8 +58,8 @@
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
org.apache.geronimo.specs
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml
index df61967..ee11398 100644
--- a/modules/kernel/pom.xml
+++ b/modules/kernel/pom.xml
@@ -65,8 +65,8 @@
wsdl4j
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
org.apache.neethi
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 9c30d7f..8a60312 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -70,7 +70,7 @@
1.2.13-SNAPSHOT
3.0.2-SNAPSHOT
1.0-SNAPSHOT
-1.4.8-SNAPSHOT
+2.0.1-SNAPSHOT
1.7.0
@@ -610,8 +610,8 @@
${axiom.version}
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
${xmlschema.version}
diff --git a/modules/tool/axis2-ant-plugin/pom.xml
b/modules/tool/axis2-ant-plugin/pom.xml
index 83a226a..ef97c98 100644
--- a/modules/tool/axis2-ant-plugin/pom.xml
+++ b/modules/tool/axis2-ant-plugin/pom.xml
@@ -81,8 +81,8 @@
neethi
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
org.apache.geronimo.specs
diff --git a/modules/tool/axis2-idea-plugin/pom.xml
b/modules/tool/axis2-idea-plugin/pom.xml
index 57e80ff..99776ee 100644
--- a/modules/tool/axis2-idea-plugin/pom.xml
+++ b/modules/tool/axis2-idea-plugin/pom.xml
@@ -113,8 +113,8 @@
xmlbeans
-org.apache.ws.commons.schema
-XmlSchema
+org.apache.ws.xmlschema
+xmlschema-core
org.apache.woden
[axis-axis2-java-core] branch xmlschema2 created (now 84be3fd)
This is an automated email from the ASF dual-hosted git repository. billblough pushed a change to branch xmlschema2 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git. at 84be3fd Reintegrated changes from trunk. This branch includes the following new commits: new a73d435 Created a branch to prepare the migration to XmlSchema 2.0. new 1a72c18 Modified the POMs to refer to XmlSchema 2.0. new febefc5 Reintegrated changes from trunk. new 84be3fd Reintegrated changes from trunk. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[axis-axis2-java-core] 03/38: Merged r1174618 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 0c5cb2a1d2c07c2c18d69db880e7521eb5e51601
Author: Sagara Gunathunga
AuthorDate: Fri Sep 23 09:49:08 2011 +
Merged r1174618 to the 1.5 branch.
---
.../transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
index b2f5b3b..4d30dea 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
@@ -80,7 +80,7 @@ public class HTTPWorker implements Worker {
response.addHeader(new BasicHeader("Location", contextPath));
return;
}
-if (uri.endsWith("axis2/services/")) {
+if (uri.endsWith(contextPath)) {
String s =
HTTPTransportReceiver.getServicesHTML(configurationContext);
response.setStatus(HttpStatus.SC_OK);
response.setContentType("text/html");
[axis-axis2-java-core] 02/12: Add empty release note for Axis2 1.6.5.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 265897d0ea5f8cba59e4bf994fef01cd4b9095e4 Author: Andreas Veithen AuthorDate: Mon Dec 28 23:41:40 2015 + Add empty release note for Axis2 1.6.5. --- src/site/markdown/release-notes/1.6.5.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/markdown/release-notes/1.6.5.md b/src/site/markdown/release-notes/1.6.5.md new file mode 100644 index 000..e69de29
[axis-axis2-java-core] 06/38: Switched Axiom to 1.2.13-SNAPSHOT.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 0847de1fb329154cb489cae7cad8923f6909d318 Author: Andreas Veithen AuthorDate: Sat Oct 1 22:29:32 2011 + Switched Axiom to 1.2.13-SNAPSHOT. --- modules/parent/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml index 5e467a2..30b02b9 100644 --- a/modules/parent/pom.xml +++ b/modules/parent/pom.xml @@ -68,7 +68,8 @@ 1.7.0 2.7.7 -1.2.12 + +1.2.13-SNAPSHOT 2.4.0 1.3 1.2
[axis-axis2-java-core] 33/38: AXIS2-5349 - Merged r1352413 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 18e5409e057ac93da954fb6397f70ba770376e63 Author: Sagara Gunathunga AuthorDate: Thu Jun 21 05:44:39 2012 + AXIS2-5349 - Merged r1352413 to 1.5 branch. --- .../src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl | 4 .../src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl | 5 + 2 files changed, 9 insertions(+) diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl index 9ad532b..729cd87 100644 --- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl +++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl @@ -32,6 +32,8 @@ * Axis2/C skeleton for the axisService- Header file */ +#ifndef _H +#define _H #include <axis2_svc_skeleton.h> #include <axutil_log_default.h> @@ -115,5 +117,7 @@ #ifdef __cplusplus } #endif + +#endif diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl index ed76f7a..7a58e55 100644 --- a/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl +++ b/modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl @@ -38,6 +38,9 @@ * by the Apache Axis2/Java version: #axisVersion# #today# */ +#ifndef _H +#define _H + #include <stdio.h> #include <axiom.h> #include <axutil_utils.h> @@ -241,5 +244,7 @@ #ifdef __cplusplus } #endif + +#endif
[axis-axis2-java-core] 05/12: Merge r1725624 and r1730095 to the 1.6 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 852643579efbd81e9c207a18cb4520163fa32055 Author: Andreas Veithen AuthorDate: Sun Feb 14 20:27:37 2016 + Merge r1725624 and r1730095 to the 1.6 branch.
[axis-axis2-java-core] 03/12: Merge r1722672 to the 1.6 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 18ecdef7fdcb54a846d6281721583dd4ceb6e63f Author: Andreas Veithen AuthorDate: Sat Jan 2 22:01:04 2016 + Merge r1722672 to the 1.6 branch. --- src/site/markdown/release-process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/markdown/release-process.md b/src/site/markdown/release-process.md index c54e2b8..770c716 100644 --- a/src/site/markdown/release-process.md +++ b/src/site/markdown/release-process.md @@ -239,6 +239,6 @@ of Axis2, because not everybody subscribed to that list knows about the project. 2. Update the status of the release version in JIRA. -3. Remove old (archived) releases from <https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/>. +3. Remove old (archived) releases from <https://dist.apache.org/repos/dist/release/axis/axis2/java/core/>. 4. Create an empty release note for the next release under `src/site/markdown/release-notes`.
[axis-axis2-java-core] 14/38: Merged r1201467 to the 1.5 branch to make sure that the build succeeds with Axiom 1.2.13-SNAPSHOT.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 0ce4c8f541c8b93affad6c8a82a497df97be22ce
Author: Andreas Veithen
AuthorDate: Tue Nov 15 10:04:05 2011 +
Merged r1201467 to the 1.5 branch to make sure that the build succeeds with
Axiom 1.2.13-SNAPSHOT.
---
.../src/org/apache/axis2/saaj/SOAPElementImpl.java | 32 --
.../org/apache/axis2/saaj/SOAPElementTest.java | 26 ++
2 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
index 991b8c8..5e1e293 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
@@ -173,10 +173,23 @@ public class SOAPElementImpl extends NodeImplEx
implements SOAPElement {
/* (non-Javadoc)
* @see javax.xml.soap.SOAPElement#addChildElement(java.lang.String,
java.lang.String, java.lang.String)
*/
-public SOAPElement addChildElement(String localName, String prefix, String
uri)
+public SOAPElement addChildElement(String localName, String prefix, String
namespaceURI)
throws SOAPException {
-OMNamespace omNamespace = prefix == null || prefix.length() == 0 ?
element.declareDefaultNamespace(uri) : element.declareNamespace(uri, prefix);
-return addChildElement(localName, omNamespace.getPrefix());
+if (prefix == null) {
+prefix = "";
+}
+SOAPElementImpl childEle =
+new SOAPElementImpl((ElementImpl)getOwnerDocument().
+createElementNS(namespaceURI, prefix.length() == 0 ?
localName : prefix + ":" + localName));
+
+childEle.element.setUserData(SAAJ_NODE, childEle, null);
+childEle.element.setNamespace(prefix.length() == 0
+? childEle.element.declareDefaultNamespace(namespaceURI)
+: childEle.element.declareNamespace(namespaceURI, prefix));
+element.appendChild(childEle.element);
+((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE,
this, null);
+childEle.setParentElement(this);
+return childEle;
}
/* (non-Javadoc)
@@ -189,18 +202,7 @@ public class SOAPElementImpl extends NodeImplEx implements
SOAPElement {
throw new SOAPException("Namespace not declared for the give
prefix: " + prefix);
}
-SOAPElementImpl childEle =
-new SOAPElementImpl((ElementImpl)getOwnerDocument().
-createElementNS(namespaceURI, prefix + ":" +
localName));
-
-childEle.element.setUserData(SAAJ_NODE, childEle, null);
-childEle.element.setNamespace(prefix == null || prefix.length() == 0
-? childEle.element.declareDefaultNamespace(namespaceURI)
-: childEle.element.declareNamespace(namespaceURI, prefix));
-element.appendChild(childEle.element);
-((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE,
this, null);
-childEle.setParentElement(this);
-return childEle;
+return addChildElement(localName, prefix, namespaceURI);
}
/* (non-Javadoc)
diff --git a/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
b/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
index c386527..370535c 100644
--- a/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
+++ b/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
@@ -38,6 +38,7 @@ import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
@@ -196,6 +197,31 @@ public class SOAPElementTest extends Assert {
}
@Validated @Test
+public void testAddChildElementWithUndeclaredNamespace() throws Exception {
+SOAPElement element = SOAPFactory.newInstance().createElement("test");
+SOAPElement child = element.addChildElement("test", "p", "urn:ns");
+assertEquals(0, element.getAttributes().getLength());
+assertEquals("urn:ns", child.getNamespaceURI());
+assertEquals("p", child.getPrefix());
+assertEquals("test", child.getLocalName());
+Attr nsDecl =
child.getAttributeNodeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "p");
+assertNotNull(nsDecl);
+assertEquals("urn:ns", nsDecl.getValue());
+}
+
+@Validated @Test
+public void testAddChildElementWithDeclaredNamespace()
[axis-axis2-java-core] 08/38: Merged r1185504 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit b29d549a9566470d3d5c805060ca6617466133a7
Author: Sagara Gunathunga
AuthorDate: Tue Oct 18 07:23:43 2011 +
Merged r1185504 to the 1.5 branch.
---
.../axis2/databinding/utils/ConverterUtil.java | 34 ++
.../axis2/databinding/utils/ConverterUtilTest.java | 15 ++
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git
a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
index ad98668..9968867 100644
--- a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
+++ b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
@@ -73,6 +73,7 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.io.IOException;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -1316,18 +1317,27 @@ public class ConverterUtil {
*
* @return string
*/
-public static String getStringFromDatahandler(DataHandler dataHandler) {
-try {
-InputStream inStream;
-if (dataHandler == null) {
-return "";
-}
-inStream = dataHandler.getDataSource().getInputStream();
-byte[] data = IOUtils.getStreamAsByteArray(inStream);
-return Base64.encode(data);
-} catch (Exception e) {
-throw new RuntimeException(e);
-}
+ public static String getStringFromDatahandler(DataHandler dataHandler) {
+ InputStream inStream = null;
+ try {
+ if (dataHandler == null) {
+ return "";
+ }
+ inStream = dataHandler.getDataSource().getInputStream();
+ byte[] data = IOUtils.getStreamAsByteArray(inStream);
+ return Base64.encode(data);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+
+ } finally {
+ try {
+ if (inStream != null)
+ inStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
}
/**
diff --git
a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
index 63d47ba..fc5ef08 100644
--- a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
+++ b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
@@ -29,6 +29,12 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+
+import org.apache.axiom.attachments.ByteArrayDataSource;
+import org.apache.axiom.om.util.Base64;
+
public class ConverterUtilTest extends TestCase {
/** Test conversion of Big Integer */
@@ -165,4 +171,13 @@ public class ConverterUtilTest extends TestCase {
}
+
+ public void testConvertToStringFromDataHandler() {
+ String inStr = "Sample Data";
+ DataSource ds = new ByteArrayDataSource(inStr.getBytes());
+ DataHandler dh = new DataHandler(ds);
+ String rawOutStr = ConverterUtil.convertToString(dh);
+ String outStr = new String(Base64.decode(rawOutStr));
+ assertEquals("Not expected content", inStr, outStr);
+ }
}
[axis-axis2-java-core] 13/38: Merged r1201957 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 6c7a3dc78d107c895ae45aac4dae8b4e927d09b4
Author: Sagara Gunathunga
AuthorDate: Mon Nov 14 23:06:14 2011 +
Merged r1201957 to the 1.5 branch.
---
.../http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
b/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
index 95af246..ecd156b 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
@@ -38,7 +38,6 @@ import org.apache.axis2.util.OptionsParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
@@ -166,11 +165,11 @@ public class SimpleHTTPServer implements
TransportListener {
// should all transports be started? specified as "-t all"
if (startAllTransports) {
-Iterator iter = configctx.getAxisConfiguration().
+Iterator iter = configctx.getAxisConfiguration().
getTransportsIn().keySet().iterator();
while (iter.hasNext()) {
-QName trp = (QName) iter.next();
-if (!new QName(Constants.TRANSPORT_HTTP).equals(trp)) {
+String trp = iter.next();
+if (!Constants.TRANSPORT_HTTP.equals(trp)) {
trsIn = (TransportInDescription)
configctx.getAxisConfiguration().getTransportsIn().get(trp);
listenerManager.addListener(trsIn, false);
[axis-axis2-java-core] 25/38: Merged r1300358 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit a41bfca7ba683c6944f9b92fe75a97d450ca534e
Author: Andreas Veithen
AuthorDate: Tue Mar 13 21:33:29 2012 +
Merged r1300358 to the 1.5 branch.
---
.../src/org/apache/axis2/saaj/MessageFactoryImpl.java | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
index 19365a8..6722ca0 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/MessageFactoryImpl.java
@@ -96,21 +96,20 @@ public class MessageFactoryImpl extends MessageFactory {
* protocol of this MessageFactory instance is
DYNAMIC_SOAP_PROTOCOL
*/
public SOAPMessage createMessage() throws SOAPException {
-SOAPEnvelopeImpl soapEnvelope;
+org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl soapEnvelope;
if (soapVersion.equals(SOAPConstants.SOAP_1_2_PROTOCOL)) {
-soapEnvelope =
-new
SOAPEnvelopeImpl((org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl)
-new SOAP12Factory().getDefaultEnvelope());
+soapEnvelope = (org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl)
+new SOAP12Factory().getDefaultEnvelope();
} else if (soapVersion.equals(SOAPConstants.DYNAMIC_SOAP_PROTOCOL)) {
throw new UnsupportedOperationException("createMessage() is not
supported for " +
"DYNAMIC_SOAP_PROTOCOL");
} else {
//SOAP 1.1
-soapEnvelope =
-new
SOAPEnvelopeImpl((org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl)
-new SOAP11Factory().getDefaultEnvelope());
+soapEnvelope = (org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl)
+new SOAP11Factory().getDefaultEnvelope();
}
-SOAPMessageImpl soapMessage = new SOAPMessageImpl(soapEnvelope);
+soapEnvelope.getOwnerDocument().appendChild(soapEnvelope);
+SOAPMessageImpl soapMessage = new SOAPMessageImpl(new
SOAPEnvelopeImpl(soapEnvelope));
soapMessage.setSaveRequired();
return soapMessage;
}
[axis-axis2-java-core] 20/38: Merged r1297744 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit a5455e4818ac4120363a9d3c0f8e4ef4478ee391
Author: Andreas Veithen
AuthorDate: Tue Mar 6 22:17:28 2012 +
Merged r1297744 to the 1.5 branch.
---
modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java | 5 +
1 file changed, 5 insertions(+)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
b/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
index 469d3c0..04f0f3b 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
@@ -293,4 +293,9 @@ public abstract class NodeImplEx extends NodeImpl
implements Node {
return saajSOAPElement;
}
}
+
+// TODO: the existence of this method probably indicates a problem in
TextImplEx
+public org.w3c.dom.Node getParentNode() {
+return null;
+}
}
[axis-axis2-java-core] 01/38: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 0a3414863cda35c08daf511a744d77925c8d13fe Author: Andreas Veithen AuthorDate: Tue Aug 30 19:54:27 2011 + [maven-release-plugin] prepare for next development iteration --- modules/adb-codegen/pom.xml | 8 modules/adb/pom.xml | 8 modules/addressing/pom.xml| 8 modules/clustering/pom.xml| 8 modules/codegen/pom.xml | 8 modules/corba/pom.xml | 8 modules/distribution/pom.xml | 8 modules/fastinfoset/pom.xml | 8 modules/integration/pom.xml | 8 modules/java2wsdl/pom.xml | 8 modules/jaxbri/pom.xml| 8 modules/jaxws-integration/pom.xml | 8 modules/jaxws-mar/pom.xml | 8 modules/jaxws/pom.xml | 8 modules/jibx/pom.xml | 8 modules/json/pom.xml | 8 modules/kernel/pom.xml| 8 modules/metadata/pom.xml | 8 modules/mex/pom.xml | 8 modules/mtompolicy-mar/pom.xml| 8 modules/mtompolicy/pom.xml| 8 modules/osgi/pom.xml | 8 modules/parent/pom.xml| 8 modules/ping/pom.xml | 8 modules/resource-bundle/pom.xml | 8 modules/saaj/pom.xml | 8 modules/samples/java_first_jaxws/pom.xml | 10 +- modules/samples/jaxws-addressbook/pom.xml | 4 ++-- modules/samples/jaxws-calculator/pom.xml | 4 ++-- modules/samples/jaxws-interop/pom.xml | 4 ++-- modules/samples/jaxws-samples/pom.xml | 12 ++-- modules/samples/jaxws-version/pom.xml | 2 +- modules/samples/version/pom.xml | 8 modules/scripting/pom.xml | 8 modules/soapmonitor/module/pom.xml| 8 modules/soapmonitor/servlet/pom.xml | 8 modules/spring/pom.xml| 8 modules/testutils/pom.xml | 8 modules/tool/axis2-aar-maven-plugin/pom.xml | 8 modules/tool/axis2-ant-plugin/pom.xml | 8 modules/tool/axis2-eclipse-codegen-plugin/pom.xml | 8 modules/tool/axis2-eclipse-service-plugin/pom.xml | 8 modules/tool/axis2-idea-plugin/pom.xml| 8 modules/tool/axis2-java2wsdl-maven-plugin/pom.xml | 8 modules/tool/axis2-mar-maven-plugin/pom.xml | 8 modules/tool/axis2-repo-maven-plugin/pom.xml | 8 modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 8 modules/transport/http/pom.xml| 8 modules/transport/local/pom.xml | 8 modules/webapp/pom.xml| 8 modules/xmlbeans/pom.xml | 8 pom.xml | 8 52 files changed, 202 insertions(+), 202 deletions(-) diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml index 44793e9..2a3ffea 100644 --- a/modules/adb-codegen/pom.xml +++ b/modules/adb-codegen/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2-parent -1.5.6 +1.5.7-SNAPSHOT ../parent/pom.xml axis2-adb-codegen @@ -58,9 +58,9 @@ http://axis.apache.org/axis2/java/core/ - scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.5.6/modules/adb-codegen - scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.5.6/modules/adb-codegen - http://svn.apache.org/viewvc/axis/axis2/java/core/tags/v1.5.6/modules/adb-codegen + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_5/modules/adb-codegen + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_5/modules/adb-codegen + http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/adb-codegen src diff --git a/modules/adb/pom.xml b/modules/adb/pom.xml index 1956314..8ddd15f 100644 --- a/modules/adb/pom.xml +++ b/modules/adb/pom.xml @@ -24,7 +24,7
[axis-axis2-java-core] 15/38: Merged r1220630 to the 1.5 branch for use in the Sandesha2 build.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 15d9a12627204f122010d6b43315529cca52831c
Author: Andreas Veithen
AuthorDate: Wed Dec 21 10:03:09 2011 +
Merged r1220630 to the 1.5 branch for use in the Sandesha2 build.
---
.../org/apache/axis2/testutils/PortAllocator.java | 42 ++
.../http/server/DefaultConnectionListener.java | 23 ++--
.../transport/http/server/SimpleHttpServer.java| 11 --
3 files changed, 71 insertions(+), 5 deletions(-)
diff --git
a/modules/testutils/src/main/java/org/apache/axis2/testutils/PortAllocator.java
b/modules/testutils/src/main/java/org/apache/axis2/testutils/PortAllocator.java
new file mode 100644
index 000..d8fdf8e
--- /dev/null
+++
b/modules/testutils/src/main/java/org/apache/axis2/testutils/PortAllocator.java
@@ -0,0 +1,42 @@
+/*
+ * 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.testutils;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+public final class PortAllocator {
+private PortAllocator() {}
+
+/**
+ * Allocate a TCP port.
+ *
+ * @return the allocated port
+ */
+public static int allocatePort() {
+try {
+ServerSocket ss = new ServerSocket(0);
+int port = ss.getLocalPort();
+ss.close();
+return port;
+} catch (IOException ex) {
+throw new Error("Unable to allocate TCP port", ex);
+}
+}
+}
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
index d931c8b..2c39991 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
@@ -72,8 +72,11 @@ public class DefaultConnectionListener implements
IOProcessor {
if (LOG.isInfoEnabled()) {
LOG.info("Listening on port " + port);
}
-serversocket = new ServerSocket(port);
-serversocket.setReuseAddress(true);
+synchronized (this) {
+serversocket = new ServerSocket(port);
+serversocket.setReuseAddress(true);
+notifyAll();
+}
}
LOG.debug("Waiting for incoming HTTP connection");
Socket socket = this.serversocket.accept();
@@ -96,12 +99,26 @@ public class DefaultConnectionListener implements
IOProcessor {
}
} finally {
destroy();
+synchronized (this) {
+notifyAll();
+}
}
}
-public void close() throws IOException {
+public synchronized void awaitSocketOpen() throws InterruptedException {
+while (serversocket == null) {
+wait();
+}
+}
+
+public synchronized int getPort() {
+return serversocket.getLocalPort();
+}
+
+public synchronized void close() throws IOException {
if (this.serversocket != null) {
this.serversocket.close();
+this.serversocket = null;
}
}
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
index b2d6a97..7debb56 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
@@ -38,7 +38,7 @@ public class SimpleHttpServer {
private static final int SHUTDOWN_GRACE_PERIOD = 3000; // ms
private HttpFactory httpFactory;
-private final i
[axis-axis2-java-core] 35/38: AXIS2-5355 - Merged r1356080 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit afa04b28001641358afd6c96d62ee043316b5f6d
Author: Sagara Gunathunga
AuthorDate: Mon Jul 2 06:52:19 2012 +
AXIS2-5355 - Merged r1356080 to 1.5 branch.
---
modules/kernel/src/org/apache/axis2/description/AxisService.java | 3 ++-
.../transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisService.java
b/modules/kernel/src/org/apache/axis2/description/AxisService.java
index 58f73cc..8866154 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisService.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisService.java
@@ -1260,9 +1260,10 @@ public class AxisService extends AxisDescription {
if ((xsd != null) && (!"".equals(xsd))) {
XmlSchema schema = (XmlSchema) schemaMappingtable.get(xsd);
if (schema == null) {
-int dotIndex = xsd.indexOf('.');
+int dotIndex = xsd.lastIndexOf('.');
if (dotIndex > 0) {
String schemaKey = xsd.substring(0, dotIndex);
+schemaKey = schemaKey.replace("./" , "");
schema = (XmlSchema) schemaMappingtable.get(schemaKey);
}
}
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
index 4d30dea..186a110 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
@@ -161,9 +161,10 @@ public class HTTPWorker implements Worker {
Map schemaTable = service.getSchemaMappingTable();
XmlSchema schema = (XmlSchema) schemaTable.get(schemaName);
if (schema == null) {
-int dotIndex = schemaName.indexOf('.');
+int dotIndex = schemaName.lastIndexOf('.');
if (dotIndex > 0) {
String schemaKey =
schemaName.substring(0,dotIndex);
+schemaKey = schemaKey.replace("./", "");
schema = (XmlSchema) schemaTable.get(schemaKey);
}
}
[axis-axis2-java-core] 03/04: Reintegrated changes from trunk.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch xmlschema2 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit febefc5d119a8a31fa9e858e7904333c918eb377 Merge: 1a72c18 c8d300d Author: Andreas Veithen AuthorDate: Wed Aug 17 17:53:41 2011 + Reintegrated changes from trunk. .../org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[axis-axis2-java-core] 22/38: Merged r1298550 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 04a183ee9709a1e8bb285deb0fdaef6e052441e4
Author: Andreas Veithen
AuthorDate: Sat Mar 10 09:32:20 2012 +
Merged r1298550 to the 1.5 branch.
---
modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java | 5 +
1 file changed, 5 insertions(+)
diff --git a/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
b/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
index f846d3c..ebd0fae 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
@@ -24,6 +24,7 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.om.impl.dom.TextImpl;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.Text;
@@ -242,6 +243,10 @@ public class TextImplEx extends NodeImplEx implements Text
{
textNode.setParent(element);
}
+public Document getOwnerDocument() {
+return textNode.getOwnerDocument();
+}
+
/* (non-Javadoc)
* @see org.apache.axiom.om.OMNode#getParent()
*/
[axis-axis2-java-core] 31/38: Merged r1341805 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 64bf4ca51abc312ef3adb8e600cd926dcafe07af
Author: Sagara Gunathunga
AuthorDate: Wed May 23 09:30:17 2012 +
Merged r1341805 to the 1.5 branch.
---
.../adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
b/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
index fe0a337..30ed9d1 100644
--- a/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
+++ b/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
@@ -91,6 +91,9 @@ public class JavaTypeMap implements TypeMap {
addTypemapping(SchemaConstants.XSD_ANYTYPE,
Object.class.getName());
+addTypemapping(SchemaConstants.XSD_ANYSIMPLETYPE,
+Object.class.getName());
+
//Qname maps to jax rpc QName class
addTypemapping(SchemaConstants.XSD_QNAME,
javax.xml.namespace.QName.class.getName());
[axis-axis2-java-core] 04/12: Merge r1723771 to the 1.6 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_6
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit c837f68fa3773c933a8c399ec557d69d9b273a50
Author: Andreas Veithen
AuthorDate: Fri Jan 8 18:01:37 2016 +
Merge r1723771 to the 1.6 branch.
---
apidocs/pom.xml | 2 --
pom.xml | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index ea72923..954ee5f 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -291,8 +291,6 @@
${project.groupId}:*
-
-false
true
diff --git a/pom.xml b/pom.xml
index b9c4dfc..918dde1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1018,6 +1018,9 @@
maven-javadoc-plugin
2.10.3
+
+false
+
maven-release-plugin
[axis-axis2-java-core] 23/38: Merged r1173869 and r1299356 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit f163826867abe048602e8afe3ecdf5758f0cc3fd
Author: Andreas Veithen
AuthorDate: Sun Mar 11 14:22:20 2012 +
Merged r1173869 and r1299356 to the 1.5 branch.
---
.../adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java | 4 ++--
.../test/org/apache/axis2/databinding/utils/MultirefHelperTest.java | 1 +
.../apache/axis2/handlers/addressing/AddressingInFaultHandler.java | 1 +
.../jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java | 3 +++
modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java | 6 ++
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
b/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
index 073484d..80d631a 100644
--- a/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
+++ b/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
@@ -146,8 +146,8 @@ public class MultirefHelper {
OMElement omElement = (OMElement)childs.next();
OMAttribute id = omElement.getAttribute(new QName("id"));
if (id != null) {
-omElement.build();
-elementMap.put(id.getAttributeValue(), omElement.detach());
+childs.remove();
+elementMap.put(id.getAttributeValue(), omElement);
}
}
filledTable = true;
diff --git
a/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
b/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
index 74a2253..27b9561 100644
---
a/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
+++
b/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
@@ -111,6 +111,7 @@ public class MultirefHelperTest extends TestCase {
OMElement omElement = null;
for (Iterator iter =
generatedElement.getChildElements();iter.hasNext();){
omElement = (OMElement) iter.next();
+iter.remove();
soapEnvelope.getBody().addChild(omElement);
}
diff --git
a/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
b/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
index 8efd4a5..4f4f682 100644
---
a/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
+++
b/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
@@ -70,6 +70,7 @@ public class AddressingInFaultHandler extends AbstractHandler
implements Address
Iterator i = element.getChildElements();
while (i.hasNext()) {
OMElement detailElement = (OMElement)i.next();
+i.remove();
detail.addDetailEntry(detailElement);
}
}
diff --git
a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
index 4040241..b43278c 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
@@ -457,6 +457,9 @@ class XMLSpineImpl implements XMLSpine {
// the requested namespace/localPart
if (om.getNamespace().getNamespaceURI().equals(namespace) &&
om.getLocalName().equals(localPart)) {
+// _getBlockFromOMElement may replace the current element;
move the iterator to the
+// next element to avoid ConcurrentModificationException
+it.hasNext();
Block block = _getBlockFromOMElement(om, context,
blockFactory, false);
blocks.add(block);
}
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
b/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
index 5e1e293..b5293ae 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
@@ -518,10 +518,8 @@ public class SOAPElementImpl extends NodeImplEx implements
SOAPElement {
//We will get all the children and iteratively call the detach() on
all of 'em.
Iterator childIter = element.getChildElements();
while (childIter.hasNext()) {
-Object o = childIter.next();
-if (o instanceof org.apache.axiom.om.OMNode) {
-((org.apache.axiom.om.OMNode)o).detach();
-}
+childIter.next();
+childIter.remove();
}
}
[axis-axis2-java-core] 32/38: AXIS2-5345 - Merged r1351218 to 1.5 branch.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 0b99cd88e2843942ac820f5a309b7c729dd0e547 Author: Sagara Gunathunga AuthorDate: Mon Jun 18 07:28:48 2012 + AXIS2-5345 - Merged r1351218 to 1.5 branch. --- pom.xml | 2 +- src/site/site.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 68ec16f..dbc6743 100644 --- a/pom.xml +++ b/pom.xml @@ -582,7 +582,7 @@ maven-site-plugin -2.1.1 +3.1 diff --git a/src/site/site.xml b/src/site/site.xml index b461cf3..85e6b6d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -67,7 +67,7 @@ - +
[axis-axis2-java-core] 01/04: Created a branch to prepare the migration to XmlSchema 2.0.
This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch xmlschema2 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit a73d43567c5c997d921da458b550481689fe2696 Author: Andreas Veithen AuthorDate: Tue Aug 16 17:23:58 2011 + Created a branch to prepare the migration to XmlSchema 2.0.
