You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/02/25 20:57:05 UTC
svn commit: r511585 [7/10] - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/cluster/
src/org/apache/axis2/context/ src/org/apach...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java Sun Feb 25 11:56:59 2007
@@ -1,134 +1,134 @@
-/*
-* Copyright 2004,2005 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.
-*/
-
-package org.apache.axis2.transport.http;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
-import org.apache.commons.httpclient.methods.RequestEntity;
-
-public class RESTRequestEntity implements RequestEntity {
- private byte[] bytes;
- private String charSetEnc;
- private boolean chunked;
- private OMElement element;
- private MessageContext msgCtxt;
- private String soapActionString;
- private OMOutputFormat format;
-
- public RESTRequestEntity(OMElement element, boolean chunked,
- MessageContext msgCtxt,
- String charSetEncoding,
- String soapActionString,
- OMOutputFormat format) {
- this.element = element;
- this.chunked = chunked;
- this.msgCtxt = msgCtxt;
- this.charSetEnc = charSetEncoding;
- this.soapActionString = soapActionString;
- this.format = format;
- }
-
- private void handleOMOutput(OutputStream out, boolean doingMTOM)
- throws XMLStreamException {
- format.setDoOptimize(doingMTOM);
- element.serializeAndConsume(out, format);
- }
-
- public byte[] writeBytes() throws AxisFault {
- try {
- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
- if (!format.isOptimized()) {
- OMOutputFormat format2 = new OMOutputFormat();
- format2.setCharSetEncoding(charSetEnc);
- element.serializeAndConsume(bytesOut, format2);
- return bytesOut.toByteArray();
- } else {
- format.setCharSetEncoding(charSetEnc);
- format.setDoOptimize(true);
- element.serializeAndConsume(bytesOut, format);
- return bytesOut.toByteArray();
- }
- } catch (XMLStreamException e) {
- throw new AxisFault(e);
- } catch (FactoryConfigurationError e) {
- throw new AxisFault(e);
- }
- }
-
- public void writeRequest(OutputStream out) throws IOException {
- try {
- if (chunked) {
- this.handleOMOutput(out, format.isDoingSWA());
- } else {
- if (bytes == null) {
- bytes = writeBytes();
- }
- out.write(bytes);
- }
- out.flush();
- } catch (XMLStreamException e) {
- throw new AxisFault(e);
- } catch (FactoryConfigurationError e) {
- throw new AxisFault(e);
- } catch (IOException e) {
- throw new AxisFault(e);
- }
- }
-
- public long getContentLength() {
- try {
- if (chunked) {
- return -1;
- } else {
- if (bytes == null) {
- bytes = writeBytes();
- }
- return bytes.length;
- }
- } catch (AxisFault e) {
- return -1;
- }
- }
-
- public String getContentType() {
- String encoding = format.getCharSetEncoding();
- String contentType = format.getContentType();
- if (encoding != null) {
- contentType += "; charset=" + encoding;
- }
-
- // action header is not mandated in SOAP 1.2. So putting it, if available
- if (!msgCtxt.isSOAP11() && (soapActionString != null)
- && !"".equals(soapActionString.trim()) && !"\"\"".equals(soapActionString.trim())) {
- contentType =contentType + ";action=\"" + soapActionString + "\";";
- }
- return contentType;
- }
-
- public boolean isRepeatable() {
- return true;
- }
-}
+/*
+* Copyright 2004,2005 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.
+*/
+
+package org.apache.axis2.transport.http;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.commons.httpclient.methods.RequestEntity;
+
+public class RESTRequestEntity implements RequestEntity {
+ private byte[] bytes;
+ private String charSetEnc;
+ private boolean chunked;
+ private OMElement element;
+ private MessageContext msgCtxt;
+ private String soapActionString;
+ private OMOutputFormat format;
+
+ public RESTRequestEntity(OMElement element, boolean chunked,
+ MessageContext msgCtxt,
+ String charSetEncoding,
+ String soapActionString,
+ OMOutputFormat format) {
+ this.element = element;
+ this.chunked = chunked;
+ this.msgCtxt = msgCtxt;
+ this.charSetEnc = charSetEncoding;
+ this.soapActionString = soapActionString;
+ this.format = format;
+ }
+
+ private void handleOMOutput(OutputStream out, boolean doingMTOM)
+ throws XMLStreamException {
+ format.setDoOptimize(doingMTOM);
+ element.serializeAndConsume(out, format);
+ }
+
+ public byte[] writeBytes() throws AxisFault {
+ try {
+ ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+ if (!format.isOptimized()) {
+ OMOutputFormat format2 = new OMOutputFormat();
+ format2.setCharSetEncoding(charSetEnc);
+ element.serializeAndConsume(bytesOut, format2);
+ return bytesOut.toByteArray();
+ } else {
+ format.setCharSetEncoding(charSetEnc);
+ format.setDoOptimize(true);
+ element.serializeAndConsume(bytesOut, format);
+ return bytesOut.toByteArray();
+ }
+ } catch (XMLStreamException e) {
+ throw new AxisFault(e);
+ } catch (FactoryConfigurationError e) {
+ throw new AxisFault(e);
+ }
+ }
+
+ public void writeRequest(OutputStream out) throws IOException {
+ try {
+ if (chunked) {
+ this.handleOMOutput(out, format.isDoingSWA());
+ } else {
+ if (bytes == null) {
+ bytes = writeBytes();
+ }
+ out.write(bytes);
+ }
+ out.flush();
+ } catch (XMLStreamException e) {
+ throw new AxisFault(e);
+ } catch (FactoryConfigurationError e) {
+ throw new AxisFault(e);
+ } catch (IOException e) {
+ throw new AxisFault(e);
+ }
+ }
+
+ public long getContentLength() {
+ try {
+ if (chunked) {
+ return -1;
+ } else {
+ if (bytes == null) {
+ bytes = writeBytes();
+ }
+ return bytes.length;
+ }
+ } catch (AxisFault e) {
+ return -1;
+ }
+ }
+
+ public String getContentType() {
+ String encoding = format.getCharSetEncoding();
+ String contentType = format.getContentType();
+ if (encoding != null) {
+ contentType += "; charset=" + encoding;
+ }
+
+ // action header is not mandated in SOAP 1.2. So putting it, if available
+ if (!msgCtxt.isSOAP11() && (soapActionString != null)
+ && !"".equals(soapActionString.trim()) && !"\"\"".equals(soapActionString.trim())) {
+ contentType =contentType + ";action=\"" + soapActionString + "\";";
+ }
+ return contentType;
+ }
+
+ public boolean isRepeatable() {
+ return true;
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java Sun Feb 25 11:56:59 2007
@@ -1,48 +1,48 @@
-/*
-* Copyright 2004,2005 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.
-*/
-
-package org.apache.axis2.transport.http;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.commons.httpclient.methods.RequestEntity;
-
-public class RESTRequestEntity2 implements RequestEntity {
- private String contentType;
- private String postRequestBody;
-
- public RESTRequestEntity2(String postRequestBody, String contentType) {
- this.postRequestBody = postRequestBody;
- this.contentType = contentType;
- }
-
- public void writeRequest(OutputStream output) throws IOException {
- output.write(postRequestBody.getBytes());
- }
-
- public long getContentLength() {
- return this.postRequestBody.getBytes().length;
- }
-
- public String getContentType() {
- return this.contentType;
- }
-
- public boolean isRepeatable() {
- return true;
- }
-}
+/*
+* Copyright 2004,2005 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.
+*/
+
+package org.apache.axis2.transport.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.commons.httpclient.methods.RequestEntity;
+
+public class RESTRequestEntity2 implements RequestEntity {
+ private String contentType;
+ private String postRequestBody;
+
+ public RESTRequestEntity2(String postRequestBody, String contentType) {
+ this.postRequestBody = postRequestBody;
+ this.contentType = contentType;
+ }
+
+ public void writeRequest(OutputStream output) throws IOException {
+ output.write(postRequestBody.getBytes());
+ }
+
+ public long getContentLength() {
+ return this.postRequestBody.getBytes().length;
+ }
+
+ public String getContentType() {
+ return this.contentType;
+ }
+
+ public boolean isRepeatable() {
+ return true;
+ }
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTRequestEntity2.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java Sun Feb 25 11:56:59 2007
@@ -1,175 +1,175 @@
-/*
- * Copyright 2004,2005 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.
- */
-
-package org.apache.axis2.transport.http;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.MIMEOutputUtils;
-import org.apache.axiom.om.util.UUIDGenerator;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
-import org.apache.axis2.util.JavaUtils;
-
-public class SOAPMessageFormatter implements MessageFormatter{
-
- public void writeTo(MessageContext msgCtxt, OMOutputFormat format,
- OutputStream out, boolean preserve) throws AxisFault {
- OMElement element = msgCtxt.getEnvelope();
- try {
- if (!(format.isOptimized()) & format.isDoingSWA()) {
- StringWriter bufferedSOAPBody = new StringWriter();
- if (preserve) {
- element.serialize(bufferedSOAPBody, format);
- } else {
- element.serializeAndConsume(bufferedSOAPBody, format);
- }
- writeSwAMessage(msgCtxt,bufferedSOAPBody,out,format);
- } else {
- if (preserve) {
- element.serialize(out, format);
- } else {
- element.serializeAndConsume(out, format);
- }
- }
- } catch (XMLStreamException e) {
- throw new AxisFault(e);
- }
- }
-
- public byte[] getBytes(MessageContext msgCtxt, OMOutputFormat format)
- throws AxisFault {
- OMElement element = msgCtxt.getEnvelope();
- try {
- ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
- if (!format.isOptimized()) {
- // why are we creating a new OMOutputFormat
- OMOutputFormat format2 = new OMOutputFormat();
- format2.setCharSetEncoding(format.getCharSetEncoding());
- if (format.isDoingSWA()) {
- StringWriter bufferedSOAPBody = new StringWriter();
- element.serializeAndConsume(bufferedSOAPBody, format2);
- writeSwAMessage(msgCtxt,bufferedSOAPBody,bytesOut,format);
- } else {
- element.serializeAndConsume(bytesOut, format2);
- }
- return bytesOut.toByteArray();
- } else {
- element.serializeAndConsume(bytesOut, format);
- return bytesOut.toByteArray();
- }
- } catch (XMLStreamException e) {
- throw new AxisFault(e);
- } catch (FactoryConfigurationError e) {
- throw new AxisFault(e);
- }
- }
-
- public String getContentType(MessageContext msgCtxt, OMOutputFormat format,
- String soapActionString) {
- String encoding = format.getCharSetEncoding();
- String contentType = format.getContentType();
- if (encoding != null) {
- contentType += "; charset=" + encoding;
- }
-
- // action header is not mandated in SOAP 1.2. So putting it, if
- // available
- if (!msgCtxt.isSOAP11() && (soapActionString != null)
- && !"".equals(soapActionString.trim())
- && !"\"\"".equals(soapActionString.trim())) {
- contentType = contentType + ";action=\"" + soapActionString + "\";";
- }
- return contentType;
- }
-
- public String formatSOAPAction(MessageContext msgCtxt, OMOutputFormat format,
- String soapActionString) {
- // if SOAP 1.2 we attach the soap action to the content-type
- // No need to set it as a header.
- if (msgCtxt.isSOAP11()) {
- if ("".equals(soapActionString)) {
- return "\"\"";
- } else {
- if (soapActionString != null
- && !soapActionString.startsWith("\"")) {
- // SOAPAction string must be a quoted string
- soapActionString = "\"" + soapActionString + "\"";
- }
- return soapActionString;
- }
- }
- return null;
- }
-
- public URL getTargetAddress(MessageContext msgCtxt, OMOutputFormat format,
- URL targetURL) throws AxisFault{
-
- // Check whether there is a template in the URL, if so we have to replace then with data
- // values and create a new target URL.
- targetURL = URLTemplatingUtil.getTemplatedURL(targetURL,msgCtxt,false);
- return targetURL;
- }
-
- private void writeSwAMessage(MessageContext msgCtxt,
- StringWriter bufferedSOAPBody, OutputStream outputStream,
- OMOutputFormat format) {
- Object property = msgCtxt
- .getProperty(Constants.Configuration.MM7_COMPATIBLE);
- boolean MM7CompatMode = false;
- if (property != null) {
- MM7CompatMode = JavaUtils.isTrueExplicitly(property);
- }
- if (!MM7CompatMode) {
- MIMEOutputUtils.writeSOAPWithAttachmentsMessage(bufferedSOAPBody,
- outputStream, msgCtxt.getAttachmentMap(), format);
- } else {
- String innerBoundary;
- String partCID;
- Object innerBoundaryProperty = msgCtxt
- .getProperty(Constants.Configuration.MM7_INNER_BOUNDARY);
- if (innerBoundaryProperty != null) {
- innerBoundary = (String) innerBoundaryProperty;
- } else {
- innerBoundary = "innerBoundary"
- + UUIDGenerator.getUUID().replace(':', '_');
- }
- Object partCIDProperty = msgCtxt
- .getProperty(Constants.Configuration.MM7_PART_CID);
- if (partCIDProperty != null) {
- partCID = (String) partCIDProperty;
- } else {
- partCID = "innerCID"
- + UUIDGenerator.getUUID().replace(':', '_');
- }
- MIMEOutputUtils.writeMM7Message(bufferedSOAPBody, outputStream,
- msgCtxt.getAttachmentMap(), format, partCID, innerBoundary);
- }
- }
-
-}
+/*
+ * Copyright 2004,2005 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.
+ */
+
+package org.apache.axis2.transport.http;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.MIMEOutputUtils;
+import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.util.JavaUtils;
+
+public class SOAPMessageFormatter implements MessageFormatter{
+
+ public void writeTo(MessageContext msgCtxt, OMOutputFormat format,
+ OutputStream out, boolean preserve) throws AxisFault {
+ OMElement element = msgCtxt.getEnvelope();
+ try {
+ if (!(format.isOptimized()) & format.isDoingSWA()) {
+ StringWriter bufferedSOAPBody = new StringWriter();
+ if (preserve) {
+ element.serialize(bufferedSOAPBody, format);
+ } else {
+ element.serializeAndConsume(bufferedSOAPBody, format);
+ }
+ writeSwAMessage(msgCtxt,bufferedSOAPBody,out,format);
+ } else {
+ if (preserve) {
+ element.serialize(out, format);
+ } else {
+ element.serializeAndConsume(out, format);
+ }
+ }
+ } catch (XMLStreamException e) {
+ throw new AxisFault(e);
+ }
+ }
+
+ public byte[] getBytes(MessageContext msgCtxt, OMOutputFormat format)
+ throws AxisFault {
+ OMElement element = msgCtxt.getEnvelope();
+ try {
+ ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+ if (!format.isOptimized()) {
+ // why are we creating a new OMOutputFormat
+ OMOutputFormat format2 = new OMOutputFormat();
+ format2.setCharSetEncoding(format.getCharSetEncoding());
+ if (format.isDoingSWA()) {
+ StringWriter bufferedSOAPBody = new StringWriter();
+ element.serializeAndConsume(bufferedSOAPBody, format2);
+ writeSwAMessage(msgCtxt,bufferedSOAPBody,bytesOut,format);
+ } else {
+ element.serializeAndConsume(bytesOut, format2);
+ }
+ return bytesOut.toByteArray();
+ } else {
+ element.serializeAndConsume(bytesOut, format);
+ return bytesOut.toByteArray();
+ }
+ } catch (XMLStreamException e) {
+ throw new AxisFault(e);
+ } catch (FactoryConfigurationError e) {
+ throw new AxisFault(e);
+ }
+ }
+
+ public String getContentType(MessageContext msgCtxt, OMOutputFormat format,
+ String soapActionString) {
+ String encoding = format.getCharSetEncoding();
+ String contentType = format.getContentType();
+ if (encoding != null) {
+ contentType += "; charset=" + encoding;
+ }
+
+ // action header is not mandated in SOAP 1.2. So putting it, if
+ // available
+ if (!msgCtxt.isSOAP11() && (soapActionString != null)
+ && !"".equals(soapActionString.trim())
+ && !"\"\"".equals(soapActionString.trim())) {
+ contentType = contentType + ";action=\"" + soapActionString + "\";";
+ }
+ return contentType;
+ }
+
+ public String formatSOAPAction(MessageContext msgCtxt, OMOutputFormat format,
+ String soapActionString) {
+ // if SOAP 1.2 we attach the soap action to the content-type
+ // No need to set it as a header.
+ if (msgCtxt.isSOAP11()) {
+ if ("".equals(soapActionString)) {
+ return "\"\"";
+ } else {
+ if (soapActionString != null
+ && !soapActionString.startsWith("\"")) {
+ // SOAPAction string must be a quoted string
+ soapActionString = "\"" + soapActionString + "\"";
+ }
+ return soapActionString;
+ }
+ }
+ return null;
+ }
+
+ public URL getTargetAddress(MessageContext msgCtxt, OMOutputFormat format,
+ URL targetURL) throws AxisFault{
+
+ // Check whether there is a template in the URL, if so we have to replace then with data
+ // values and create a new target URL.
+ targetURL = URLTemplatingUtil.getTemplatedURL(targetURL,msgCtxt,false);
+ return targetURL;
+ }
+
+ private void writeSwAMessage(MessageContext msgCtxt,
+ StringWriter bufferedSOAPBody, OutputStream outputStream,
+ OMOutputFormat format) {
+ Object property = msgCtxt
+ .getProperty(Constants.Configuration.MM7_COMPATIBLE);
+ boolean MM7CompatMode = false;
+ if (property != null) {
+ MM7CompatMode = JavaUtils.isTrueExplicitly(property);
+ }
+ if (!MM7CompatMode) {
+ MIMEOutputUtils.writeSOAPWithAttachmentsMessage(bufferedSOAPBody,
+ outputStream, msgCtxt.getAttachmentMap(), format);
+ } else {
+ String innerBoundary;
+ String partCID;
+ Object innerBoundaryProperty = msgCtxt
+ .getProperty(Constants.Configuration.MM7_INNER_BOUNDARY);
+ if (innerBoundaryProperty != null) {
+ innerBoundary = (String) innerBoundaryProperty;
+ } else {
+ innerBoundary = "innerBoundary"
+ + UUIDGenerator.getUUID().replace(':', '_');
+ }
+ Object partCIDProperty = msgCtxt
+ .getProperty(Constants.Configuration.MM7_PART_CID);
+ if (partCIDProperty != null) {
+ partCID = (String) partCIDProperty;
+ } else {
+ partCID = "innerCID"
+ + UUIDGenerator.getUUID().replace(':', '_');
+ }
+ MIMEOutputUtils.writeMM7Message(bufferedSOAPBody, outputStream,
+ msgCtxt.getAttachmentMap(), format, partCID, innerBoundary);
+ }
+ }
+
+}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Sun Feb 25 11:56:59 2007
@@ -144,15 +144,15 @@
String repository= optionsParser.isValueSet('r');
if (repository ==null)
{
- args = optionsParser.getRemainingArgs();
- if (args!=null && args[0]!=null && args[0]!="")
- {
- repository = args[0];
- }
- else
- {
- printUsage();
- }
+ args = optionsParser.getRemainingArgs();
+ if (args!=null && args[0]!=null && args[0]!="")
+ {
+ repository = args[0];
+ }
+ else
+ {
+ printUsage();
+ }
}
System.out.println("[SimpleHTTPServer] Starting");
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultConnectionListener.java Sun Feb 25 11:56:59 2007
@@ -40,7 +40,7 @@
public class DefaultConnectionListener implements IOProcessor {
private static Log LOG = LogFactory.getLog(DefaultConnectionListener.class);
-
+
private volatile boolean destroyed = false;
private final int port;
@@ -58,7 +58,7 @@
public DefaultConnectionListener(int port, HttpConnectionFactory connfactory, HttpConnectionManager connmanager,
ConnectionListenerFailureHandler failureHandler)
throws IOException {
- super();
+ super();
if (connfactory == null)
throw new IllegalArgumentException("Connection factory may not be null");
if (connmanager == null)
@@ -86,7 +86,7 @@
Socket socket = this.serversocket.accept();
if (LOG.isDebugEnabled()) {
LOG.debug("Incoming HTTP connection from " +
- socket.getRemoteSocketAddress());
+ socket.getRemoteSocketAddress());
}
HttpServerConnection conn = this.connfactory.newConnection(socket);
this.connmanager.process(conn);
@@ -102,7 +102,7 @@
}
}
- public void close() throws IOException {
+ public void close() throws IOException {
if(this.serversocket != null){
this.serversocket.close();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionFactory.java Sun Feb 25 11:56:59 2007
@@ -38,8 +38,8 @@
public class DefaultHttpConnectionFactory implements HttpConnectionFactory {
- final HttpParams params;
-
+ final HttpParams params;
+
public DefaultHttpConnectionFactory(final HttpParams params) {
super();
if (params == null) {
@@ -63,18 +63,18 @@
public String getRemoteIPAddress() {
java.net.SocketAddress sa = socket.getRemoteSocketAddress();
if (sa instanceof java.net.InetSocketAddress) {
- return ((java.net.InetSocketAddress) sa).getAddress().getHostAddress();
+ return ((java.net.InetSocketAddress) sa).getAddress().getHostAddress();
} else {
- return sa.toString();
+ return sa.toString();
}
}
public String getRemoteHostName() {
- java.net.SocketAddress sa = socket.getRemoteSocketAddress();
- if (sa instanceof java.net.InetSocketAddress) {
- return ((java.net.InetSocketAddress) sa).getHostName();
+ java.net.SocketAddress sa = socket.getRemoteSocketAddress();
+ if (sa instanceof java.net.InetSocketAddress) {
+ return ((java.net.InetSocketAddress) sa).getHostName();
} else {
- return sa.toString(); // fail-safe and fall back to something which one can use in place of the host name
+ return sa.toString(); // fail-safe and fall back to something which one can use in place of the host name
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java Sun Feb 25 11:56:59 2007
@@ -65,9 +65,9 @@
public DefaultHttpConnectionManager(
final ConfigurationContext configurationContext,
- final Executor executor,
+ final Executor executor,
final WorkerFactory workerfactory,
- final HttpParams params) {
+ final HttpParams params) {
super();
if (configurationContext == null) {
throw new IllegalArgumentException("Configuration context may not be null");
@@ -188,5 +188,5 @@
}
this.processors.clear();
}
-
+
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java Sun Feb 25 11:56:59 2007
@@ -36,7 +36,7 @@
final ThreadGroup group;
final AtomicInteger count;
final String namePrefix;
-
+
public DefaultThreadFactory(final ThreadGroup group, final String namePrefix) {
super();
this.count = new AtomicInteger(1);
@@ -45,10 +45,10 @@
}
public Thread newThread(final Runnable runnable) {
- StringBuffer buffer = new StringBuffer();
- buffer.append(this.namePrefix);
- buffer.append('-');
- buffer.append(this.count.getAndIncrement());
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(this.namePrefix);
+ buffer.append('-');
+ buffer.append(this.count.getAndIncrement());
Thread t = new Thread(group, runnable, buffer.toString(), 0);
t.setDaemon(false);
t.setPriority(Thread.NORM_PRIORITY);
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/LoggingProcessorDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/SOAPUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/SOAPUtil.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/SOAPUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/SOAPUtil.java Sun Feb 25 11:56:59 2007
@@ -69,17 +69,17 @@
Object contextWritten = null;
if (msgContext.getOperationContext()!=null)
- contextWritten = msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
+ contextWritten = msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
response.setContentType("text/xml; charset="
+ msgContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
if ((contextWritten == null) || !Constants.VALUE_TRUE.equals(contextWritten)) {
- Integer statusCode = (Integer) msgContext.getProperty(Constants.RESPONSE_CODE);
- if (statusCode!=null)
- response.setStatus(statusCode.intValue());
- else
- response.setStatus(HttpServletResponse.SC_ACCEPTED);
+ Integer statusCode = (Integer) msgContext.getProperty(Constants.RESPONSE_CODE);
+ if (statusCode!=null)
+ response.setStatus(statusCode.intValue());
+ else
+ response.setStatus(HttpServletResponse.SC_ACCEPTED);
}
boolean closeReader = true;
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/URLTemplatingUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSConnectionFactory.java Sun Feb 25 11:56:59 2007
@@ -56,22 +56,22 @@
* e.g.
* <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
* <parameter name="myTopicConnectionFactory" locked="false">
- * <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- * <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- * <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
- * <parameter name="transport.jms.Destination" locked="false">myTopicOne, myTopicTwo</parameter>
+ * <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ * <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ * <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ * <parameter name="transport.jms.Destination" locked="false">myTopicOne, myTopicTwo</parameter>
* </parameter>
* <parameter name="myQueueConnectionFactory" locked="false">
- * <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- * <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- * <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
- * <parameter name="transport.jms.Destination" locked="false">myQueueOne, myQueueTwo</parameter>
+ * <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ * <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ * <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ * <parameter name="transport.jms.Destination" locked="false">myQueueOne, myQueueTwo</parameter>
* </parameter>
* <parameter name="default" locked="false">
- * <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- * <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
- * <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">ConnectionFactory</parameter>
- * <parameter name="transport.jms.Destination" locked="false">myDestinationOne, myDestinationTwo</parameter>
+ * <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ * <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ * <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">ConnectionFactory</parameter>
+ * <parameter name="transport.jms.Destination" locked="false">myDestinationOne, myDestinationTwo</parameter>
* </parameter>
* </transportReceiver>
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalResponder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalResponder.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalResponder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalResponder.java Sun Feb 25 11:56:59 2007
@@ -34,7 +34,7 @@
* LocalResponder
*/
public class LocalResponder extends AbstractHandler implements TransportSender {
- LocalTransportSender sender;
+ LocalTransportSender sender;
public LocalResponder(LocalTransportSender sender) {
this.sender = sender;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/local/LocalTransportSender.java Sun Feb 25 11:56:59 2007
@@ -35,8 +35,8 @@
import org.apache.axis2.transport.http.HTTPTransportUtils;
public class LocalTransportSender extends AbstractHandler implements TransportSender {
-
- private ByteArrayOutputStream out;
+
+ private ByteArrayOutputStream out;
private ByteArrayOutputStream response;
public void init(ConfigurationContext confContext, TransportOutDescription transportOut)
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailClient.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailClient.java Sun Feb 25 11:56:59 2007
@@ -37,7 +37,7 @@
public static final int SHOW_MESSAGES = 1;
public static final int CLEAR_MESSAGES = 2;
public static final int SHOW_AND_CLEAR = SHOW_MESSAGES + CLEAR_MESSAGES;
- private static final Log log = LogFactory.getLog(MailClient.class);
+ private static final Log log = LogFactory.getLog(MailClient.class);
protected PasswordAuthentication authentication;
protected String from;
protected Session session;
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailToInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MimeBase64BodyPart.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailAddress.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailAddress.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailAddress.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailAddress.java Sun Feb 25 11:56:59 2007
@@ -23,10 +23,10 @@
* of the Addresses.
*/
public class MailAddress extends Address {
-
+
private static final long serialVersionUID = 3033256355495000819L;
- String mailAddy = null;
+ String mailAddy = null;
public MailAddress(String mAddy) {
this.mailAddy = mAddy;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailServer.java Sun Feb 25 11:56:59 2007
@@ -24,7 +24,7 @@
import org.apache.commons.logging.LogFactory;
public class MailServer {
- private static final Log log = LogFactory.getLog(MailServer.class);
+ private static final Log log = LogFactory.getLog(MailServer.class);
Storage st = null;
public ConfigurationContext configurationContext = null;
private POP3Server pop3Server;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/MailSorter.java Sun Feb 25 11:56:59 2007
@@ -48,7 +48,7 @@
* and the receive method is called.
*/
public class MailSorter {
- private static final Log log = LogFactory.getLog(MailSorter.class);
+ private static final Log log = LogFactory.getLog(MailSorter.class);
Storage st = null;
private ArrayList sUsers = new ArrayList();
@@ -86,7 +86,7 @@
mimeMessage.getEncoding());
String soapAction = getMailHeader(Constants.HEADER_SOAP_ACTION, mimeMessage);
if (soapAction == null){
- soapAction = mimeMessage.getSubject();
+ soapAction = mimeMessage.getSubject();
}
msgContext.setSoapAction(soapAction);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Server.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Server.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Server.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Server.java Sun Feb 25 11:56:59 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
public class POP3Server extends Thread {
- private static final Log log = LogFactory.getLog(POP3Server.class);
+ private static final Log log = LogFactory.getLog(POP3Server.class);
private Storage st = null;
private ServerSocket serverSocket;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/POP3Worker.java Sun Feb 25 11:56:59 2007
@@ -34,7 +34,7 @@
import org.apache.commons.logging.LogFactory;
public class POP3Worker extends Thread {
- private static final Log log = LogFactory.getLog(POP3Worker.class);
+ private static final Log log = LogFactory.getLog(POP3Worker.class);
boolean doneProcess = false;
int numDeleted = 0; // This is a small hack to get the deleting working with the ArrayList. To keep it simple.
ArrayList messages = new ArrayList();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPServer.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPServer.java Sun Feb 25 11:56:59 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
public class SMTPServer extends Thread {
- private static final Log log = LogFactory.getLog(SMTPServer.class);
+ private static final Log log = LogFactory.getLog(SMTPServer.class);
private boolean actAsMailet = false;
private boolean running = false;
private ConfigurationContext configurationContext;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/server/SMTPWorker.java Sun Feb 25 11:56:59 2007
@@ -47,7 +47,7 @@
boolean runThread = true;
private ArrayList receivers = new ArrayList();
private MimeMessage mail = null;
- private static final Log log = LogFactory.getLog(SMTPWorker.class);
+ private static final Log log = LogFactory.getLog(SMTPWorker.class);
private boolean dataWriting = false;
private ConfigurationContext configurationContext = null;
private boolean bodyData = false;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java Sun Feb 25 11:56:59 2007
@@ -43,13 +43,13 @@
}
/**
- * Use the BOM Mark to identify the encoding to be used. Fall back to
- * default encoding specified
- *
- * @param is
- * @param charSetEncoding
- * @throws java.io.IOException
- */
+ * Use the BOM Mark to identify the encoding to be used. Fall back to
+ * default encoding specified
+ *
+ * @param is
+ * @param charSetEncoding
+ * @throws java.io.IOException
+ */
public static Reader getReader(InputStream is, String charSetEncoding) throws IOException {
PushbackInputStream is2 = new PushbackInputStream(is, BOM_SIZE);
String encoding;
@@ -147,75 +147,75 @@
}
public static StAXBuilder getAttachmentsBuilder(MessageContext msgContext,
- InputStream inStream, String contentTypeString, boolean isSOAP)
- throws OMException, XMLStreamException, FactoryConfigurationError {
- StAXBuilder builder = null;
- XMLStreamReader streamReader;
+ InputStream inStream, String contentTypeString, boolean isSOAP)
+ throws OMException, XMLStreamException, FactoryConfigurationError {
+ StAXBuilder builder = null;
+ XMLStreamReader streamReader;
Attachments attachments = createAttachmentsMap(msgContext, inStream, contentTypeString);
- String charSetEncoding = getCharSetEncoding(attachments.getSOAPPartContentType());
+ String charSetEncoding = getCharSetEncoding(attachments.getSOAPPartContentType());
+
+ if ((charSetEncoding == null)
+ || "null".equalsIgnoreCase(charSetEncoding)) {
+ charSetEncoding = MessageContext.UTF_8;
+ }
+ msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
+ charSetEncoding);
+
+ try {
+ streamReader = StAXUtils.createXMLStreamReader(getReader(
+ attachments.getSOAPPartInputStream(), charSetEncoding));
+ } catch (IOException e) {
+ throw new XMLStreamException(e);
+ }
- if ((charSetEncoding == null)
- || "null".equalsIgnoreCase(charSetEncoding)) {
- charSetEncoding = MessageContext.UTF_8;
- }
- msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
- charSetEncoding);
-
- try {
- streamReader = StAXUtils.createXMLStreamReader(getReader(
- attachments.getSOAPPartInputStream(), charSetEncoding));
- } catch (IOException e) {
- throw new XMLStreamException(e);
- }
-
-
- // Put a reference to Attachments Map in to the message context For
- // backword compatibility with Axis2 1.0
- msgContext.setProperty(MTOMConstants.ATTACHMENTS, attachments);
-
- // Setting the Attachments map to new SwA API
- msgContext.setAttachmentMap(attachments);
-
- String soapEnvelopeNamespaceURI = getEnvelopeNamespace(contentTypeString);
-
- if (isSOAP) {
- if (attachments.getAttachmentSpecType().equals(
- MTOMConstants.MTOM_TYPE)) {
- //Creates the MTOM specific MTOMStAXSOAPModelBuilder
- builder = new MTOMStAXSOAPModelBuilder(streamReader,
- attachments, soapEnvelopeNamespaceURI);
- msgContext.setDoingMTOM(true);
- } else if (attachments.getAttachmentSpecType().equals(
- MTOMConstants.SWA_TYPE)) {
- builder = new StAXSOAPModelBuilder(streamReader,
- soapEnvelopeNamespaceURI);
- } else if (attachments.getAttachmentSpecType().equals(
+
+ // Put a reference to Attachments Map in to the message context For
+ // backword compatibility with Axis2 1.0
+ msgContext.setProperty(MTOMConstants.ATTACHMENTS, attachments);
+
+ // Setting the Attachments map to new SwA API
+ msgContext.setAttachmentMap(attachments);
+
+ String soapEnvelopeNamespaceURI = getEnvelopeNamespace(contentTypeString);
+
+ if (isSOAP) {
+ if (attachments.getAttachmentSpecType().equals(
+ MTOMConstants.MTOM_TYPE)) {
+ //Creates the MTOM specific MTOMStAXSOAPModelBuilder
+ builder = new MTOMStAXSOAPModelBuilder(streamReader,
+ attachments, soapEnvelopeNamespaceURI);
+ msgContext.setDoingMTOM(true);
+ } else if (attachments.getAttachmentSpecType().equals(
+ MTOMConstants.SWA_TYPE)) {
+ builder = new StAXSOAPModelBuilder(streamReader,
+ soapEnvelopeNamespaceURI);
+ } else if (attachments.getAttachmentSpecType().equals(
MTOMConstants.SWA_TYPE_12) ) {
builder = new StAXSOAPModelBuilder(streamReader,
soapEnvelopeNamespaceURI);
}
- }
- // To handle REST XOP case
- else {
- if (attachments.getAttachmentSpecType().equals(
- MTOMConstants.MTOM_TYPE)) {
- XOPAwareStAXOMBuilder stAXOMBuilder = new XOPAwareStAXOMBuilder(
- streamReader, attachments);
- builder = stAXOMBuilder;
-
- } else if (attachments.getAttachmentSpecType().equals(
- MTOMConstants.SWA_TYPE)) {
- builder = new StAXOMBuilder(streamReader);
- } else if (attachments.getAttachmentSpecType().equals(
+ }
+ // To handle REST XOP case
+ else {
+ if (attachments.getAttachmentSpecType().equals(
+ MTOMConstants.MTOM_TYPE)) {
+ XOPAwareStAXOMBuilder stAXOMBuilder = new XOPAwareStAXOMBuilder(
+ streamReader, attachments);
+ builder = stAXOMBuilder;
+
+ } else if (attachments.getAttachmentSpecType().equals(
+ MTOMConstants.SWA_TYPE)) {
+ builder = new StAXOMBuilder(streamReader);
+ } else if (attachments.getAttachmentSpecType().equals(
MTOMConstants.SWA_TYPE_12) ) {
builder = new StAXOMBuilder(streamReader);
}
- }
+ }
- return builder;
- }
+ return builder;
+ }
private static Attachments createAttachmentsMap(MessageContext msgContext, InputStream inStream, String contentTypeString) {
Object cacheAttachmentProperty = msgContext
@@ -295,8 +295,8 @@
* @throws XMLStreamException
*/
public static StAXBuilder getBuilder(InputStream inStream) throws XMLStreamException {
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream);
- return new StAXOMBuilder(xmlReader);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream);
+ return new StAXOMBuilder(xmlReader);
}
/**
@@ -308,8 +308,8 @@
* @throws XMLStreamException
*/
public static StAXBuilder getBuilder(InputStream inStream, String charSetEnc) throws XMLStreamException {
- XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream, charSetEnc);
- return new StAXOMBuilder(xmlReader);
+ XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream, charSetEnc);
+ return new StAXOMBuilder(xmlReader);
}
/**
@@ -323,7 +323,7 @@
* @throws XMLStreamException
*/
public static StAXBuilder getSOAPBuilder(InputStream inStream, String soapNamespaceURI) throws XMLStreamException {
- XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(inStream);
+ XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(inStream);
return new StAXSOAPModelBuilder(xmlreader, soapNamespaceURI);
}
@@ -339,7 +339,7 @@
* @throws XMLStreamException
*/
public static StAXBuilder getSOAPBuilder(InputStream inStream, String charSetEnc, String soapNamespaceURI) throws XMLStreamException {
- XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(inStream, charSetEnc);
+ XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(inStream, charSetEnc);
return new StAXSOAPModelBuilder(xmlreader, soapNamespaceURI);
}
@@ -359,21 +359,21 @@
* @throws AxisFault
*/
public static OMBuilder getBuilderFromSelector(String contentType, MessageContext msgContext) throws AxisFault {
- String type;
- int index = contentType.indexOf(';');
- if (index > 0) {
- type = contentType.substring(0, index);
- } else {
- type = contentType;
- }
- OMBuilder builder = msgContext.getConfigurationContext().getAxisConfiguration()
- .getMessageBuilder(type);
- if (builder != null) {
- // Setting the received content-type as the messageType to make
- // sure that we respond using the received message serialisation
- // format.
- msgContext.setProperty(Constants.Configuration.MESSAGE_TYPE, type);
- }
- return builder;
- }
+ String type;
+ int index = contentType.indexOf(';');
+ if (index > 0) {
+ type = contentType.substring(0, index);
+ } else {
+ type = contentType;
+ }
+ OMBuilder builder = msgContext.getConfigurationContext().getAxisConfiguration()
+ .getMessageBuilder(type);
+ if (builder != null) {
+ // Setting the received content-type as the messageType to make
+ // sure that we respond using the received message serialisation
+ // format.
+ msgContext.setProperty(Constants.Configuration.MESSAGE_TYPE, type);
+ }
+ return builder;
+ }
}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Builder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java Sun Feb 25 11:56:59 2007
@@ -56,26 +56,26 @@
}
String messageID = relatesTO.getValue();
Callback callback = (Callback) callbackStore.get(messageID);
- AsyncResult result = new AsyncResult(messageCtx);
+ AsyncResult result = new AsyncResult(messageCtx);
- if (callback != null) {
- try {
- // check weather the result is a fault.
- SOAPEnvelope envelope = result.getResponseEnvelope();
- SOAPFault fault = envelope.getBody().getFault();
+ if (callback != null) {
+ try {
+ // check weather the result is a fault.
+ SOAPEnvelope envelope = result.getResponseEnvelope();
+ SOAPFault fault = envelope.getBody().getFault();
- if (fault == null) {
- // if there is not fault call the onComplete method
- callback.onComplete(result);
- } else {
- // else call the on error method with the fault
- AxisFault axisFault = Utils.getInboundFaultFromMessageContext(messageCtx);
- callback.onError(axisFault);
- }
- } finally {
- callback.setComplete(true);
- }
- } else {
+ if (fault == null) {
+ // if there is not fault call the onComplete method
+ callback.onComplete(result);
+ } else {
+ // else call the on error method with the fault
+ AxisFault axisFault = Utils.getInboundFaultFromMessageContext(messageCtx);
+ callback.onError(axisFault);
+ }
+ } finally {
+ callback.setComplete(true);
+ }
+ } else {
throw new AxisFault("The Callback realtes to MessageID " + messageID + " is not found");
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/JavaUtils.java Sun Feb 25 11:56:59 2007
@@ -438,42 +438,42 @@
return null;
}
- /**
- * Scans the parameter string for the parameter search ignoring case when
- * comparing characters.
- *
- * @param string
- * @param search
- * If test is empty -1 is always returned.
- * @return -1 if the string was not found or the index of the first matching
- * character
- */
- public static int indexOfIgnoreCase(final String string,
- final String search) {
- int index = -1;
- final int stringLength = string.length();
- final int testLength = search.length();
- if (stringLength > 1 || testLength > 1) {
- final char firstCharOfTest = Character.toLowerCase(search.charAt(0));
- final int lastStringCharacterToCheck = stringLength - testLength + 1;
+ /**
+ * Scans the parameter string for the parameter search ignoring case when
+ * comparing characters.
+ *
+ * @param string
+ * @param search
+ * If test is empty -1 is always returned.
+ * @return -1 if the string was not found or the index of the first matching
+ * character
+ */
+ public static int indexOfIgnoreCase(final String string,
+ final String search) {
+ int index = -1;
+ final int stringLength = string.length();
+ final int testLength = search.length();
+ if (stringLength > 1 || testLength > 1) {
+ final char firstCharOfTest = Character.toLowerCase(search.charAt(0));
+ final int lastStringCharacterToCheck = stringLength - testLength + 1;
- for (int i = 0; i < lastStringCharacterToCheck; i++) {
- if (firstCharOfTest == Character.toLowerCase(string.charAt(i))) {
- index = i;
- for (int j = 1; j < testLength; j++) {
- final char c = string.charAt(i + j);
- final char otherChar = search.charAt(j);
- if (Character.toLowerCase(c) != Character.toLowerCase(otherChar)) {
- index = -1;
- break;
- }
- }
- if( -1 != index ){
- break;
- }
- }
- }
- }
- return index;
- }
+ for (int i = 0; i < lastStringCharacterToCheck; i++) {
+ if (firstCharOfTest == Character.toLowerCase(string.charAt(i))) {
+ index = i;
+ for (int j = 1; j < testLength; j++) {
+ final char c = string.charAt(i + j);
+ final char otherChar = search.charAt(j);
+ if (Character.toLowerCase(c) != Character.toLowerCase(otherChar)) {
+ index = -1;
+ break;
+ }
+ }
+ if( -1 != index ){
+ break;
+ }
+ }
+ }
+ }
+ return index;
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Loader.java Sun Feb 25 11:56:59 2007
@@ -29,7 +29,7 @@
* Loads resources (or images) from various sources.
*/
public class Loader {
- private static final Log log = LogFactory.getLog(Loader.class);
+ private static final Log log = LogFactory.getLog(Loader.class);
/**
* Searches for <code>resource</code> in different
@@ -108,11 +108,11 @@
* @throws InvocationTargetException
*/
static public ClassLoader getTCL() throws IllegalAccessException, InvocationTargetException {
- return (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
+ return (ClassLoader)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
}
/**
@@ -148,7 +148,7 @@
*/
static public Class loadClass(String clazz) throws ClassNotFoundException {
try {
- ClassLoader tcl = getTCL();
+ ClassLoader tcl = getTCL();
if(tcl != null) {
Class c = tcl.loadClass(clazz);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Sun Feb 25 11:56:59 2007
@@ -87,7 +87,7 @@
inMessageContext.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
//Setting the message type property
newmsgCtx.setProperty(Constants.Configuration.MESSAGE_TYPE,
- inMessageContext.getProperty(Constants.Configuration.MESSAGE_TYPE));
+ inMessageContext.getProperty(Constants.Configuration.MESSAGE_TYPE));
newmsgCtx.setDoingREST(inMessageContext.isDoingREST());
newmsgCtx.setOperationContext(inMessageContext.getOperationContext());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java Sun Feb 25 11:56:59 2007
@@ -132,13 +132,13 @@
*/
public QName getQName()
{
- if (qnameAsString != null)
+ if (qnameAsString != null)
{
- return QName.valueOf(qnameAsString);
+ return QName.valueOf(qnameAsString);
}
else
{
- return null;
+ return null;
}
}
@@ -150,13 +150,13 @@
*/
public void setQName(QName q)
{
- if (q != null)
+ if (q != null)
{
- qnameAsString = q.toString();
+ qnameAsString = q.toString();
}
- else
+ else
{
- qnameAsString = null;
+ qnameAsString = null;
}
}
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java Sun Feb 25 11:56:59 2007
@@ -2017,9 +2017,9 @@
String title = "ObjectStateUtils:findHandler(): ";
- String handlerClassName = metaDataEntry.getClassName();
- String qNameAsString = metaDataEntry.getQNameAsString();
-
+ String handlerClassName = metaDataEntry.getClassName();
+ String qNameAsString = metaDataEntry.getQNameAsString();
+
for (int i=0; i < existingHandlers.size(); i++)
{
if (existingHandlers.get(i) != null)
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/OptionsParser.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/OptionsParser.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/OptionsParser.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/OptionsParser.java Sun Feb 25 11:56:59 2007
@@ -30,7 +30,7 @@
import java.util.Vector;
public class OptionsParser {
- private static final Log log = LogFactory.getLog(OptionsParser.class);
+ private static final Log log = LogFactory.getLog(OptionsParser.class);
String args[] = null;
Vector usedArgs = null;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java Sun Feb 25 11:56:59 2007
@@ -21,7 +21,6 @@
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.PolicyInclude;
import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
@@ -49,24 +48,24 @@
char c = chars[i];
switch (c) {
- case '\\':
- sbuf.append('\\');
- sbuf.append('\\');
- break;
- case '"':
- sbuf.append('\\');
- sbuf.append('"');
- break;
- case '\n':
- sbuf.append('\\');
- sbuf.append('n');
- break;
- case '\r':
- sbuf.append('\\');
- sbuf.append('r');
- break;
- default:
- sbuf.append(c);
+ case'\\':
+ sbuf.append('\\');
+ sbuf.append('\\');
+ break;
+ case'"':
+ sbuf.append('\\');
+ sbuf.append('"');
+ break;
+ case'\n':
+ sbuf.append('\\');
+ sbuf.append('n');
+ break;
+ case'\r':
+ sbuf.append('\\');
+ sbuf.append('r');
+ break;
+ default:
+ sbuf.append(c);
}
}
@@ -77,7 +76,7 @@
PolicyComponent policyComponent,
ExternalPolicySerializer externalPolicySerializer)
throws XMLStreamException, FactoryConfigurationError {
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
if (policyComponent instanceof Policy) {
@@ -162,33 +161,33 @@
return baos.toString();
}
-
+
public static String generateId(AxisDescription description) {
PolicyInclude policyInclude = description.getPolicyInclude();
String identifier = "-policy-1";
-
+
if (description instanceof AxisMessage) {
identifier = "msg-" + ((AxisMessage) description).getName() + identifier;
description = description.getParent();
- }
-
+ }
+
if (description instanceof AxisOperation) {
identifier = "op-" + ((AxisOperation) description).getName() + identifier;
- description = description.getParent();
- }
-
+ description = description.getParent();
+ }
+
if (description instanceof AxisService) {
identifier = "service-" + ((AxisService) description).getName() + identifier;
}
-
+
/*
- * Int 49 is the value of the Character '1'. Here we want to change '1' to '2' or
- * '2' to '3' .. etc. to construct a unique identifier.
- */
+ * Int 49 is the value of the Character '1'. Here we want to change '1' to '2' or
+ * '2' to '3' .. etc. to construct a unique identifier.
+ */
for (int index = 49; policyInclude.getPolicy(identifier) != null; index++) {
- identifier = identifier.replace((char) index, (char) (index + 1));
+ identifier = identifier.replace((char) index, (char) (index + 1));
}
-
+
return identifier;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/PrettyPrinter.java Sun Feb 25 11:56:59 2007
@@ -29,7 +29,7 @@
* commons rather than a specific module
*/
public class PrettyPrinter {
- private static final Log log = LogFactory.getLog(PrettyPrinter.class);
+ private static final Log log = LogFactory.getLog(PrettyPrinter.class);
/**
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SelfManagedDataHolder.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java Sun Feb 25 11:56:59 2007
@@ -137,8 +137,8 @@
ClusterManager clusterManager = configurationContext.getAxisConfiguration().getClusterManager();
if (clusterManager!=null) {
- clusterManager.addContext(serviceGroupContext);
- clusterManager.addContext(serviceContext);
+ clusterManager.addContext(serviceGroupContext);
+ clusterManager.addContext(serviceContext);
}
return serviceContext;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java?view=diff&rev=511585&r1=511584&r2=511585
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java Sun Feb 25 11:56:59 2007
@@ -36,7 +36,7 @@
* in the thread pool.
*/
public class ThreadPool implements ThreadFactory {
- private static final Log log = LogFactory.getLog(ThreadPool.class);
+ private static final Log log = LogFactory.getLog(ThreadPool.class);
protected static long SLEEP_INTERVAL = 1000;
private static boolean shutDown;
protected ThreadPoolExecutor executor;
@@ -50,8 +50,8 @@
}
public ThreadPool(int corePoolSize,int maxPoolSize) {
- this.corePoolSize = corePoolSize;
- this.maxPoolSize = maxPoolSize;
+ this.corePoolSize = corePoolSize;
+ this.maxPoolSize = maxPoolSize;
setExecutor(createDefaultExecutor("Axis2 Task", Thread.NORM_PRIORITY, true));
}
@@ -116,7 +116,7 @@
return newThread;
}
}
- );
+ );
}
catch(PrivilegedActionException e) {
// note: inner class can't have its own static log variable
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/HTTPHeaderMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/SOAPModuleMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/SoapAddress.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org