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 he...@apache.org on 2005/02/19 16:56:54 UTC
svn commit: r154411 - in webservices/axis/trunk/java: ./
modules/core/src/java/org/apache/axis/description/
modules/core/src/java/org/apache/axis/engine/
modules/core/src/java/org/apache/axis/handlers/
modules/core/src/java/org/apache/axis/phaseresolver/
modules/core/src/java/org/apache/axis/receivers/
modules/core/src/java/org/apache/axis/transport/
modules/core/src/java/org/apache/axis/transport/http/
modules/core/src/test/org/apache/axis/description/
modules/core/src/test/org/apache/axis/engine/
modules/deployment/src/java/org/apache/axis/deployment/
Author: hemapani
Date: Sat Feb 19 07:56:50 2005
New Revision: 154411
URL: http://svn.apache.org/viewcvs?view=rev&rev=154411
Log:
rename the classes as dims commeted and use the Buffered readers and writers
Added:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java
Removed:
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetaData.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java
Modified:
webservices/axis/trunk/java/maven.xml
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Phase.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/AbstractHandler.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/handlers/OpNameFinder.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/receivers/InOutSyncReceiver.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/AbstractTransportSender.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/transport/http/HTTPTransportSender.java
webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/description/RegistryTest.java
webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineUtils.java
webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java
Modified: webservices/axis/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/maven.xml?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/maven.xml (original)
+++ webservices/axis/trunk/java/maven.xml Sat Feb 19 07:56:50 2005
@@ -68,6 +68,7 @@
<goal name="war-withsamples" prereqs="multiproject:install">
<!-- jar the test classes -->
+ <mkdir dir="target"/>
<war destfile="target/axis2.war" webxml="modules/core/src/conf/web.xml">
<fileset dir="modules/core/src/html"/>
<webinf dir="modules/samples/target/test-resources/samples"/>
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/Flow.java Sat Feb 19 07:56:50 2005
@@ -23,7 +23,7 @@
public interface Flow {
public int getHandlerCount();
- public HandlerMetaData getHandler(int index);
+ public HandlerMetadata getHandler(int index);
- public void addHandler(HandlerMetaData handler);
+ public void addHandler(HandlerMetadata handler);
}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/FlowImpl.java Sat Feb 19 07:56:50 2005
@@ -27,12 +27,12 @@
list = new ArrayList();
}
- public void addHandler(HandlerMetaData handler) {
+ public void addHandler(HandlerMetadata handler) {
list.add(handler);
}
- public HandlerMetaData getHandler(int index) {
- return (HandlerMetaData) list.get(index);
+ public HandlerMetadata getHandler(int index) {
+ return (HandlerMetadata) list.get(index);
}
public int getHandlerCount() {
Added: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java?view=auto&rev=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java (added)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/description/HandlerMetadata.java Sat Feb 19 07:56:50 2005
@@ -0,0 +1,102 @@
+/*
+ * 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.description;
+
+import org.apache.axis.engine.Handler;
+
+import javax.xml.namespace.QName;
+
+/**
+ * represent the deployment information about the handler
+ */
+public class HandlerMetadata implements ParameterInclude {
+ private ParameterInclude parameterInclude;
+ private QName name;
+ private PhaseRule rules;
+ private Handler handler;
+ private String className;
+
+
+ public HandlerMetadata() {
+ this.parameterInclude = new ParameterIncludeImpl();
+ this.rules = new PhaseRule();
+ }
+
+ public HandlerMetadata(QName name) {
+ this();
+ this.name = name;
+ }
+
+ /**
+ * @return
+ */
+ public QName getName() {
+ return name;
+ }
+
+ public PhaseRule getRules() {
+ return rules;
+ }
+
+ public void setRules(PhaseRule rules) {
+ this.rules = rules;
+ }
+
+ /**
+ * @param name
+ */
+ public void setName(QName name) {
+ this.name = name;
+ }
+
+ /**
+ * @param param
+ */
+ public void addParameter(Parameter param) {
+ parameterInclude.addParameter(param);
+ }
+
+ /**
+ * @param name
+ * @return
+ */
+ public Parameter getParameter(String name) {
+ return parameterInclude.getParameter(name);
+ }
+
+ /**
+ * @return
+ */
+ public Handler getHandler() {
+ return handler;
+ }
+
+ /**
+ * @param handler
+ */
+ public void setHandler(Handler handler) {
+ this.handler = handler;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+}
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Dispatcher.java Sat Feb 19 07:56:50 2005
@@ -19,7 +19,7 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.handlers.OpNameFinder;
@@ -29,7 +29,7 @@
public static final QName NAME = new QName("http://axis.ws.apache.org", "Disapatcher");
public Dispatcher() {
- init(new HandlerMetaData(NAME));
+ init(new HandlerMetadata(NAME));
}
public void invoke(MessageContext msgctx) throws AxisFault {
Modified: webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/engine/Handler.java Sat Feb 19 07:56:50 2005
@@ -17,14 +17,14 @@
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
import javax.xml.namespace.QName;
import java.io.Serializable;
public interface Handler extends Serializable {
- public void init(HandlerMetaData handlerdesc);
+ public void init(HandlerMetadata handlerdesc);
/**
* Invoke is called to do the actual work of the Handler object.
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -17,7 +17,7 @@
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +45,7 @@
public Phase(String phaseName) {
handlers = new ArrayList();
this.phaseName = phaseName;
- init(new HandlerMetaData(NAME));
+ init(new HandlerMetadata(NAME));
}
public void addHandler(Handler handler, int index) {
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -17,7 +17,7 @@
package org.apache.axis.handlers;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
@@ -25,8 +25,8 @@
import javax.xml.namespace.QName;
public abstract class AbstractHandler implements Handler {
- private static HandlerMetaData EMPTY_HANDLER_METADATA = new HandlerMetaData();
- protected HandlerMetaData handlerDesc;
+ private static HandlerMetadata EMPTY_HANDLER_METADATA = new HandlerMetadata();
+ protected HandlerMetadata handlerDesc;
public AbstractHandler() {
handlerDesc = EMPTY_HANDLER_METADATA;
@@ -48,7 +48,7 @@
return handlerDesc.getParameter(name);
}
- public void init(HandlerMetaData handlerdesc) {
+ public void init(HandlerMetadata handlerdesc) {
this.handlerDesc = handlerdesc;
}
}
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -20,7 +20,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMNamespace;
@@ -36,7 +36,7 @@
public OpNameFinder() {
- init(new HandlerMetaData(NAME));
+ init(new HandlerMetadata(NAME));
}
public void invoke(MessageContext msgContext) throws AxisFault {
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -20,7 +20,7 @@
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Handler;
@@ -52,7 +52,7 @@
private boolean isPhaseExist(String phaseName) {
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
if (phase.getName().equals(phaseName)) {
return true;
}
@@ -72,14 +72,14 @@
return false;
}
- public void addHandler(HandlerMetaData handler) throws PhaseException {
+ public void addHandler(HandlerMetadata handler) throws PhaseException {
String phaseName = handler.getRules().getPhaseName();
if (isPhaseExist(phaseName)) {
getPhase(phaseName).addHandler(handler);
} else {
if (isPhaseExistinER(phaseName)) {
- PhaseMetaData newpPhase = new PhaseMetaData(phaseName);
+ PhaseMetadata newpPhase = new PhaseMetadata(phaseName);
addPhase(newpPhase);
newpPhase.addHandler(handler);
} else {
@@ -89,13 +89,13 @@
}
}
- private void addPhase(PhaseMetaData phase) {
+ private void addPhase(PhaseMetadata phase) {
phaseholder.add(phase);
}
- private PhaseMetaData getPhase(String phaseName) {
+ private PhaseMetadata getPhase(String phaseName) {
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
if (phase.getName().equals(phaseName)) {
return phase;
}
@@ -106,9 +106,9 @@
private void OrderdPhases() {
//todo complet this using phaseordeer
- PhaseMetaData[] phase = new PhaseMetaData[phaseholder.size()];
+ PhaseMetadata[] phase = new PhaseMetadata[phaseholder.size()];
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData tempphase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata tempphase = (PhaseMetadata) phaseholder.get(i);
phase[i] = tempphase;
}
phase = getOrderPhases(phase);
@@ -116,21 +116,21 @@
phaseholder.clear();
for (int i = 0; i < phase.length; i++) {
- PhaseMetaData phaseMetaData = phase[i];
+ PhaseMetadata phaseMetaData = phase[i];
phaseholder.add(phaseMetaData);
}
}
- private PhaseMetaData[] getOrderPhases(PhaseMetaData[] phasesmetadats) {
- PhaseMetaData[] temppahse = new PhaseMetaData[phasesmetadats.length];
+ private PhaseMetadata[] getOrderPhases(PhaseMetadata[] phasesmetadats) {
+ PhaseMetadata[] temppahse = new PhaseMetadata[phasesmetadats.length];
int count = 0;
ArrayList pahselist = registry.getPhases();
for (int i = 0; i < pahselist.size(); i++) {
String phasemetadata = (String) pahselist.get(i);
for (int j = 0; j < phasesmetadats.length; j++) {
- PhaseMetaData tempmetadata = phasesmetadats[j];
+ PhaseMetadata tempmetadata = phasesmetadats[j];
if (tempmetadata.getName().equals(phasemetadata)) {
temppahse[count] = tempmetadata;
count++;
@@ -157,14 +157,14 @@
try {
OrderdPhases();
// Vector tempHander = new Vector();
- HandlerMetaData[] handlers;
+ HandlerMetadata[] handlers;
switch (chainType) {
case 1:
{
ArrayList inChain = new ArrayList();// service.getExecutableInChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -179,7 +179,7 @@
{
ArrayList outChain = new ArrayList();// service.getExecutableOutChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -194,7 +194,7 @@
{
ArrayList faultChain = new ArrayList();//service.getExecutableFaultChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -215,7 +215,7 @@
try {
OrderdPhases();
// Vector tempHander = new Vector();
- HandlerMetaData[] handlers;
+ HandlerMetadata[] handlers;
Class handlerClass = null;
Handler handler;
switch (chainType) {
@@ -223,7 +223,7 @@
{
ArrayList inChain = new ArrayList();// service.getExecutableInChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -250,7 +250,7 @@
{
ArrayList outChain = new ArrayList();// service.getExecutableOutChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -277,7 +277,7 @@
{
ArrayList faultChain = new ArrayList();//service.getExecutableFaultChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -310,14 +310,14 @@
try {
OrderdPhases();
// Vector tempHander = new Vector();
- HandlerMetaData[] handlers;
+ HandlerMetadata[] handlers;
switch (chainType) {
case 1:
{
ArrayList inChain = new ArrayList();// service.getExecutableInChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -332,7 +332,7 @@
{
ArrayList outChain = new ArrayList();// service.getExecutableOutChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
@@ -347,7 +347,7 @@
{
ArrayList faultChain = new ArrayList();//service.getExecutableFaultChain();
for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.get(i);
+ PhaseMetadata phase = (PhaseMetadata) phaseholder.get(i);
Phase axisPhase = new Phase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
Added: 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=auto&rev=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java (added)
+++ webservices/axis/trunk/java/modules/core/src/java/org/apache/axis/phaseresolver/PhaseMetadata.java Sat Feb 19 07:56:50 2005
@@ -0,0 +1,385 @@
+/*
+ * 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.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;
+
+ /**
+ * to keet info about phase first handler
+ */
+ private HandlerMetadata phaseFirst;
+ private boolean phasefirstset;
+
+ /**
+ * to keet info about phase last handler
+ */
+ private HandlerMetadata phaseLast;
+ private boolean phaselastset;
+
+ /**
+ * to store and order the handlers
+ */
+ private ArrayList orderHanders = new ArrayList();
+
+ /**
+ * to store HandlerMetaData other than phaseFirst and phseLast
+ */
+ private ArrayList phaseHandlers = new ArrayList();
+
+ /**
+ * this is want if the phaseFirst and phaseLst same hanlder
+ * that is for this phase there is only one phase
+ */
+ private boolean isonehanlder;
+
+ public PhaseMetadata(String name) {
+ this.name = name;
+ this.phaseHandlers.clear();
+ this.phasefirstset = false;
+ this.phaselastset = false;
+ this.isonehanlder = false;
+ }
+
+ public HandlerMetadata getPhaseFirst() {
+ return phaseFirst;
+ }
+
+ public void setPhaseFirst(HandlerMetadata phaseFirst) throws PhaseException {
+ if (phasefirstset) {
+ throw new PhaseException("PhaseFirst alredy has been set, cannot have two phaseFirst Hander for same phase " + this.name);
+ } else {
+ if (getBefoerAfter(phaseFirst) != ANYWHERE) {
+ throw new PhaseException("Hander with PhaseFirst can not have any before or after proprty error in " + phaseFirst.getName());
+ } else
+ this.phaseFirst = phaseFirst;
+ phasefirstset = true;
+ }
+ }
+
+ public HandlerMetadata getPhaseLast() {
+ return phaseLast;
+ }
+
+ public void setPhaseLast(HandlerMetadata phaseLast) throws PhaseException {
+ if (phaselastset) {
+ throw new PhaseException("PhaseLast alredy has been set, cannot have two PhaseLast Hander for same phase " + this.name);
+ } else {
+ if (getBefoerAfter(phaseLast) != ANYWHERE) {
+ throw new PhaseException("Hander with PhaseLast property can not have any before or after proprty error in " + phaseLast.getName());
+ } else
+ this.phaseLast = phaseLast;
+ phaselastset = true;
+ }
+ }
+
+ public void addHandler(HandlerMetadata handler) throws PhaseException {
+ /**
+ * for the M1 we are not going to care about phaseFirst , PhaseLast only thinh u can do it
+ * insert it to a pahse.
+ * todo if you uncomment this will work fine for phase Conditions :)
+ */
+ /*
+ if (isonehanlder) {
+ throw new PhaseException(this.getName() + "can only have one handler, since there is a handler with both phaseFirst and PhaseLast true ");
+ } else {
+ if (handler.getRules().isPhaseFirst() && handler.getRules().isPhaseLast()) {
+ if (phaseHandlers.size() > 0) {
+ throw new PhaseException(this.getName() + " PhaseMetaData already added a hander so this operation not allowed cannot add the handler " + handler.getName());
+ } else {
+ setPhaseFirst(handler);
+ setPhaseLast(handler);
+ isonehanlder = true;
+ }
+ } else if (handler.getRules().isPhaseFirst()) {
+ setPhaseFirst(handler);
+ } else if (handler.getRules().isPhaseLast()) {
+ setPhaseLast(handler);
+ } else
+ phaseHandlers.add(handler);
+
+ }
+ */
+ phaseHandlers.add(handler);
+
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getBeforeIndex(String beforeName) {
+ return 0;
+ }
+
+ public int getAfterIndex(String afterName) {
+ return 0;
+ }
+
+ public HandlerMetadata[] getOrderedHandlers() throws PhaseException {
+ int size = 0;
+ /**
+ * order the handlers
+ */
+ orderHandlers();
+
+
+ HandlerMetadata handler [];
+ if (isonehanlder) {
+ size = 1;
+ handler = new HandlerMetadata[size];
+ handler[0] = getPhaseFirst();
+ return handler;
+ }
+ if (phasefirstset) {
+ if (phaseHandlers.size() > 0) {
+ phaseHandlers.add(0, getPhaseFirst());
+ } else
+ phaseHandlers.add(getPhaseFirst());
+ }
+ if (phaselastset) {
+ phaseHandlers.add(getPhaseLast());
+ }
+ 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();
+ arrangeHanders();
+ phaseHandlers.clear();
+ phaseHandlers = orderHanders;
+ }
+
+ /**
+ * This method is to check whether user try to add a handler whose before property is
+ * phaseFitsr handler , this cannot allowed , so this will throws an exception
+ * otherewise it will retun
+ *
+ * @throws PhaseException
+ */
+ private void validatebefore() throws PhaseException {
+ if (getPhaseFirst() != null) {
+ String phasFirstname = getPhaseFirst().getName().getLocalPart();
+ for (int i = 0; i < phaseHandlers.size(); i++) {
+ HandlerMetadata handler = (HandlerMetadata) phaseHandlers.get(i);
+ if (handler.getRules().getBefore().equals(phasFirstname)) {
+ throw new PhaseException("Try to plase a Hander " + handler.getName() + " before phaseFirst " + phasFirstname);
+ }
+ }
+ } else
+ 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
+ *
+ * @throws PhaseException
+ */
+ private void validateafter() throws PhaseException {
+ if (getPhaseLast() != null) {
+ String phaseLastName = getPhaseLast().getName().getLocalPart();
+ for (int i = 0; i < phaseHandlers.size(); i++) {
+ HandlerMetadata handler = (HandlerMetadata) phaseHandlers.get(i);
+ if (handler.getName().equals(phaseLastName)) {
+ throw new PhaseException("Try to plase a Hander " + handler.getName() + " after phaseLast " + phaseLastName);
+ }
+ }
+ } else
+ return;
+ }
+
+ private void arrangeHanders() throws PhaseException {
+ int count = 0;
+ int before_after = 0;
+ boolean status = false;
+ HandlerMetadata handler = null;
+ while (phaseHandlers.size() > 0) {
+ if (status) {
+ 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());
+ }
+ before_after = getBefoerAfter(handler);
+ switch (before_after) {
+ case ANYWHERE:
+ {
+ orderHanders.add(handler);
+ phaseHandlers.remove(handler);
+ count = 0;
+ status = true;
+ break;
+ }
+ case BEORE:
+ {
+ status = insertBefore(handler);
+ if (status) {
+ phaseHandlers.remove(handler);
+ count = 0;
+ }
+ break;
+ }
+ case AFTER:
+ {
+ status = insertAfter(handler);
+ if (status) {
+ phaseHandlers.remove(handler);
+ count = 0;
+ }
+ break;
+ }
+ case BOTH_BEFORE_AFTER:
+ {
+ status = insertBeforeandAfter(handler);
+ if (status) {
+ phaseHandlers.remove(handler);
+ count = 0;
+ }
+ break;
+ }
+ }
+ count++;
+ }
+ }
+
+ private int getBefoerAfter(HandlerMetadata handler) throws PhaseException {
+ if ((!handler.getRules().getBefore().equals("")) && (!handler.getRules().getAfter().equals(""))) {
+ if (handler.getRules().getBefore().equals(handler.getRules().getAfter())) {
+ throw new PhaseException("Both before and after cannot be the same for this handler" + handler.getName());
+ }
+ return BOTH_BEFORE_AFTER;
+ } else if (!handler.getRules().getBefore().equals("")) {
+ return BEORE;
+ } else if (!handler.getRules().getAfter().equals("")) {
+ return AFTER;
+ } else
+ return ANYWHERE;
+ }
+
+ private boolean insertBefore(HandlerMetadata handler) {
+ String beforename = handler.getRules().getBefore();
+ if (getPhaseLast() != null) {
+ if (getPhaseLast().getName().equals(beforename)) {
+ orderHanders.add(handler);
+ return true;
+ }
+ }
+ for (int i = 0; i < orderHanders.size(); i++) {
+ HandlerMetadata temphandler = (HandlerMetadata) orderHanders.get(i);
+ if (temphandler.getName().equals(beforename)) {
+ orderHanders.add(i, handler);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean insertAfter(HandlerMetadata handler) {
+ String afterName = handler.getRules().getAfter();
+ if (getPhaseFirst() != null) {
+ if (getPhaseFirst().getName().equals(afterName)) {
+ orderHanders.add(0, handler);
+ return true;
+ }
+ }
+ for (int i = 0; i < orderHanders.size(); i++) {
+ HandlerMetadata temphandler = (HandlerMetadata) orderHanders.get(i);
+ if (temphandler.getName().equals(afterName)) {
+ if (i == orderHanders.size() - 1) {
+ orderHanders.add(handler);
+ return true;
+ } else {
+ orderHanders.add(i + 1, handler);
+ return true;
+ }
+ }
+
+ }
+ return false;
+ }
+
+ /**
+ * This method assume that both the before and after cant be a same hander
+ * that dose not check inside this , it should check befor calling this method
+ *
+ * @param handler
+ * @return
+ */
+ private boolean insertBeforeandAfter(HandlerMetadata handler) throws PhaseException {
+ int before = -1;
+ int after = -1;
+ /**
+ * if hander.after = PhaseFirts and hnder.before = phaselast then
+ * just add the entery to vector
+ */
+ if ((getPhaseFirst() != null) && (getPhaseLast() != null)) {
+ if ((getPhaseFirst().getName().equals(handler.getRules().getAfter())) &&
+ (getPhaseLast().getName().equals(handler.getRules().getBefore()))) {
+ orderHanders.add(handler);
+ return true;
+ }
+ }
+
+ for (int i = 0; i < orderHanders.size(); i++) {
+ HandlerMetadata temphandler = (HandlerMetadata) orderHanders.get(i);
+ if (handler.getRules().getAfter().equals(temphandler.getName())) {
+ after = i;
+ } else if (handler.getRules().getBefore().equals(temphandler.getName())) {
+ before = i;
+ }
+ if ((after >= 0) && (before >= 0)) {
+ // no point of continue since both the before and after index has found
+ if (after > before) {
+ throw new PhaseException("incorrect handler order for " + handler.getName());
+ } else {
+ orderHanders.add(after + 1, handler);
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+
+}
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -21,7 +21,7 @@
import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
import org.apache.axis.description.Flow;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
@@ -134,7 +134,7 @@
}
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
- HandlerMetaData metadata = flow.getHandler(j);
+ HandlerMetadata metadata = flow.getHandler(j);
//todo change this in properway
if (metadata.getRules().getPhaseName().equals("")) {
metadata.getRules().setPhaseName("service");
@@ -163,7 +163,7 @@
}
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
- HandlerMetaData metadata = flow.getHandler(j);
+ HandlerMetadata metadata = flow.getHandler(j);
//todo change this in properway
if (metadata.getRules().getPhaseName().equals("")) {
metadata.getRules().setPhaseName("service");
@@ -174,7 +174,7 @@
phaseHolder = new PhaseHolder(engineRegistry, axisService);
for (int i = 0; i < allHandlers.size(); i++) {
- HandlerMetaData handlerMetaData = (HandlerMetaData) allHandlers.get(i);
+ HandlerMetadata handlerMetaData = (HandlerMetadata) allHandlers.get(i);
phaseHolder.addHandler(handlerMetaData);
}
phaseHolder.getOrderdHandlers(type);
@@ -218,7 +218,7 @@
}
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
- HandlerMetaData metadata = flow.getHandler(j);
+ HandlerMetadata metadata = flow.getHandler(j);
//todo change this in properway
if (metadata.getRules().getPhaseName().equals("")) {
metadata.getRules().setPhaseName("transport");
@@ -262,7 +262,7 @@
}
if (flow != null) {
for (int j = 0; j < flow.getHandlerCount(); j++) {
- HandlerMetaData metadata = flow.getHandler(j);
+ HandlerMetadata metadata = flow.getHandler(j);
//todo change this in properway
if (metadata.getRules().getPhaseName().equals("")) {
metadata.getRules().setPhaseName("global");
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -17,7 +17,7 @@
package org.apache.axis.receivers;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Provider;
import org.apache.axis.engine.Receiver;
@@ -34,7 +34,7 @@
public InOutSyncReceiver() {
- init(new HandlerMetaData(NAME));
+ init(new HandlerMetadata(NAME));
}
public void invoke(final MessageContext msgContext) throws AxisFault {
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -18,7 +18,7 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.om.SOAPEnvelope;
@@ -42,7 +42,7 @@
protected OutputStream outS;
public AbstractTransportSender() {
- init(new HandlerMetaData(NAME));
+ init(new HandlerMetadata(NAME));
}
public void invoke(MessageContext msgContext) throws AxisFault {
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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis.transport.http;
+package org.apache.axis.transport.http;
import org.apache.axis.Constants;
import org.apache.axis.addressing.AddressingConstants;
@@ -43,43 +42,54 @@
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;
import java.io.InputStreamReader;
import java.util.HashMap;
-
public class AxisServlet extends HttpServlet {
private EngineRegistry engineRegistry;
- private static final String LIST_MULTIPLE_SERVICE_JSP_NAME = "listServices.jsp";
- private static final String LIST_SINGLE_SERVICE_JSP_NAME = "listSingleService.jsp";
+ private static final String LIST_MULTIPLE_SERVICE_JSP_NAME =
+ "listServices.jsp";
+ private static final String LIST_SINGLE_SERVICE_JSP_NAME =
+ "listSingleService.jsp";
private final boolean allowListServices = true;
private final boolean allowListSingleService = true;
- public void init(ServletConfig config) throws ServletException {
+ public void init(ServletConfig config) throws ServletException {
try {
ServletContext context = config.getServletContext();
String repoDir = context.getRealPath("/WEB-INF");
- Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
- EngineRegistryFactory erfac = (EngineRegistryFactory)erClass.newInstance();
- this.engineRegistry = erfac.createEngineRegistry(repoDir);
+ Class erClass =
+ Class.forName(
+ "org.apache.axis.deployment.EngineRegistryFactoryImpl");
+ EngineRegistryFactory erfac =
+ (EngineRegistryFactory) erClass.newInstance();
+ this.engineRegistry = erfac.createEngineRegistry(repoDir);
} catch (Exception e) {
throw new ServletException(e);
}
}
-
- protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
+ protected void doGet(
+ HttpServletRequest httpServletRequest,
+ HttpServletResponse httpServletResponse)
+ throws ServletException, IOException {
String filePart = httpServletRequest.getRequestURL().toString();
- if (allowListServices && filePart != null && filePart.endsWith(Constants.LISTSERVICES)) {
- listServices(httpServletRequest,httpServletResponse);
+ if (allowListServices
+ && filePart != null
+ && filePart.endsWith(Constants.LISTSERVICES)) {
+ listServices(httpServletRequest, httpServletResponse);
return;
- }else{
- if (allowListSingleService){
- listService(httpServletRequest,httpServletResponse,filePart);
+ } else {
+ if (allowListSingleService) {
+ listService(httpServletRequest, httpServletResponse, filePart);
return;
}
@@ -90,39 +100,54 @@
* @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(Constants.SESSION_CONTEXT_PROPERTY);
- if(sessionContext == null){
+ Object sessionContext =
+ req.getSession().getAttribute(
+ Constants.SESSION_CONTEXT_PROPERTY);
+ if (sessionContext == null) {
sessionContext = new SimpleSessionContext();
- req.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,sessionContext);
+ req.getSession().setAttribute(
+ Constants.SESSION_CONTEXT_PROPERTY,
+ sessionContext);
}
- MessageContext msgContext = new MessageContext(engineRegistry, null,(SessionContext)sessionContext);
+ MessageContext msgContext =
+ new MessageContext(
+ engineRegistry,
+ null,
+ (SessionContext) sessionContext);
msgContext.setServerSide(true);
String filePart = req.getRequestURL().toString();
- msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO, filePart));
- String soapActionString = req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
+ msgContext.setTo(
+ new EndpointReference(AddressingConstants.WSA_TO, filePart));
+ String soapActionString =
+ req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (soapActionString != null) {
- msgContext.setProperty(MessageContext.SOAP_ACTION, soapActionString);
+ msgContext.setProperty(
+ MessageContext.SOAP_ACTION,
+ soapActionString);
}
XMLStreamReader reader =
- XMLInputFactory.newInstance().createXMLStreamReader(new InputStreamReader(req.getInputStream()));
+ XMLInputFactory.newInstance().createXMLStreamReader(
+ new BufferedReader(
+ 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);
- msgContext.setProperty(MessageContext.TRANSPORT_WRITER,
- res.getWriter());
+ msgContext.setProperty(
+ MessageContext.TRANSPORT_TYPE,
+ Constants.TRANSPORT_HTTP);
+ msgContext.setProperty(
+ MessageContext.TRANSPORT_WRITER,
+ new BufferedWriter(res.getWriter()));
engine.receive(msgContext);
} catch (AxisFault e) {
@@ -135,27 +160,35 @@
}
- private void listServices(HttpServletRequest req,HttpServletResponse res) throws IOException {
+ private void listServices(HttpServletRequest req, HttpServletResponse res)
+ throws IOException {
HashMap services = engineRegistry.getServices();
- req.getSession().setAttribute(Constants.SERVICE_MAP,services);
+ 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 {
- String serviceName =filePart.substring(filePart.lastIndexOf("/")+1,filePart.length());
+ private void listService(
+ HttpServletRequest req,
+ HttpServletResponse res,
+ String filePart)
+ throws IOException {
+ String serviceName =
+ filePart.substring(
+ filePart.lastIndexOf("/") + 1,
+ filePart.length());
HashMap services = engineRegistry.getServices();
- if (services!=null && !services.isEmpty()){
+ if (services != null && !services.isEmpty()) {
Object serviceObj = services.get(new QName(serviceName));
- if (serviceObj!=null){
- req.getSession().setAttribute(Constants.SINGLE_SERVICE,serviceObj);
+ if (serviceObj != null) {
+ req.getSession().setAttribute(
+ Constants.SINGLE_SERVICE,
+ serviceObj);
}
}
- String URI = req.getRequestURI();
- URI = URI.substring(0,URI.indexOf("services"));
+ 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/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=154410&r2=154411
==============================================================================
--- 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 Sat Feb 19 07:56:50 2005
@@ -21,6 +21,8 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.AbstractTransportSender;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
@@ -58,14 +60,14 @@
buf.append("Pragma: no-cache\n");
buf.append("SOAPAction: \"\"\n\n");
outS = socket.getOutputStream();
- out = new OutputStreamWriter(outS);
+ out = new BufferedWriter(new OutputStreamWriter(outS));
out.write(buf.toString().toCharArray());
// URLConnection connection = url.openConnection();
// connection.setDoOutput(true);
// out = new OutputStreamWriter(connection.getOutputStream());
- msgContext.setProperty(MessageContext.TRANSPORT_READER, new InputStreamReader(socket.getInputStream()));
+ msgContext.setProperty(MessageContext.TRANSPORT_READER, new BufferedReader(new InputStreamReader(socket.getInputStream())));
msgContext.setProperty(HTTPConstants.SOCKET, socket);
} catch (MalformedURLException e) {
throw new AxisFault(e.getMessage(), e);
Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/description/RegistryTest.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/description/RegistryTest.java Sat Feb 19 07:56:50 2005
@@ -57,7 +57,7 @@
}
public void testHandlerMedatata() {
- HandlerMetaData hmd = new HandlerMetaData();
+ HandlerMetadata hmd = new HandlerMetadata();
testParameteInClude(hmd);
}
@@ -118,7 +118,7 @@
public void invoke(MessageContext msgContext) throws AxisFault {
}
};
- handler.init(new HandlerMetaData());
+ handler.init(new HandlerMetadata());
assertNull(handler.getName());
assertNull(handler.getParameter("hello"));
handler.cleanup();
Modified: webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineUtils.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/test/org/apache/axis/engine/EngineUtils.java Sat Feb 19 07:56:50 2005
@@ -16,23 +16,24 @@
package org.apache.axis.engine;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.Constants;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.MockFlow;
import org.apache.axis.description.SimpleAxisOperationImpl;
import org.apache.axis.providers.RawXMLProvider;
import org.apache.axis.transport.http.SimpleHTTPServer;
-import javax.xml.namespace.QName;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-
public class EngineUtils {
public static final int TESTING_PORT = 5555;
@@ -80,7 +81,7 @@
public static void addHandler(Flow flow, Handler handler) {
- HandlerMetaData hmd = new HandlerMetaData();
+ HandlerMetadata hmd = new HandlerMetadata();
hmd.setName(new QName("", String.valueOf(index)));
index++;
hmd.setHandler(handler);
Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentEngine.java Sat Feb 19 07:56:50 2005
@@ -27,7 +27,7 @@
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
@@ -340,7 +340,7 @@
for (int j = 0; j < count; j++) {
//todo handle exception in properway
- HandlerMetaData handlermd = flow.getHandler(j);
+ HandlerMetadata handlermd = flow.getHandler(j);
Class handlerClass = null;
Handler handler;
handlerClass = getHandlerClass(handlermd.getClassName(), loader1);
Modified: webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&r1=154410&r2=154411
==============================================================================
--- webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/deployment/src/java/org/apache/axis/deployment/DeploymentParser.java Sat Feb 19 07:56:50 2005
@@ -23,7 +23,7 @@
import org.apache.axis.description.AxisTransport;
import org.apache.axis.description.Flow;
import org.apache.axis.description.FlowImpl;
-import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.Parameter;
import org.apache.axis.description.ParameterImpl;
import org.apache.axis.description.SimpleAxisOperationImpl;
@@ -388,10 +388,10 @@
* @throws org.apache.axis.deployment.DeploymentException
*
*/
- private HandlerMetaData processHandler() throws DeploymentException {
+ private HandlerMetadata processHandler() throws DeploymentException {
// String name = pullparser.getLocalName();
boolean ref_name = false;
- HandlerMetaData handler = new HandlerMetaData();
+ HandlerMetadata handler = new HandlerMetadata();
int attribCount = pullparser.getAttributeCount();
for (int i = 0; i < attribCount; i++) {
@@ -711,7 +711,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetaData handler = processHandler();
+ HandlerMetadata handler = processHandler();
inFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);
@@ -749,7 +749,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetaData handler = processHandler();
+ HandlerMetadata handler = processHandler();
outFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);
@@ -788,7 +788,7 @@
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String tagnae = pullparser.getLocalName();
if (HANDERST.equals(tagnae)) {
- HandlerMetaData handler = processHandler();
+ HandlerMetadata handler = processHandler();
faultFlow.addHandler(handler);
} else {
throw new DeploymentException("parser Exception : un supported element" + tagnae);