You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/02/20 18:23:10 UTC
svn commit: r154531 [2/3] - in
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis: ./
addressing/ addressing/miheaders/ addressing/om/ clientapi/ context/
description/ engine/ handlers/ phaseresolver/ providers/ receivers/
transport/ transport/http/ util/
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.axis.engine;
import org.apache.axis.context.MessageContext;
@@ -41,7 +40,6 @@
private ArrayList handlers;
private Log log = LogFactory.getLog(getClass());
-
public Phase(String phaseName) {
handlers = new ArrayList();
this.phaseName = phaseName;
@@ -69,7 +67,6 @@
* @param msgctx
* @throws AxisFault
*/
-
public void invoke(MessageContext msgctx) throws AxisFault {
Stack executionStack = new Stack();
try {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Provider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Provider.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Provider.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Provider.java Sun Feb 20 09:22:56 2005
@@ -1,25 +1,23 @@
-/*
- * 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.
- */
-
+/*
+ * 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.axis.engine;
import org.apache.axis.context.MessageContext;
import java.io.Serializable;
-
/**
* This Provider is the workhorse who locate the implementation of the Web Service and
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Receiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Receiver.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Receiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Receiver.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
public interface Receiver extends Handler {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ReceiverLocator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ReceiverLocator.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ReceiverLocator.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/ReceiverLocator.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Sender.java Sun Feb 20 09:22:56 2005
@@ -1,23 +1,21 @@
-/*
- * 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.
- */
-
+/*
+ * 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.axis.engine;
import org.apache.axis.context.MessageContext;
-
public class Sender {
public void send(MessageContext msgCtx) throws AxisFault {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/AbstractHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/AbstractHandler.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/AbstractHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/AbstractHandler.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.axis.handlers;
import org.apache.axis.context.MessageContext;
@@ -39,10 +38,8 @@
public void revoke(MessageContext msgContext) {
}
-
public void cleanup() throws AxisFault {
}
-
public Parameter getParameter(String name) {
return handlerDesc.getParameter(name);
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/OpNameFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/OpNameFinder.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/OpNameFinder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/OpNameFinder.java Sun Feb 20 09:22:56 2005
@@ -13,11 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.handlers;
-import javax.xml.namespace.QName;
-
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
@@ -28,11 +25,11 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.wsdl.WSDLService;
+import javax.xml.namespace.QName;
public class OpNameFinder extends AbstractHandler {
-
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "OpNameFinder");
+ new QName("http://axis.ws.apache.org", "OpNameFinder");
public OpNameFinder() {
init(new HandlerMetadata(NAME));
@@ -43,11 +40,10 @@
if (style.equals(WSDLService.STYLE_RPC)) {
SOAPEnvelope envelope = msgContext.getEnvelope();
SOAPBody body = envelope.getBody();
-
OMElement bodyChild = body.getFirstElement();
msgContext.setSoapOperationElement(bodyChild);
QName opName =
- new QName(
+ new QName(
bodyChild.getNamespaceName(),
bodyChild.getLocalName());
AxisService service = msgContext.getService();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseException.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseException.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseException.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseException.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.phaseresolver;
public class PhaseException extends Exception {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java Sun Feb 20 09:22:56 2005
@@ -13,10 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.phaseresolver;
-
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
@@ -34,7 +32,6 @@
* This class hold all the phases found in the service.xml and server.xml
*/
public class PhaseHolder {
-
private Log log = LogFactory.getLog(getClass());
private ArrayList phaseholder = new ArrayList();
@@ -44,7 +41,6 @@
private final EngineRegistry registry;// = new ServerMetaData();
private final AxisService service;
-
public PhaseHolder(EngineRegistry registry, AxisService serviceIN) {
this.registry = registry;
this.service = serviceIN;
@@ -74,7 +70,6 @@
public void addHandler(HandlerMetadata handler) throws PhaseException {
String phaseName = handler.getRules().getPhaseName();
-
if (isPhaseExist(phaseName)) {
getPhase(phaseName).addHandler(handler);
} else {
@@ -114,7 +109,6 @@
phase = getOrderPhases(phase);
// remove all items inorder to rearrange them
phaseholder.clear();
-
for (int i = 0; i < phase.length; i++) {
PhaseMetadata phaseMetaData = phase[i];
phaseholder.add(phaseMetaData);
@@ -122,7 +116,6 @@
}
}
-
private PhaseMetadata[] getOrderPhases(PhaseMetadata[] phasesmetadats) {
PhaseMetadata[] temppahse = new PhaseMetadata[phasesmetadats.length];
int count = 0;
@@ -142,7 +135,6 @@
return temppahse;
}
-
/**
* cahinType
* 1 : inFlowExcChain
@@ -158,7 +150,6 @@
OrderdPhases();
// Vector tempHander = new Vector();
HandlerMetadata[] handlers;
-
switch (chainType) {
case 1:
{
@@ -306,12 +297,11 @@
}
}
- public void buildGoblalChain(AxisGlobal axisGlobal, int chainType) throws PhaseException {
+ public void buildGlobalChain(AxisGlobal axisGlobal, int chainType) throws PhaseException {
try {
OrderdPhases();
// Vector tempHander = new Vector();
HandlerMetadata[] handlers;
-
switch (chainType) {
case 1:
{
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java Sun Feb 20 09:22:56 2005
@@ -13,24 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.phaseresolver;
-
import org.apache.axis.description.HandlerMetadata;
import java.util.ArrayList;
-
public class PhaseMetadata {
-
-
private static final int BOTH_BEFORE_AFTER = 0;
private static final int BEORE = 1;
private static final int AFTER = 2;
private static final int ANYWHERE = 3;
-
private String name;
/**
@@ -150,8 +144,6 @@
* order the handlers
*/
orderHandlers();
-
-
HandlerMetadata handler [];
if (isonehanlder) {
size = 1;
@@ -170,14 +162,12 @@
}
size = phaseHandlers.size();
handler = new HandlerMetadata[size];
-
for (int i = 0; i < phaseHandlers.size(); i++) {
handler[i] = (HandlerMetadata) phaseHandlers.get(i);
}
return handler;
}
-
private void orderHandlers() throws PhaseException {
validatebefore();
validateafter();
@@ -206,7 +196,6 @@
return;
}
-
/**
* This method is to check user try to add or plase a hander after the phaseLast
* that operation dose not allowd so then this throw a exception
@@ -222,8 +211,7 @@
throw new PhaseException("Try to plase a Hander " + handler.getName() + " after phaseLast " + phaseLastName);
}
}
- } else
- return;
+ }
}
private void arrangeHanders() throws PhaseException {
@@ -236,7 +224,6 @@
handler = (HandlerMetadata) phaseHandlers.get(0);
} else
handler = (HandlerMetadata) phaseHandlers.get(count);
-
status = false;
if (count > phaseHandlers.size()) {
throw new PhaseException("Incorrect hander order for " + handler.getName());
@@ -360,7 +347,6 @@
return true;
}
}
-
for (int i = 0; i < orderHanders.size(); i++) {
HandlerMetadata temphandler = (HandlerMetadata) orderHanders.get(i);
if (handler.getRules().getAfter().equals(temphandler.getName())) {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseResolver.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseResolver.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.phaseresolver;
import org.apache.axis.description.AxisGlobal;
@@ -33,12 +32,10 @@
import java.util.List;
public class PhaseResolver {
-
private final EngineRegistry engineRegistry;
private AxisService axisService;
private PhaseHolder phaseHolder;
-
/**
* default constructor , to obuild chains for AxisGlobal
*/
@@ -143,7 +140,6 @@
}
}
}
-
switch (flowtype) {
case 1:
{
@@ -172,7 +168,6 @@
}
}
phaseHolder = new PhaseHolder(engineRegistry, axisService);
-
for (int i = 0; i < allHandlers.size(); i++) {
HandlerMetadata handlerMetaData = (HandlerMetadata) allHandlers.get(i);
phaseHolder.addHandler(handlerMetaData);
@@ -272,7 +267,7 @@
}
}
}
- phaseHolder.buildGoblalChain(global, type);
+ phaseHolder.buildGlobalChain(global, type);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/AbstractProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/AbstractProvider.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/AbstractProvider.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/AbstractProvider.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.axis.providers;
import org.apache.axis.context.MessageContext;
@@ -23,7 +22,7 @@
/**
* This is the Absract provider. It is just a another handler. the
- * protected abstract methods are only for the sake of braking down the logic
+ * protected abstract methods are only for the sake of breaking down the logic
*/
public abstract class AbstractProvider implements Provider {
protected QName name;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/providers/RawXMLProvider.java Sun Feb 20 09:22:56 2005
@@ -13,13 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.providers;
-import java.lang.reflect.Method;
-
-import javax.xml.namespace.QName;
-
import org.apache.axis.Constants;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
@@ -32,10 +27,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import java.lang.reflect.Method;
+
/**
* This is a Simple java Provider.
*/
-
public class RawXMLProvider extends AbstractProvider implements Provider {
protected Log log = LogFactory.getLog(getClass());
private String scope;
@@ -48,7 +45,7 @@
}
protected Object makeNewServiceObject(MessageContext msgContext)
- throws AxisFault {
+ throws AxisFault {
try {
AxisService service = msgContext.getService();
classLoader = service.getClassLoader();
@@ -60,7 +57,7 @@
}
public Object getTheImplementationObject(MessageContext msgContext)
- throws AxisFault {
+ throws AxisFault {
AxisService service = msgContext.getService();
QName serviceName = service.getName();
if (Constants.APPLICATION_SCOPE.equals(scope)) {
@@ -95,7 +92,7 @@
//find the WebService method
Class ImplClass = obj.getClass();
String methodName =
- msgContext.getOperation().getName().getLocalPart();
+ msgContext.getOperation().getName().getLocalPart();
Method[] methods = ImplClass.getMethods();
for (int i = 0; i < methods.length; i++) {
if (methods[i].getName().equals(methodName)) {
@@ -105,30 +102,28 @@
}
Class[] parameters = method.getParameterTypes();
if (parameters != null
- && parameters.length == 1
- && OMElement.class.getName().equals(parameters[0].getName())) {
+ && parameters.length == 1
+ && OMElement.class.getName().equals(parameters[0].getName())) {
OMElement methodElement =
- msgContext.getEnvelope().getBody().getFirstElement();
+ msgContext.getEnvelope().getBody().getFirstElement();
OMElement parmeter = methodElement.getFirstElement();
-
- Object[] parms = new Object[] { parmeter };
+ Object[] parms = new Object[]{parmeter};
//invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
MessageContext msgContext1 =
- new MessageContext(
+ new MessageContext(
msgContext.getGlobalContext().getRegistry(),
msgContext.getProperties(),
msgContext.getSessionContext());
-
SOAPEnvelope envelope =
- OMFactory.newInstance().getDefaultEnvelope();
+ OMFactory.newInstance().getDefaultEnvelope();
envelope.getBody().setFirstChild(result);
msgContext1.setEnvelope(envelope);
return msgContext1;
} else {
throw new AxisFault(
- "Raw Xml provider supports only the methods bearing the signature public OMElement "
- + "<method-name>(OMElement) where the method name is anything");
+ "Raw Xml provider supports only the methods bearing the signature public OMElement "
+ + "<method-name>(OMElement) where the method name is anything");
}
} catch (Exception e) {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutAsyncReceiver.java Sun Feb 20 09:22:56 2005
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.receivers;
+
/**
* This is takes care of the IN-OUT sync MEP in the server side
*/
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutSyncReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutSyncReceiver.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutSyncReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutSyncReceiver.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.receivers;
import org.apache.axis.context.MessageContext;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport;
import org.apache.axis.addressing.EndpointReference;
@@ -51,7 +50,7 @@
//Means we are processing fault
if (msgContext.getFaultTo() != null) {
log.info("Obtain the output stream to send the fault flow to "
- + msgContext.getFaultTo().getAddress());
+ + msgContext.getFaultTo().getAddress());
out = obtainOutputStream(msgContext, msgContext.getFaultTo());
} else {
log.info("Obtain the output stream to send the fault flow to ANONYMOUS");
@@ -60,11 +59,11 @@
} else {
if (msgContext.getTo() != null) {
log.info("Obtain the output stream to send to To flow to "
- + msgContext.getTo().getAddress());
+ + msgContext.getTo().getAddress());
out = obtainOutputStream(msgContext, msgContext.getTo());
} else if (msgContext.getReplyTo() != null) {
log.info("Obtain the output stream to send to ReplyTo flow to "
- + msgContext.getReplyTo().getAddress());
+ + msgContext.getReplyTo().getAddress());
out = obtainOutputStream(msgContext, msgContext.getTo());
} else {
log.info("Obtain the output stream to send the fault flow to ANONYMOUS");
@@ -78,7 +77,7 @@
try {
// org.TimeRecorder.BEFORE_SERIALIZE = System.currentTimeMillis();
outputWriter =
- XMLOutputFactory.newInstance().createXMLStreamWriter(out);
+ XMLOutputFactory.newInstance().createXMLStreamWriter(out);
envelope.serialize(outputWriter, false);
outputWriter.flush();
if (outS != null) {
@@ -91,7 +90,6 @@
throw new AxisFault("Stream error", e);
}
}
-
finalizeSending(msgContext);
log.info("Send the Response");
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiver.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport;
import org.apache.axis.handlers.AbstractHandler;
Added: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiverLocator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiverLocator.java?view=auto&rev=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiverLocator.java (added)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiverLocator.java Sun Feb 20 09:22:56 2005
@@ -0,0 +1,33 @@
+/*
+ * 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.axis.transport;
+
+import org.apache.axis.Constants;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.transport.http.HTTPTransportReceiver;
+
+public class TransportReceiverLocator {
+ public static TransportReceiver locate(MessageContext msgContext)
+ throws AxisFault {
+ String type = (String) msgContext.getProperty(MessageContext.TRANSPORT_TYPE);
+ if (Constants.TRANSPORT_HTTP.equals(type)) {
+ return new HTTPTransportReceiver();
+ } else {
+ throw new AxisFault("No transport found");
+ }
+ }
+}
Propchange: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportReceiverLocator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSender.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSender.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport;
import org.apache.axis.engine.Handler;
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSenderLocator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSenderLocator.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSenderLocator.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/TransportSenderLocator.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport;
import org.apache.axis.Constants;
@@ -21,14 +20,12 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.http.HTTPTransportSender;
-
public class TransportSenderLocator {
-
public static TransportSender locate(MessageContext msgContext) throws AxisFault {
String type = (String) msgContext.getProperty(MessageContext.TRANSPORT_TYPE);
if (Constants.TRANSPORT_HTTP.equals(type)) {
return new HTTPTransportSender();
}
- throw new AxisFault("No tranport found");
+ throw new AxisFault("No transport found");
}
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/AxisServlet.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/AxisServlet.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport.http;
import org.apache.axis.Constants;
@@ -42,7 +41,6 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -53,9 +51,9 @@
private EngineRegistry engineRegistry;
private static final String LIST_MULTIPLE_SERVICE_JSP_NAME =
- "listServices.jsp";
+ "listServices.jsp";
private static final String LIST_SINGLE_SERVICE_JSP_NAME =
- "listSingleService.jsp";
+ "listSingleService.jsp";
private final boolean allowListServices = true;
private final boolean allowListSingleService = true;
@@ -65,10 +63,10 @@
ServletContext context = config.getServletContext();
String repoDir = context.getRealPath("/WEB-INF");
Class erClass =
- Class.forName(
+ Class.forName(
"org.apache.axis.deployment.EngineRegistryFactoryImpl");
EngineRegistryFactory erfac =
- (EngineRegistryFactory) erClass.newInstance();
+ (EngineRegistryFactory) erClass.newInstance();
this.engineRegistry = erfac.createEngineRegistry(repoDir);
} catch (Exception e) {
throw new ServletException(e);
@@ -76,15 +74,13 @@
}
protected void doGet(
- HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse)
- throws ServletException, IOException {
-
+ HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse)
+ throws ServletException, IOException {
String filePart = httpServletRequest.getRequestURL().toString();
-
if (allowListServices
- && filePart != null
- && filePart.endsWith(Constants.LISTSERVICES)) {
+ && filePart != null
+ && filePart.endsWith(Constants.LISTSERVICES)) {
listServices(httpServletRequest, httpServletResponse);
return;
} else {
@@ -100,55 +96,48 @@
* @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/
protected void doPost(HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
+ throws ServletException, IOException {
try {
res.setContentType("text/xml; charset=utf-8");
AxisEngine engine = new AxisEngine(engineRegistry);
-
Object sessionContext =
- req.getSession().getAttribute(
+ req.getSession().getAttribute(
Constants.SESSION_CONTEXT_PROPERTY);
if (sessionContext == null) {
sessionContext = new SimpleSessionContext();
req.getSession().setAttribute(
- Constants.SESSION_CONTEXT_PROPERTY,
- sessionContext);
+ Constants.SESSION_CONTEXT_PROPERTY,
+ sessionContext);
}
-
MessageContext msgContext =
- new MessageContext(
+ new MessageContext(
engineRegistry,
null,
(SessionContext) sessionContext);
-
msgContext.setServerSide(true);
String filePart = req.getRequestURL().toString();
msgContext.setTo(
- new EndpointReference(AddressingConstants.WSA_TO, filePart));
+ new EndpointReference(AddressingConstants.WSA_TO, filePart));
String soapActionString =
- req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
-
+ req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (soapActionString != null) {
msgContext.setProperty(
- MessageContext.SOAP_ACTION,
- soapActionString);
+ MessageContext.SOAP_ACTION,
+ soapActionString);
}
-
XMLStreamReader reader =
- XMLInputFactory.newInstance().createXMLStreamReader(
+ XMLInputFactory.newInstance().createXMLStreamReader(
new BufferedReader(
- new InputStreamReader(req.getInputStream())));
+ new InputStreamReader(req.getInputStream())));
StAXBuilder builder =
- new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
+ new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
-
msgContext.setProperty(
- MessageContext.TRANSPORT_TYPE,
- Constants.TRANSPORT_HTTP);
+ MessageContext.TRANSPORT_TYPE,
+ Constants.TRANSPORT_HTTP);
msgContext.setProperty(
- MessageContext.TRANSPORT_WRITER,
- new BufferedWriter(res.getWriter()));
-
+ MessageContext.TRANSPORT_WRITER,
+ new BufferedWriter(res.getWriter()));
engine.receive(msgContext);
} catch (AxisFault e) {
throw new ServletException(e);
@@ -161,19 +150,19 @@
}
private void listServices(HttpServletRequest req, HttpServletResponse res)
- throws IOException {
+ throws IOException {
HashMap services = engineRegistry.getServices();
req.getSession().setAttribute(Constants.SERVICE_MAP, services);
res.sendRedirect(LIST_MULTIPLE_SERVICE_JSP_NAME);
}
private void listService(
- HttpServletRequest req,
- HttpServletResponse res,
- String filePart)
- throws IOException {
+ HttpServletRequest req,
+ HttpServletResponse res,
+ String filePart)
+ throws IOException {
String serviceName =
- filePart.substring(
+ filePart.substring(
filePart.lastIndexOf("/") + 1,
filePart.length());
HashMap services = engineRegistry.getServices();
@@ -181,13 +170,12 @@
Object serviceObj = services.get(new QName(serviceName));
if (serviceObj != null) {
req.getSession().setAttribute(
- Constants.SINGLE_SERVICE,
- serviceObj);
+ Constants.SINGLE_SERVICE,
+ serviceObj);
}
}
String URI = req.getRequestURI();
URI = URI.substring(0, URI.indexOf("services"));
-
res.sendRedirect(URI + LIST_SINGLE_SERVICE_JSP_NAME);
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPConstants.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPConstants.java Sun Feb 20 09:22:56 2005
@@ -1,19 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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.axis.transport.http;
/**
@@ -25,7 +24,6 @@
* (Maybe this should be more specific, like "http_servlet",
* whaddya think? - todo by Jacek)
*/
-
public static final String PROTOCOL_VERSION = "PROTOCOL";
public static final String REQUEST_URI = "REQUEST_URI";
public static final String RESPONSE_CODE = "RESPONSE_CODE";
@@ -33,7 +31,6 @@
public static final String RESPONSE_ACK_CODE_VAL = "202";
public static final String SOCKET = "SOCKET";
-
public static final String HEADER_PROTOCOL_10 = "HTTP/1.0";
public static final String HEADER_PROTOCOL_11 = "HTTP/1.1";
public static final String HEADER_PROTOCOL_V10 = "1.0".intern();
@@ -58,7 +55,6 @@
public static final String HEADER_PRAGMA = "Pragma";
public static final String HEADER_LOCATION = "Location";
-
public static final String REQUEST_HEADERS = "HTTP-Request-Headers";
public static final String RESPONSE_HEADERS = "HTTP-Response-Headers";
@@ -76,7 +72,6 @@
public static final String HEADER_ACCEPT_MULTIPART_RELATED = "multipart/related";
public static final String HEADER_ACCEPT_APPLICATION_DIME = "application/dime";
-
/**
* Cookie headers
*/
@@ -111,7 +106,6 @@
public static String MC_HTTP_SERVLETLOCATION = "transport.http.servletLocation";
public static String MC_HTTP_SERVLETPATHINFO = "transport.http.servletPathInfo";
-
/**
* HTTP header field values
*/
@@ -120,7 +114,6 @@
/**
* AXIS servlet plugin parameter names.
*/
-
public static final String PLUGIN_NAME = "transport.http.plugin.pluginName";
public static final String PLUGIN_SERVICE_NAME = "transport.http.plugin.serviceName";
public static final String PLUGIN_IS_DEVELOPMENT = "transport.http.plugin.isDevelopment";
@@ -129,7 +122,6 @@
public static final String PLUGIN_WRITER = "transport.http.plugin.writer";
public static final String PLUGIN_LOG = "transport.http.plugin.log";
public static final String PLUGIN_EXCEPTION_LOG = "transport.http.plugin.exceptionLog";
-
public static final char OK[] = ("200 OK").toCharArray();
public static final byte NOCONTENT[] = ("202 OK\n\n").getBytes();
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportReceiver.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport.http;
import org.apache.axis.addressing.AddressingConstants;
@@ -35,7 +34,6 @@
import java.util.Map;
public class HTTPTransportReceiver extends TransportReceiver {
-
private static final int END = 1;
private static final int END_OF_LINE = 2;
private static final int BEFORE_SEPERATOR = 3;
@@ -57,30 +55,29 @@
msgContext.setProperty(MessageContext.SOAP_ACTION,
map.get(HTTPConstants.HEADER_SOAP_ACTION));
msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO,
- (String) map.get(HTTPConstants.REQUEST_URI)));
+ (String) map.get(HTTPConstants.REQUEST_URI)));
//TODO see is it a Service request e.g. WSDL, list ....
// TODO take care of the other HTTPHeaders
} else {
if (HTTPConstants.RESPONSE_ACK_CODE_VAL.equals(map.get(HTTPConstants.RESPONSE_CODE))) {
- msgContext.setProperty(MessageContext.TRANSPORT_SUCCEED,HTTPConstants.RESPONSE_ACK_CODE_VAL);
+ msgContext.setProperty(MessageContext.TRANSPORT_SUCCEED, HTTPConstants.RESPONSE_ACK_CODE_VAL);
return;
}
//TODO take care of other HTTP Headers
}
AxisEngine axisEngine =
- new AxisEngine(msgContext.getGlobalContext().getRegistry());
+ new AxisEngine(msgContext.getGlobalContext().getRegistry());
try {
XMLStreamReader xmlreader =
XMLInputFactory.newInstance().createXMLStreamReader(in);
StAXBuilder builder =
- new StAXSOAPModelBuilder(OMFactory.newInstance(),
- xmlreader);
+ new StAXSOAPModelBuilder(OMFactory.newInstance(),
+ xmlreader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
} catch (Exception e) {
throw new AxisFault(e.getMessage(), e);
}
-
axisEngine.receive(msgContext);
} else {
throw new AxisFault("Input reader not found");
@@ -100,7 +97,6 @@
* Pragma: no-cache
* SOAPAction: ""
* Content-Length: 73507
- * <p/>
* HTTP/1.1 200 OK
* Content-Type: text/xml;charset=utf-8
* Date: Sat, 12 Feb 2005 10:39:39 GMT
@@ -110,21 +106,15 @@
* @param reader
* @return
*/
-
public HashMap parseTheHeaders(Reader reader, boolean serverSide)
throws AxisFault {
HashMap map = new HashMap();
try {
-
StringBuffer str = new StringBuffer();
-
int state = BEFORE_SEPERATOR;
-
String key = null;
String value = null;
-
int start = 0;
-
length = readLine(reader, buf);
if (serverSide) {
if (buf[0] == 'P'
@@ -148,10 +138,7 @@
value = readFirstLineArg('\n');
map.put(HTTPConstants.RESPONSE_WORD, value);
}
-
state = BEFORE_SEPERATOR;
-
-
while (!done) {
length = readLine(reader, buf);
if (length <= 0) {
@@ -164,7 +151,6 @@
key = str.toString();
str = new StringBuffer();
state = AFTER_SEPERATOR;
-
if (buf[i + 1] == ' ') {
i++; //ignore next space
}
@@ -193,12 +179,11 @@
// break;
// case END:
// break;
- default :
+ default :
throw new AxisFault("Error Occured Unknown state " + state);
}
}
-
state = BEFORE_SEPERATOR;
}
@@ -314,7 +299,6 @@
private String readFirstLineArg(char terminal) throws AxisFault {
StringBuffer str = new StringBuffer();
try {
-
while (buf[index] != terminal && index < length) {
str.append(buf[index]);
index++;
@@ -344,7 +328,6 @@
} else {
c = lastRead;
}
-
int off = 0;
while (c != -1) {
if (c != '\n' && c != '\r') {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportSender.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportSender.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport.http;
import org.apache.axis.addressing.EndpointReference;
@@ -37,23 +36,19 @@
protected Writer out;
private Socket socket;
-
protected Writer obtainOutputStream(MessageContext msgContext)
throws AxisFault {
-
if (!msgContext.isServerSide()) {
EndpointReference toURL = msgContext.getTo();
-
if (toURL != null) {
try {
URL url = new URL(toURL.getAddress());
SocketAddress add = new InetSocketAddress(url.getHost(), url.getPort());
socket = new Socket();
socket.connect(add);
-
outS = socket.getOutputStream();
out = new BufferedWriter(new OutputStreamWriter(outS));
- writeTransportHeaders(out,url);
+ writeTransportHeaders(out, url);
msgContext.setProperty(MessageContext.TRANSPORT_READER, new BufferedReader(new InputStreamReader(socket.getInputStream())));
msgContext.setProperty(HTTPConstants.SOCKET, socket);
} catch (MalformedURLException e) {
@@ -68,9 +63,8 @@
} else {
out =
- (Writer) msgContext.getProperty(MessageContext.TRANSPORT_WRITER);
+ (Writer) msgContext.getProperty(MessageContext.TRANSPORT_WRITER);
}
-
if (out == null) {
throw new AxisFault("can not find the suffient information to find endpoint");
} else {
@@ -91,16 +85,16 @@
protected void startSending(MessageContext msgContext) throws AxisFault {
}
-
- protected void writeTransportHeaders(Writer out,URL url) throws IOException{
+
+ protected void writeTransportHeaders(Writer out, URL url) throws IOException {
StringBuffer buf = new StringBuffer();
- buf.append("POST ").append(url.getFile()).append(" HTTP/1.0\n");
- buf.append("Content-Type: text/xml; charset=utf-8\n");
- buf.append("Accept: application/soap+xml, application/dime, multipart/related, text/*\n");
- buf.append("Host: ").append(url.getHost()).append("\n");
- buf.append("Cache-Control: no-cache\n");
- buf.append("Pragma: no-cache\n");
- buf.append("SOAPAction: \"\"\n\n");
- out.write(buf.toString().toCharArray());
+ buf.append("POST ").append(url.getFile()).append(" HTTP/1.0\n");
+ buf.append("Content-Type: text/xml; charset=utf-8\n");
+ buf.append("Accept: application/soap+xml, application/dime, multipart/related, text/*\n");
+ buf.append("Host: ").append(url.getHost()).append("\n");
+ buf.append("Cache-Control: no-cache\n");
+ buf.append("Pragma: no-cache\n");
+ buf.append("SOAPAction: \"\"\n\n");
+ out.write(buf.toString().toCharArray());
}
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java?view=diff&r1=154530&r2=154531
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/SimpleHTTPServer.java Sun Feb 20 09:22:56 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis.transport.http;
import org.apache.axis.Constants;
@@ -37,7 +36,6 @@
* SOAP requests via Apache's xml-axis. This is not intended for production
* use. Its intended uses are for demos, debugging, and performance
* profiling.
- * <p/>
* Note this classes uses static objects to provide a thread pool, so you should
* not use multiple instances of this class in the same JVM/classloader unless
* you want bad things to happen at shutdown.
@@ -61,9 +59,8 @@
public SimpleHTTPServer(String dir) throws AxisFault {
try {
Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
- EngineRegistryFactory erfac = (EngineRegistryFactory)erClass.newInstance();
+ EngineRegistryFactory erfac = (EngineRegistryFactory) erClass.newInstance();
this.engineReg = erfac.createEngineRegistry(dir);
-
Thread.sleep(2000);
} catch (Exception e1) {
throw new AxisFault("Thread interuptted", e1);
@@ -102,13 +99,12 @@
throw new AxisFault("Engine Must be null");
}
Writer out =
- new OutputStreamWriter(socket.getOutputStream());
+ new OutputStreamWriter(socket.getOutputStream());
Reader in =
- new InputStreamReader(socket.getInputStream());
+ new InputStreamReader(socket.getInputStream());
MessageContext msgContext =
- new MessageContext(this.engineReg, null,null);
+ new MessageContext(this.engineReg, null, null);
msgContext.setServerSide(true);
-
out.write(HTTPConstants.HTTP);
out.write(HTTPConstants.OK);
out.write("\n\n".toCharArray());
@@ -122,7 +118,7 @@
msgContext.setProperty(MessageContext.TRANSPORT_READER,
in);
HTTPTransportReceiver reciver =
- new HTTPTransportReceiver();
+ new HTTPTransportReceiver();
reciver.invoke(msgContext);
}
@@ -169,7 +165,6 @@
/**
* Stop this server. Can be called safely if the system is already stopped,
* or if it was never started.
- * <p/>
* This will interrupt any pending accept().
*/
public void stop() {
@@ -183,7 +178,6 @@
* the socket is closing.
*/
stopped = true;
-
try {
if (serverSocket != null) {
serverSocket.close();
@@ -214,13 +208,11 @@
System.out.println("SimpeHttpReciver repositoryLocation port");
}
SimpleHTTPServer reciver = new SimpleHTTPServer(args[0]);
-
ServerSocket serverSoc = null;
serverSoc = new ServerSocket(Integer.parseInt(args[1]));
reciver.setServerSocket(serverSoc);
Thread thread = new Thread(reciver);
thread.setDaemon(true);
-
try {
thread.start();
System.in.read();