svn commit: r1335154 - in /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template: ADBBeanTemplate-bean.xsl ADBBeanTemplate-helpermode.xsl
Author: veithen
Date: Mon May 7 17:50:46 2012
New Revision: 1335154
URL: http://svn.apache.org/viewvc?rev=1335154&view=rev
Log:
Avoid double lookup of prefix when serializing an ADB bean. This change should
also provide a workaround for AXIOM-421.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1335154&r1=1335153&r2=1335154&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Mon May 7 17:50:46 2012
@@ -1458,7 +1458,7 @@
javax.xml.stream.XMLStreamWriter
xmlWriter) throws javax.xml.stream.XMLStreamException {
java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
if (writerPrefix != null) {
-xmlWriter.writeStartElement(namespace, localPart);
+xmlWriter.writeStartElement(writerPrefix, localPart,
namespace);
} else {
if (namespace.length() == 0) {
prefix = "";
@@ -1477,11 +1477,14 @@
*/
private void writeAttribute(java.lang.String prefix,java.lang.String
namespace,java.lang.String attName,
java.lang.String
attValue,javax.xml.stream.XMLStreamWriter xmlWriter) throws
javax.xml.stream.XMLStreamException{
-if (xmlWriter.getPrefix(namespace) == null) {
+java.lang.String writerPrefix = xmlWriter.getPrefix(namespace);
+if (writerPrefix != null) {
+xmlWriter.writeAttribute(writerPrefix,
namespace,attName,attValue);
+} else {
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
+xmlWriter.writeAttribute(prefix, namespace,attName,attValue);
}
-xmlWriter.writeAttribute(namespace,attName,attValue);
}
/**
@@ -1492,8 +1495,7 @@
if (namespace.equals("")) {
xmlWriter.writeAttribute(attName,attValue);
} else {
-registerPrefix(xmlWriter, namespace);
-xmlWriter.writeAttribute(namespace,attName,attValue);
+xmlWriter.writeAttribute(registerPrefix(xmlWriter, namespace),
namespace,attName,attValue);
}
}
@@ -1520,7 +1522,7 @@
xmlWriter.writeAttribute(attName, attributeValue);
} else {
registerPrefix(xmlWriter, namespace);
-xmlWriter.writeAttribute(namespace, attName,
attributeValue);
+xmlWriter.writeAttribute(attributePrefix, namespace,
attName, attributeValue);
}
}
/**
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=1335154&r1=1335153&r2=1335154&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
Mon May 7 17:50:46 2012
@@ -1051,7 +1051,7 @@ public
svn commit: r1335355 - in /axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl: httpclient3/HTTPProxyConfigurator.java httpclient3/HTTPSenderImpl.j
Author: sagara
Date: Tue May 8 06:52:55 2012
New Revision: 1335355
URL: http://svn.apache.org/viewvc?rev=1335355&view=rev
Log:
Applied latest patch.
Added:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
(with props)
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
Added:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java?rev=1335355&view=auto
==
---
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
(added)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
Tue May 8 06:52:55 2012
@@ -0,0 +1,463 @@
+/*
+ * 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.transport.http.impl.httpclient3;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HTTPTransportConstants;
+import org.apache.axis2.transport.http.HttpTransportProperties;
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpState;
+import org.apache.commons.httpclient.NTCredentials;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
+import java.net.URL;
+import java.util.StringTokenizer;
+
+public class HTTPProxyConfigurator {
+
+private static Log log = LogFactory.getLog(HTTPProxyConfigurator.class);
+
+/**
+ * Configure HTTP Proxy settings of commons-httpclient HostConfiguration.
+ * Proxy settings can be get from axis2.xml, Java proxy settings or can be
+ * override through property in message context.
+ *
+ * HTTP Proxy setting element format:
+ * example.org
+ * 3128 EXAMPLE/John
+ * password
+ *
+ * @param messageContext
+ *in message context for
+ * @param httpClient
+ *commons-httpclient instance
+ * @param config
+ *commons-httpclient HostConfiguration
+ * @throws AxisFault
+ * if Proxy settings are invalid
+ */
+public static void configure(MessageContext messageContext, HttpClient
httpClient,
+HostConfiguration config) throws AxisFault {
+
+Credentials proxyCredentials = null;
+String proxyHost = null;
+String nonProxyHosts = null;
+Integer proxyPort = -1;
+String proxyUser = null;
+String proxyPassword = null;
+
+// Getting configuration values from Axis2.xml
+Parameter proxySettingsFromAxisConfig =
messageContext.getConfigurationContext()
+
.getAxisConfiguration().getParameter(HTTPTransportConstants.ATTR_PROXY);
+if (proxySettingsFromAxisConfig != null) {
+OMElement proxyConfiguration =
getProxyConfigurationElement(proxySettingsFromAxisConfig);
+proxyHost = getProxyHost(proxyConfiguration);
+proxyPort = getProxyPort(proxyConfiguration);
+proxyUser = getProxyUser(proxyConfiguration);
+proxyPassword = getProxyPassword(proxyConfiguratio
svn commit: r1335357 - /axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java
Author: sagara
Date: Tue May 8 06:58:53 2012
New Revision: 1335357
URL: http://svn.apache.org/viewvc?rev=1335357&view=rev
Log:
Deprecated HTTPProxcyConfigurator class.
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java?rev=1335357&r1=1335356&r2=1335357&view=diff
==
---
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java
(original)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxcyConfigurator.java
Tue May 8 06:58:53 2012
@@ -41,6 +41,10 @@ import org.apache.commons.httpclient.aut
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+/**
+ * @deprecated use {@link HTTPProxyConfigurator}
+ */
+@Deprecated
public class HTTPProxcyConfigurator {
private static Log log = LogFactory.getLog(HTTPProxcyConfigurator.class);
