You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/16 18:18:08 UTC
svn commit: r357187 [9/25] - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: ./
addressing/ client/ client/async/ context/ deployment/ deployment/listener/
deployment/repository/util/ deployment/scheduler/ deployment/util/
descripti...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Fri Dec 16 09:13:57 2005
@@ -20,60 +20,37 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
-/*
-* 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.
-*
-*
-*/
-
-public abstract class AxisOperation implements
- ParameterInclude, DescriptionConstants,
- WSDLConstants {
+public abstract class AxisOperation
+ implements ParameterInclude, DescriptionConstants, WSDLConstants {
public static final String STYLE_RPC = "rpc";
- public static final String STYLE_DOC = "doc";
public static final String STYLE_MSG = "msg";
-
+ public static final String STYLE_DOC = "doc";
private Log log = LogFactory.getLog(getClass());
-
- private MessageReceiver messageReceiver;
-
- private HashMap moduleConfigmap;
-
private int mep = MEP_CONSTANT_INVALID;
- // private WSDLOperationImpl wsdloperation;
-
- private AxisService parent;
- private ArrayList wsamappingList;
+ // to store engaged modules
+ private ArrayList engagedModules = new ArrayList();
- //To store deploytime module refs
- private ArrayList modulerefs;
- //to hide control operation , operation which added by RM like module
+ // to hide control operation , operation which added by RM like module
private boolean controlOperation = false;
- //to store engaged modules
- private ArrayList engagedModules = new ArrayList();
+ private String style = STYLE_DOC;
- //todo need to change name to String
- private QName name;
- //to store mepURL
+ // to store mepURL
private String mepURI;
+ private MessageReceiver messageReceiver;
+ private HashMap moduleConfigmap;
+
+ // To store deploytime module refs
+ private ArrayList modulerefs;
+ // todo need to change name to String
+ private QName name;
private ParameterInclude parameterInclude;
- private String style = STYLE_DOC;
+ // private WSDLOperationImpl wsdloperation;
+ private AxisService parent;
+ private ArrayList wsamappingList;
public AxisOperation() {
mepURI = MEP_URI_IN_OUT;
@@ -87,6 +64,56 @@
this.setName(name);
}
+ public abstract void addMessage(AxisMessage message, String label);
+
+ /**
+ * To add a message Context into a operation context depending on MEPs this method has to
+ * be overided.
+ * Depending on the mep operation description know how to fill the message conetxt map
+ * in operationContext.
+ * As an exmple if the MEP is IN-OUT then depending on messagelbl operation description
+ * should know how to keep them in corret locations
+ *
+ * @param msgContext <code>MessageContext</code>
+ * @param opContext <code>OperationContext</code>
+ * @throws AxisFault <code>AxisFault</code>
+ */
+ public abstract void addMessageContext(MessageContext msgContext, OperationContext opContext)
+ throws AxisFault;
+
+ public void addModule(QName moduleName) {
+ modulerefs.add(moduleName);
+ }
+
+ /**
+ * Adding module configuration , if there is moduleConfig tag in operation
+ *
+ * @param moduleConfiguration
+ */
+ public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
+ moduleConfigmap.put(moduleConfiguration.getModuleName(), moduleConfiguration);
+ }
+
+ /**
+ * Method addParameter
+ *
+ * @param param Parameter that will be added
+ */
+ public void addParameter(Parameter param) throws AxisFault {
+ if (param == null) {
+ return;
+ }
+
+ if (isParameterLocked(param.getName())) {
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+ } else {
+ parameterInclude.addParameter(param);
+ }
+ }
+
+ public void deserializeParameters(OMElement parameterElement) throws AxisFault {
+ parameterInclude.deserializeParameters(parameterElement);
+ }
/**
* To ebgage a module it is reuired to use this method
@@ -94,81 +121,132 @@
* @param moduleref
* @throws AxisFault
*/
- public final void engageModule(ModuleDescription moduleref,
- AxisConfiguration axisConfig) throws AxisFault {
+ public final void engageModule(ModuleDescription moduleref, AxisConfiguration axisConfig)
+ throws AxisFault {
if (moduleref == null) {
return;
}
+
boolean needToadd = true;
Iterator module_itr = engagedModules.iterator();
+
while (module_itr.hasNext()) {
ModuleDescription module = (ModuleDescription) module_itr.next();
+
if (module.getName().equals(moduleref.getName())) {
- log.info(moduleref.getName().getLocalPart() +
- " module has alredy engaged to the operation" +
- " operation terminated !!!");
+ log.info(moduleref.getName().getLocalPart()
+ + " module has alredy engaged to the operation"
+ + " operation terminated !!!");
needToadd = false;
+
// return;
}
}
+
new PhaseResolver(axisConfig).engageModuleToOperation(this, moduleref);
+
if (needToadd) {
engagedModules.add(moduleref);
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axis2.description.AxisService#getEngadgedModules()
- */
-
/**
- * Method getEngadgedModules
- */
- public Collection getEngagedModules() {
- return engagedModules;
- }
-
- /**
- * Method addParameter
+ * This will not create a new operation context if there is no one already.
*
- * @param param Parameter that will be added
+ * @param msgContext
+ * @return
+ * @throws AxisFault
*/
- public void addParameter(Parameter param) throws AxisFault {
- if (param == null) {
- return;
+ public OperationContext findForExistingOperationContext(MessageContext msgContext)
+ throws AxisFault {
+ OperationContext operationContext;
+
+ if ((operationContext = msgContext.getOperationContext()) != null) {
+ return operationContext;
}
- if (isParameterLocked(param.getName())) {
- throw new AxisFault("Parmter is locked can not overide: " + param.getName());
+
+ if (null == msgContext.getRelatesTo()) {
+ return null;
} else {
- parameterInclude.addParameter(param);
+
+ // So this message is part of an ongoing MEP
+ // operationContext =
+ ConfigurationContext configContext = msgContext.getConfigurationContext();
+
+ operationContext =
+ configContext.getOperationContext(msgContext.getRelatesTo().getValue());
+
+ if (null == operationContext) {
+ throw new AxisFault(Messages.getMessage("cannotCorrealteMsg",
+ this.getName().toString(), msgContext.getRelatesTo().getValue()));
+ }
}
+
+ return operationContext;
}
/**
- * Method getParameter
+ * This method is responsible for finding a MEPContext for an incomming
+ * messages. An incomming message can be of two states.
+ * <p/>
+ * 1)This is a new incomming message of a given MEP. 2)This message is a
+ * part of an MEP which has already begun.
+ * <p/>
+ * The method is special cased for the two MEPs
+ * <p/>
+ * #IN_ONLY #IN_OUT
+ * <p/>
+ * for two reasons. First reason is the wide usage and the second being that
+ * the need for the MEPContext to be saved for further incomming messages.
+ * <p/>
+ * In the event that MEP of this operation is different from the two MEPs
+ * deafulted above the decession of creating a new or this message relates
+ * to a MEP which already in business is decided by looking at the WSA
+ * Relates TO of the incomming message.
*
- * @param name Name of the parameter
+ * @param msgContext
*/
- public Parameter getParameter(String name) {
- return parameterInclude.getParameter(name);
- }
+ public OperationContext findOperationContext(MessageContext msgContext,
+ ServiceContext serviceContext)
+ throws AxisFault {
+ OperationContext operationContext;
- public ArrayList getParameters() {
- return parameterInclude.getParameters();
- }
+ if (null == msgContext.getRelatesTo()) {
- public MessageReceiver getMessageReceiver() {
- return messageReceiver;
- }
+ // Its a new incomming message so get the factory to create a new
+ // one
+ operationContext = new OperationContext(this, serviceContext);
+ } else {
- public void deserializeParameters(OMElement parameterElement) throws AxisFault {
- parameterInclude.deserializeParameters(parameterElement);
+ // So this message is part of an ongoing MEP
+ // operationContext =
+ ConfigurationContext configContext = msgContext.getConfigurationContext();
+
+ operationContext =
+ configContext.getOperationContext(msgContext.getRelatesTo().getValue());
+
+ if (null == operationContext) {
+ throw new AxisFault(Messages.getMessage("cannotCorrelateMsg",
+ this.getName().toString(), msgContext.getRelatesTo().getValue()));
+ }
+ }
+
+ registerOperationContext(msgContext, operationContext);
+
+ return operationContext;
}
- public void setMessageReceiver(MessageReceiver messageReceiver) {
- this.messageReceiver = messageReceiver;
+ public void registerOperationContext(MessageContext msgContext,
+ OperationContext operationContext)
+ throws AxisFault {
+ msgContext.getConfigurationContext().registerOperationContext(msgContext.getMessageID(),
+ operationContext);
+ operationContext.addMessageContext(msgContext);
+ msgContext.setOperationContext(operationContext);
+
+ if (operationContext.isComplete()) {
+ operationContext.cleanup();
+ }
}
/**
@@ -202,230 +280,138 @@
}
if (temp == MEP_CONSTANT_INVALID) {
- throw new AxisError(
- "Could not Map the MEP URI to a axis MEP constant value");
+ throw new AxisError("Could not Map the MEP URI to a axis MEP constant value");
}
+
this.mep = temp;
+
return this.mep;
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.axis2.description.AxisService#getEngadgedModules()
+ */
+
+ /**
+ * Method getEngadgedModules
+ */
+ public Collection getEngagedModules() {
+ return engagedModules;
}
+ public abstract AxisMessage getMessage(String label);
+
public String getMessageExchangePattern() {
return mepURI;
}
- public void setMessageExchangePattern(String mepURI) {
- this.mepURI = mepURI;
+ public MessageReceiver getMessageReceiver() {
+ return messageReceiver;
}
+ public ModuleConfiguration getModuleConfig(QName moduleName) {
+ return (ModuleConfiguration) moduleConfigmap.get(moduleName);
+ }
- public abstract ArrayList getPhasesInFaultFlow();
-
- public abstract ArrayList getPhasesOutFaultFlow();
-
- public abstract ArrayList getPhasesOutFlow();
-
- public abstract ArrayList getRemainingPhasesInFlow();
+ public ArrayList getModuleRefs() {
+ return modulerefs;
+ }
- public abstract AxisMessage getMessage(String label);
+ public QName getName() {
+ return name;
+ }
- public abstract void setPhasesInFaultFlow(ArrayList list);
+ /**
+ * Method getParameter
+ *
+ * @param name Name of the parameter
+ */
+ public Parameter getParameter(String name) {
+ return parameterInclude.getParameter(name);
+ }
- public abstract void setPhasesOutFaultFlow(ArrayList list);
+ public ArrayList getParameters() {
+ return parameterInclude.getParameters();
+ }
- public abstract void setPhasesOutFlow(ArrayList list);
+ public AxisService getParent() {
+ return parent;
+ }
- public abstract void setRemainingPhasesInFlow(ArrayList list);
+ public abstract ArrayList getPhasesInFaultFlow();
- public abstract void addMessage(AxisMessage message, String label);
+ public abstract ArrayList getPhasesOutFaultFlow();
+ public abstract ArrayList getPhasesOutFlow();
- public void addModule(QName moduleName) {
- modulerefs.add(moduleName);
- }
+ public abstract ArrayList getRemainingPhasesInFlow();
- public ArrayList getModuleRefs() {
- return modulerefs;
+ public String getStyle() {
+ return style;
}
- public AxisService getParent() {
- return parent;
+ public ArrayList getWsamappingList() {
+ return wsamappingList;
}
- public void setParent(AxisService parent) {
- this.parent = parent;
+ public boolean isControlOperation() {
+ return controlOperation;
}
- //to check whether a given parameter is locked
+ // to check whether a given parameter is locked
public boolean isParameterLocked(String parameterName) {
+
// checking the locked value of parent
boolean loscked = false;
+
if (getParent() != null) {
loscked = getParent().isParameterLocked(parameterName);
}
+
if (loscked) {
return true;
} else {
Parameter parameter = getParameter(parameterName);
- return parameter != null && parameter.isLocked();
+
+ return (parameter != null) && parameter.isLocked();
}
}
- /**
- * Adding module configuration , if there is moduleConfig tag in operation
- *
- * @param moduleConfiguration
- */
- public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
- moduleConfigmap.put(moduleConfiguration.getModuleName(), moduleConfiguration);
+ public void setControlOperation(boolean controlOperation) {
+ this.controlOperation = controlOperation;
}
- public ModuleConfiguration getModuleConfig(QName moduleName) {
- return (ModuleConfiguration) moduleConfigmap.get(moduleName);
+ public void setMessageExchangePattern(String mepURI) {
+ this.mepURI = mepURI;
}
-
- /**
- * To add a message Context into a operation context depending on MEPs this method has to
- * be overided.
- * Depending on the mep operation description know how to fill the message conetxt map
- * in operationContext.
- * As an exmple if the MEP is IN-OUT then depending on messagelbl operation description
- * should know how to keep them in corret locations
- *
- * @param msgContext <code>MessageContext</code>
- * @param opContext <code>OperationContext</code>
- * @throws AxisFault <code>AxisFault</code>
- */
- public abstract void addMessageContext(MessageContext msgContext, OperationContext opContext)
- throws AxisFault;
-
-
- public QName getName() {
- return name;
+ public void setMessageReceiver(MessageReceiver messageReceiver) {
+ this.messageReceiver = messageReceiver;
}
public void setName(QName name) {
this.name = name;
}
- /**
- * This method is responsible for finding a MEPContext for an incomming
- * messages. An incomming message can be of two states.
- * <p/>
- * 1)This is a new incomming message of a given MEP. 2)This message is a
- * part of an MEP which has already begun.
- * <p/>
- * The method is special cased for the two MEPs
- * <p/>
- * #IN_ONLY #IN_OUT
- * <p/>
- * for two reasons. First reason is the wide usage and the second being that
- * the need for the MEPContext to be saved for further incomming messages.
- * <p/>
- * In the event that MEP of this operation is different from the two MEPs
- * deafulted above the decession of creating a new or this message relates
- * to a MEP which already in business is decided by looking at the WSA
- * Relates TO of the incomming message.
- *
- * @param msgContext
- */
- public OperationContext findOperationContext(MessageContext msgContext,
- ServiceContext serviceContext) throws AxisFault {
- OperationContext operationContext;
-
- if (null == msgContext.getRelatesTo()) {
- //Its a new incomming message so get the factory to create a new
- // one
- operationContext = new OperationContext(this, serviceContext);
- } else {
- // So this message is part of an ongoing MEP
- // operationContext =
- ConfigurationContext configContext = msgContext.getConfigurationContext();
- operationContext =
- configContext.getOperationContext(msgContext.getRelatesTo().getValue());
-
- if (null == operationContext) {
- throw new AxisFault(Messages.getMessage("cannotCorrelateMsg",
- this.getName().toString(), msgContext.getRelatesTo().getValue()));
- }
-
- }
-
- registerOperationContext(msgContext, operationContext);
-
- return operationContext;
-
+ public void setParent(AxisService parent) {
+ this.parent = parent;
}
- /**
- * This will not create a new operation context if there is no one already.
- *
- * @param msgContext
- * @return
- * @throws AxisFault
- */
- public OperationContext findForExistingOperationContext(
- MessageContext msgContext) throws AxisFault {
- OperationContext operationContext;
- if ((operationContext = msgContext.getOperationContext()) != null) {
- return operationContext;
- }
-
- if (null == msgContext.getRelatesTo()) {
- return null;
- } else {
- // So this message is part of an ongoing MEP
- // operationContext =
- ConfigurationContext configContext = msgContext.getConfigurationContext();
- operationContext =
- configContext.getOperationContext(msgContext.getRelatesTo().getValue());
-
- if (null == operationContext) {
- throw new AxisFault(Messages.getMessage("cannotCorrealteMsg",
- this.getName().toString(), msgContext.getRelatesTo().getValue()));
- }
-
- }
-
+ public abstract void setPhasesInFaultFlow(ArrayList list);
- return operationContext;
+ public abstract void setPhasesOutFaultFlow(ArrayList list);
- }
+ public abstract void setPhasesOutFlow(ArrayList list);
- public void registerOperationContext(MessageContext msgContext,
- OperationContext operationContext) throws AxisFault {
- msgContext.getConfigurationContext().registerOperationContext(
- msgContext.getMessageID(), operationContext);
- operationContext.addMessageContext(msgContext);
- msgContext.setOperationContext(operationContext);
- if (operationContext.isComplete()) {
- operationContext.cleanup();
- }
- }
+ public abstract void setRemainingPhasesInFlow(ArrayList list);
- public ArrayList getWsamappingList() {
- return wsamappingList;
+ public void setStyle(String style) {
+ this.style = style;
}
public void setWsamappingList(ArrayList wsamappingList) {
this.wsamappingList = wsamappingList;
}
-
- public boolean isControlOperation() {
- return controlOperation;
- }
-
- public void setControlOperation(boolean controlOperation) {
- this.controlOperation = controlOperation;
- }
-
- public String getStyle() {
- return style;
- }
-
- public void setStyle(String style) {
- this.style = style;
- }
-
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperationFactory.java Fri Dec 16 09:13:57 2005
@@ -3,6 +3,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.i18n.Messages;
import org.apache.wsdl.WSDLConstants;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -22,72 +23,89 @@
*/
public class AxisOperationFactory implements WSDLConstants {
-
public static AxisOperation getAxisOperation(int mepURI) throws AxisFault {
- AxisOperation abOpdesc ;
- switch(mepURI){
+ AxisOperation abOpdesc;
+
+ switch (mepURI) {
case MEP_CONSTANT_IN_ONLY : {
abOpdesc = new InOnlyAxisOperation();
+
break;
}
+
case MEP_CONSTANT_OUT_ONLY : {
abOpdesc = new OutOnlyAxisOperation();
+
break;
}
+
case MEP_CONSTANT_IN_OUT : {
abOpdesc = new InOutAxisOperation();
+
break;
}
+
case MEP_CONSTANT_IN_OPTIONAL_OUT : {
abOpdesc = new InOutAxisOperation();
+
break;
}
+
case MEP_CONSTANT_ROBUST_IN_ONLY : {
abOpdesc = new InOutAxisOperation();
+
break;
}
+
case MEP_CONSTANT_OUT_IN : {
abOpdesc = new OutInAxisOperation();
+
break;
}
+
case MEP_CONSTANT_OUT_OPTIONAL_IN : {
abOpdesc = new OutInAxisOperation();
+
break;
}
+
case MEP_CONSTANT_ROBUST_OUT_ONLY : {
abOpdesc = new OutInAxisOperation();
+
break;
}
+
default : {
- throw new AxisFault(Messages.getMessage("unSupportedMEP","ID is "+ mepURI));
+ throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
}
}
+
return abOpdesc;
}
-
-
public static AxisOperation getOperetionDescription(String mepURI) throws AxisFault {
- AxisOperation abOpdesc ;
- if(MEP_URI_IN_ONLY.equals(mepURI)){
+ AxisOperation abOpdesc;
+
+ if (MEP_URI_IN_ONLY.equals(mepURI)) {
abOpdesc = new InOnlyAxisOperation();
} else if (MEP_URI_OUT_ONLY.equals(mepURI)) {
abOpdesc = new OutOnlyAxisOperation();
} else if (MEP_URI_IN_OUT.equals(mepURI)) {
abOpdesc = new InOutAxisOperation();
- }else if(MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)){
+ } else if (MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
abOpdesc = new InOutAxisOperation();
- } else if(MEP_URI_IN_ONLY.equals(mepURI)) {
+ } else if (MEP_URI_IN_ONLY.equals(mepURI)) {
abOpdesc = new InOutAxisOperation();
- } else if(MEP_URI_OUT_IN.equals(mepURI)) {
+ } else if (MEP_URI_OUT_IN.equals(mepURI)) {
abOpdesc = new OutInAxisOperation();
} else if (MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
abOpdesc = new OutInAxisOperation();
- } else if (MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) ) {
+ } else if (MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
abOpdesc = new OutInAxisOperation();
- } else {
- throw new AxisFault(Messages.getMessage("unSupportedMEP","ID is "+ mepURI));
+ } else {
+ throw new AxisFault(Messages.getMessage("unSupportedMEP", "ID is " + mepURI));
}
+
return abOpdesc;
}
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Fri Dec 16 09:13:57 2005
@@ -1,18 +1,19 @@
/*
- * 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.axis2.description;
@@ -33,36 +34,25 @@
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.Writer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
/**
* Class AxisService
*/
public class AxisService
-// extends WSDLServiceImpl
- implements ParameterInclude, DescriptionConstants {
+//extends WSDLServiceImpl
+ implements ParameterInclude, DescriptionConstants {
private Definition definition = null;
-
private Log log = LogFactory.getLog(getClass());
-
- private HashMap moduleConfigmap;
-
- private AxisServiceGroup parent;
-
- // to store the wsdl definition , which is build at the deployment time
-
- // to keep the time that last update time of the service
- private long lastupdate;
-
- private String axisServiceName;
-
private String fileName = "";
-// private WSDLService serviceimpl = null;
-
+// private WSDLService serviceimpl = null;
private HashMap operationsAliasesMap = null;
-
private HashMap operations = new HashMap();
// to store module ref at deploy time parsing
@@ -70,15 +60,20 @@
// to store engaged mdodules
private ArrayList engagedModules = new ArrayList();
+ private String axisServiceName;
- private ParameterInclude paramterInclude;
+ // to store the wsdl definition , which is build at the deployment time
+ // to keep the time that last update time of the service
+ private long lastupdate;
+ private HashMap moduleConfigmap;
private String name;
+ private ParameterInclude paramterInclude;
+ private AxisServiceGroup parent;
private ClassLoader serviceClassLoader;
/**
* Constructor AxisService
*/
-
public AxisService() {
this.paramterInclude = new ParameterIncludeImpl();
this.operationsAliasesMap = new HashMap();
@@ -93,46 +88,13 @@
this.name = name;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axis2.description.AxisService#addToengagedModules(javax.xml.namespace.QName)
- */
-
/**
- * To ebgage a module it is reuired to use this method
+ * Adding module configuration , if there is moduleConfig tag in service
*
- * @param moduleref
+ * @param moduleConfiguration
*/
- public void engageModule(ModuleDescription moduleref,
- AxisConfiguration axisConfig) throws AxisFault {
- if (moduleref == null) {
- return;
- }
- boolean needToadd = true;
- Iterator itr_engageModules = engagedModules.iterator();
- while (itr_engageModules.hasNext()) {
- ModuleDescription module = (ModuleDescription) itr_engageModules
- .next();
- if (module.getName().equals(moduleref.getName())) {
- log.info(moduleref.getName().getLocalPart()
- + " module has alredy been engaged on the service. "
- + " Operation terminated !!!");
- needToadd = false;
- // return;
- }
- }
- // adding module operations
- addModuleOperations(moduleref, axisConfig);
-
- Iterator operations = getOperations().values().iterator();
- while (operations.hasNext()) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
- axisOperation.engageModule(moduleref, axisConfig);
- }
- if (needToadd) {
- engagedModules.add(moduleref);
- }
+ public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
+ moduleConfigmap.put(moduleConfiguration.getModuleName(), moduleConfiguration);
}
/**
@@ -140,82 +102,36 @@
*
* @param module
*/
-
- public void addModuleOperations(ModuleDescription module,
- AxisConfiguration axisConfig) throws AxisFault {
+ public void addModuleOperations(ModuleDescription module, AxisConfiguration axisConfig)
+ throws AxisFault {
HashMap map = module.getOperations();
Collection col = map.values();
+
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
- AxisOperation axisOperation = copyOperation((AxisOperation) iterator
- .next());
+ AxisOperation axisOperation = copyOperation((AxisOperation) iterator.next());
ArrayList wsamappings = axisOperation.getWsamappingList();
+
for (int j = 0; j < wsamappings.size(); j++) {
Parameter parameter = (Parameter) wsamappings.get(j);
- this.mapActionToOperation((String) parameter.getValue(),
- axisOperation);
+
+ this.mapActionToOperation((String) parameter.getValue(), axisOperation);
}
+
// this opration is a control operation.
axisOperation.setControlOperation(true);
this.addOperation(axisOperation);
}
}
- /**
- * To get a copy from module operation
- *
- * @param axisOperation
- * @return
- * @throws AxisFault
- */
- private AxisOperation copyOperation(AxisOperation axisOperation)
- throws AxisFault {
- AxisOperation operation = AxisOperationFactory
- .getOperetionDescription(axisOperation
- .getMessageExchangePattern());
- operation.setMessageReceiver(axisOperation.getMessageReceiver());
- operation.setName(axisOperation.getName());
- Iterator parameters = axisOperation.getParameters().iterator();
- while (parameters.hasNext()) {
- Parameter parameter = (Parameter) parameters.next();
- operation.addParameter(parameter);
- }
- operation.setWsamappingList(axisOperation.getWsamappingList());
- operation.setRemainingPhasesInFlow(axisOperation
- .getRemainingPhasesInFlow());
- operation.setPhasesInFaultFlow(axisOperation.getPhasesInFaultFlow());
- operation.setPhasesOutFaultFlow(axisOperation.getPhasesOutFaultFlow());
- operation.setPhasesOutFlow(axisOperation.getPhasesOutFlow());
- return operation;
- }
-
- /**
- * Method getEngadgedModules
- *
- * @return Collection
- */
- public Collection getEngagedModules() {
- return engagedModules;
+ public void addModuleref(QName moduleref) {
+ moduleRefs.add(moduleref);
}
- /**
- * Method getOperation
+ /*
+ * (non-Javadoc)
*
- * @param operationName
- * @return AxisOperation
+ * @see org.apache.axis2.description.AxisService#addOperation(org.apache.axis2.description.AxisOperation)
*/
- public AxisOperation getOperation(QName operationName) {
- AxisOperation axisOperation = (AxisOperation) operations.get(operationName);
- if (axisOperation == null) {
- axisOperation = (AxisOperation) operationsAliasesMap.get(operationName.getLocalPart());
- }
- return axisOperation;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axis2.description.AxisService#addOperation(org.apache.axis2.description.AxisOperation)
- */
/**
* Method addOperation
@@ -224,14 +140,18 @@
*/
public void addOperation(AxisOperation axisOperation) {
axisOperation.setParent(this);
+
Iterator modules = getEngagedModules().iterator();
+
while (modules.hasNext()) {
ModuleDescription module = (ModuleDescription) modules.next();
AxisServiceGroup parent = getParent();
AxisConfiguration axisConfig = null;
+
if (parent != null) {
axisConfig = parent.getParent();
}
+
try {
axisOperation.engageModule(module, axisConfig);
} catch (AxisFault axisFault) {
@@ -239,39 +159,9 @@
+ module.getName().getLocalPart());
}
}
+
operations.put(axisOperation.getName(), axisOperation);
operationsAliasesMap.put(axisOperation.getName().getLocalPart(), axisOperation);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axis2.description.AxisService#setClassLoader(java.lang.ClassLoader)
- */
-
- /**
- * Method setClassLoader
- *
- * @param classLoader
- */
- public void setClassLoader(ClassLoader classLoader) {
- this.serviceClassLoader = classLoader;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axis2.description.AxisService#getClassLoader()
- */
-
- /**
- * Method getClassLoader
- *
- * @return ClassLoader
- */
- public ClassLoader getClassLoader() {
- return this.serviceClassLoader;
}
/**
@@ -285,157 +175,140 @@
}
if (isParameterLocked(param.getName())) {
- throw new AxisFault("Parmter is locked can not overide: "
- + param.getName());
+ throw new AxisFault("Parmter is locked can not overide: " + param.getName());
} else {
paramterInclude.addParameter(param);
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.axis2.description.ParameterInclude#getParameter(java.lang.String)
- */
-
/**
- * Method getParameter
+ * To get a copy from module operation
*
- * @param name
- * @return Parameter
+ * @param axisOperation
+ * @return
+ * @throws AxisFault
*/
- public Parameter getParameter(String name) {
- return paramterInclude.getParameter(name);
+ private AxisOperation copyOperation(AxisOperation axisOperation) throws AxisFault {
+ AxisOperation operation =
+ AxisOperationFactory.getOperetionDescription(axisOperation.getMessageExchangePattern());
+
+ operation.setMessageReceiver(axisOperation.getMessageReceiver());
+ operation.setName(axisOperation.getName());
+
+ Iterator parameters = axisOperation.getParameters().iterator();
+
+ while (parameters.hasNext()) {
+ Parameter parameter = (Parameter) parameters.next();
+
+ operation.addParameter(parameter);
+ }
+
+ operation.setWsamappingList(axisOperation.getWsamappingList());
+ operation.setRemainingPhasesInFlow(axisOperation.getRemainingPhasesInFlow());
+ operation.setPhasesInFaultFlow(axisOperation.getPhasesInFaultFlow());
+ operation.setPhasesOutFaultFlow(axisOperation.getPhasesOutFaultFlow());
+ operation.setPhasesOutFlow(axisOperation.getPhasesOutFlow());
+
+ return operation;
}
- public ArrayList getParameters() {
- return paramterInclude.getParameters();
+ public void deserializeParameters(OMElement parameterElement) throws AxisFault {
+ paramterInclude.deserializeParameters(parameterElement);
}
- /**
- * Method getOperations
+ /*
+ * (non-Javadoc)
*
- * @return HashMap
+ * @see org.apache.axis2.description.AxisService#addToengagedModules(javax.xml.namespace.QName)
*/
- public HashMap getOperations() {
- return operations;
- }
/**
- * To get only the publish operations
+ * To ebgage a module it is reuired to use this method
+ *
+ * @param moduleref
*/
+ public void engageModule(ModuleDescription moduleref, AxisConfiguration axisConfig)
+ throws AxisFault {
+ if (moduleref == null) {
+ return;
+ }
- public ArrayList getPublishedOperations() {
- Iterator op_itr = getOperations().values().iterator();
- ArrayList operationList = new ArrayList();
- while (op_itr.hasNext()) {
- AxisOperation operation = (AxisOperation) op_itr.next();
- if (!operation.isControlOperation()) {
- operationList.add(operation);
+ boolean needToadd = true;
+ Iterator itr_engageModules = engagedModules.iterator();
+
+ while (itr_engageModules.hasNext()) {
+ ModuleDescription module = (ModuleDescription) itr_engageModules.next();
+
+ if (module.getName().equals(moduleref.getName())) {
+ log.info(moduleref.getName().getLocalPart()
+ + " module has alredy been engaged on the service. "
+ + " Operation terminated !!!");
+ needToadd = false;
+
+ // return;
}
}
- return operationList;
- }
- /**
- * To get the control operation which are added by module like RM
- */
- public ArrayList getControlOperations() {
- Iterator op_itr = getOperations().values().iterator();
- ArrayList operationList = new ArrayList();
- while (op_itr.hasNext()) {
- AxisOperation operation = (AxisOperation) op_itr.next();
- if (operation.isControlOperation()) {
- operationList.add(operation);
- }
+ // adding module operations
+ addModuleOperations(moduleref, axisConfig);
+
+ Iterator operations = getOperations().values().iterator();
+
+ while (operations.hasNext()) {
+ AxisOperation axisOperation = (AxisOperation) operations.next();
+
+ axisOperation.engageModule(moduleref, axisConfig);
+ }
+
+ if (needToadd) {
+ engagedModules.add(moduleref);
}
- return operationList;
}
/**
- * This method will return the operation given particular SOAP Action. This
- * method should only be called if there is only one Endpoint is defined for
- * this Service. If more than one Endpoint exists one of them will be
- * picked. If more than one Operation is found with the given SOAP Action;
- * null will be ruturned. If no particular Operation is found with the given
- * SOAP Action; null will be returned.
- *
- * @param soapAction SOAP Action defined for the particular Operation
- * @return A AxisOperation if a unque Operation can be found with the given
- * SOAP Action otherwise will return null.
- */
- public AxisOperation getOperationBySOAPAction(String soapAction) {
- if (soapAction == null || soapAction.equals("")) {
- return null;
- }
- AxisOperation operation = (AxisOperation) operations.get(new QName(soapAction));
- if (operation != null) {
- return operation;
- }
- operation = (AxisOperation) operationsAliasesMap.get(soapAction);
- return operation;
- //todo do we need to improve thise ?
- }
-
- /**
- * To get the description about the service ty67tyuio
- *
- * @return String
- */
- public String getAxisServiceName() {
- return axisServiceName;
- }
-
- /**
- * Set the description about the service
+ * Map an action (ala WSA action) to the given operation. This is used by
+ * addressing based dispatching to figure out which operation it is that a
+ * given message is for.
*
- * @param axisServiceName
+ * @param action the action key
+ * @param axisOperation the operation to map to
*/
- public void setAxisServiceName(String axisServiceName) {
- this.axisServiceName = axisServiceName;
- }
-
- public Definition getWSDLDefinition() {
- return definition;
- }
-
- public void setWSDLDefinition(Definition difDefinition) {
- this.definition = difDefinition;
+ public void mapActionToOperation(String action, AxisOperation axisOperation) {
+ operationsAliasesMap.put(action, axisOperation);
}
public void printWSDL(Writer out, String PortURL) throws AxisFault {
try {
Definition wsdlDefinition = this.getWSDLDefinition();
+
if (wsdlDefinition != null) {
Collection services = wsdlDefinition.getServices().values();
- for (Iterator iterator = services.iterator(); iterator
- .hasNext();) {
+ for (Iterator iterator = services.iterator(); iterator.hasNext();) {
Service service = (Service) iterator.next();
Collection ports = service.getPorts().values();
- for (Iterator iterator1 = ports.iterator(); iterator1
- .hasNext();) {
+
+ for (Iterator iterator1 = ports.iterator(); iterator1.hasNext();) {
Port port = (Port) iterator1.next();
+
service.setQName(new QName(this.getName()));
+
SOAPAddress soapAddress = new SOAPAddressImpl();
- soapAddress
- .setElementType(SOAPConstants.Q_ELEM_SOAP_ADDRESS);
+
+ soapAddress.setElementType(SOAPConstants.Q_ELEM_SOAP_ADDRESS);
soapAddress.setLocationURI(PortURL);
port.getExtensibilityElements().clear();
port.addExtensibilityElement(soapAddress);
}
}
- WSDLFactory.newInstance().newWSDLWriter().writeWSDL(
- wsdlDefinition, out);
+ WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);
out.flush();
} else {
- WSDLFactory.newInstance().newWSDLWriter().writeWSDL(
- wsdlDefinition, out);
+ WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);
out.write("<wsdl>This service does not have a WSDL</wsdl>");
out.flush();
}
-
} catch (WSDLException e) {
throw new AxisFault(e);
} catch (IOException e) {
@@ -444,34 +317,90 @@
}
/**
- * This method will set the current time as last update time of the service
+ * To get the description about the service ty67tyuio
+ *
+ * @return String
*/
- public void setLastupdate() {
- lastupdate = new Date().getTime();
+ public String getAxisServiceName() {
+ return axisServiceName;
}
- public long getLastupdate() {
- return lastupdate;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.axis2.description.AxisService#getClassLoader()
+ */
+
+ /**
+ * Method getClassLoader
+ *
+ * @return ClassLoader
+ */
+ public ClassLoader getClassLoader() {
+ return this.serviceClassLoader;
+ }
+
+ /**
+ * To get the control operation which are added by module like RM
+ */
+ public ArrayList getControlOperations() {
+ Iterator op_itr = getOperations().values().iterator();
+ ArrayList operationList = new ArrayList();
+
+ while (op_itr.hasNext()) {
+ AxisOperation operation = (AxisOperation) op_itr.next();
+
+ if (operation.isControlOperation()) {
+ operationList.add(operation);
+ }
+ }
+
+ return operationList;
+ }
+
+ /**
+ * Method getEngadgedModules
+ *
+ * @return Collection
+ */
+ public Collection getEngagedModules() {
+ return engagedModules;
}
public String getFileName() {
return fileName;
}
- public void setFileName(String fileName) {
- this.fileName = fileName;
+ public long getLastupdate() {
+ return lastupdate;
+ }
+
+ public ModuleConfiguration getModuleConfig(QName moduleName) {
+ return (ModuleConfiguration) moduleConfigmap.get(moduleName);
+ }
+
+ public ArrayList getModules() {
+ return moduleRefs;
+ }
+
+ public String getName() {
+ return name;
}
/**
- * Map an action (ala WSA action) to the given operation. This is used by
- * addressing based dispatching to figure out which operation it is that a
- * given message is for.
+ * Method getOperation
*
- * @param action the action key
- * @param axisOperation the operation to map to
+ * @param operationName
+ * @return AxisOperation
*/
- public void mapActionToOperation(String action, AxisOperation axisOperation) {
- operationsAliasesMap.put(action, axisOperation);
+ public AxisOperation getOperation(QName operationName) {
+ AxisOperation axisOperation = (AxisOperation) operations.get(operationName);
+
+ if (axisOperation == null) {
+ axisOperation = (AxisOperation) operationsAliasesMap.get(operationName.getLocalPart());
+ }
+
+ return axisOperation;
}
/**
@@ -485,6 +414,65 @@
}
/**
+ * This method will return the operation given particular SOAP Action. This
+ * method should only be called if there is only one Endpoint is defined for
+ * this Service. If more than one Endpoint exists one of them will be
+ * picked. If more than one Operation is found with the given SOAP Action;
+ * null will be ruturned. If no particular Operation is found with the given
+ * SOAP Action; null will be returned.
+ *
+ * @param soapAction SOAP Action defined for the particular Operation
+ * @return A AxisOperation if a unque Operation can be found with the given
+ * SOAP Action otherwise will return null.
+ */
+ public AxisOperation getOperationBySOAPAction(String soapAction) {
+ if ((soapAction == null) || soapAction.equals("")) {
+ return null;
+ }
+
+ AxisOperation operation = (AxisOperation) operations.get(new QName(soapAction));
+
+ if (operation != null) {
+ return operation;
+ }
+
+ operation = (AxisOperation) operationsAliasesMap.get(soapAction);
+
+ return operation;
+
+ // todo do we need to improve thise ?
+ }
+
+ /**
+ * Method getOperations
+ *
+ * @return HashMap
+ */
+ public HashMap getOperations() {
+ return operations;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.axis2.description.ParameterInclude#getParameter(java.lang.String)
+ */
+
+ /**
+ * Method getParameter
+ *
+ * @param name
+ * @return Parameter
+ */
+ public Parameter getParameter(String name) {
+ return paramterInclude.getParameter(name);
+ }
+
+ public ArrayList getParameters() {
+ return paramterInclude.getParameters();
+ }
+
+ /**
* To get the parent (which is AxisConfiguration in this case)
*
* @return <code>AxisConfiguration</code>
@@ -493,60 +481,91 @@
return parent;
}
- public void setParent(AxisServiceGroup parent) {
- this.parent = parent;
+ /**
+ * To get only the publish operations
+ */
+ public ArrayList getPublishedOperations() {
+ Iterator op_itr = getOperations().values().iterator();
+ ArrayList operationList = new ArrayList();
+
+ while (op_itr.hasNext()) {
+ AxisOperation operation = (AxisOperation) op_itr.next();
+
+ if (!operation.isControlOperation()) {
+ operationList.add(operation);
+ }
+ }
+
+ return operationList;
+ }
+
+ public Definition getWSDLDefinition() {
+ return definition;
}
// to check whether a given parameter is locked
public boolean isParameterLocked(String parameterName) {
+
// checking the locked value of parent
boolean loscked = false;
if (getParent() != null) {
- loscked = getParent().getAxisDescription().isParameterLocked(
- parameterName);
+ loscked = getParent().getAxisDescription().isParameterLocked(parameterName);
}
+
if (loscked) {
return true;
} else {
Parameter parameter = getParameter(parameterName);
- return parameter != null && parameter.isLocked();
- }
- }
- public void deserializeParameters(OMElement parameterElement)
- throws AxisFault {
- paramterInclude.deserializeParameters(parameterElement);
+ return (parameter != null) && parameter.isLocked();
+ }
}
/**
- * Adding module configuration , if there is moduleConfig tag in service
+ * Set the description about the service
*
- * @param moduleConfiguration
+ * @param axisServiceName
*/
- public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
- moduleConfigmap.put(moduleConfiguration.getModuleName(),
- moduleConfiguration);
+ public void setAxisServiceName(String axisServiceName) {
+ this.axisServiceName = axisServiceName;
}
- public ModuleConfiguration getModuleConfig(QName moduleName) {
- return (ModuleConfiguration) moduleConfigmap.get(moduleName);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.axis2.description.AxisService#setClassLoader(java.lang.ClassLoader)
+ */
- public void addModuleref(QName moduleref) {
- moduleRefs.add(moduleref);
+ /**
+ * Method setClassLoader
+ *
+ * @param classLoader
+ */
+ public void setClassLoader(ClassLoader classLoader) {
+ this.serviceClassLoader = classLoader;
}
- public ArrayList getModules() {
- return moduleRefs;
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
}
- public String getName() {
- return name;
+ /**
+ * This method will set the current time as last update time of the service
+ */
+ public void setLastupdate() {
+ lastupdate = new Date().getTime();
}
public void setName(String name) {
this.name = name;
}
-}
\ No newline at end of file
+ public void setParent(AxisServiceGroup parent) {
+ this.parent = parent;
+ }
+
+ public void setWSDLDefinition(Definition difDefinition) {
+ this.definition = difDefinition;
+ }
+}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java Fri Dec 16 09:13:57 2005
@@ -1,24 +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.axis2.description;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEvent;
import org.apache.axis2.om.OMElement;
@@ -31,36 +30,35 @@
import java.util.Iterator;
public class AxisServiceGroup implements ParameterInclude {
+ private Log log = LogFactory.getLog(getClass());
- // to add and get parameters
- protected ParameterInclude paramInclude;
+ // to store module ref at deploy time parsing
+ private ArrayList mdoulesList = new ArrayList();
- private Log log = LogFactory.getLog(getClass());
+ // to store service Group engagedModules name
+ private ArrayList engagedModules;
- // to keep name of the service group
- private String serviceGroupName;
+ // to store modeule configuration info
+ private HashMap moduleConfigmap;
+
+ // to add and get parameters
+ protected ParameterInclude paramInclude;
// to keep the parent of service group , to chcek parameter lock checking
// and serching
private AxisConfiguration parent;
+ // class loader
+ private ClassLoader serviceGroupClassLoader;
+
+ // to keep name of the service group
+ private String serviceGroupName;
+
/**
* Field services
*/
private HashMap services;
- // to store modeule configuration info
- private HashMap moduleConfigmap;
-
- // to store service Group engagedModules name
- private ArrayList engagedModules;
-
- // to store module ref at deploy time parsing
- private ArrayList mdoulesList = new ArrayList();
-
- // class loader
- private ClassLoader serviceGroupClassLoader;
-
public AxisServiceGroup() {
paramInclude = new ParameterIncludeImpl();
services = new HashMap();
@@ -73,97 +71,89 @@
this.parent = axisDescription;
}
- public void addParameter(Parameter param) throws AxisFault {
- paramInclude.addParameter(param);
- }
-
- public Parameter getParameter(String name) {
- return paramInclude.getParameter(name);
- }
+ /**
+ * Adding module configuration , if there is moduleConfig tag in service
+ *
+ * @param moduleConfiguration
+ */
+ public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
+ if (moduleConfigmap == null) {
+ moduleConfigmap = new HashMap();
+ }
- public ArrayList getParameters() {
- return paramInclude.getParameters();
+ moduleConfigmap.put(moduleConfiguration.getModuleName(), moduleConfiguration);
}
- public boolean isParameterLocked(String parameterName) {
- // checking the locked value of parent
- boolean loscked = false;
-
- if (getParent() != null) {
- loscked = getParent().isParameterLocked(parameterName);
- }
- if (loscked) {
- return true;
- } else {
- Parameter parameter = getParameter(parameterName);
- return parameter != null && parameter.isLocked();
- }
+ public void addModuleref(QName moduleref) {
+ mdoulesList.add(moduleref);
}
- public void deserializeParameters(OMElement parameterElement)
- throws AxisFault {
- this.paramInclude.deserializeParameters(parameterElement);
+ public void addParameter(Parameter param) throws AxisFault {
+ paramInclude.addParameter(param);
}
- public String getServiceGroupName() {
- return serviceGroupName;
- }
+ public synchronized void addService(AxisService service) throws AxisFault {
+ service.setParent(this);
- public void setServiceGroupName(String serviceGroupName) {
- this.serviceGroupName = serviceGroupName;
- }
+ AxisConfiguration axisConfig = getParent();
- public AxisConfiguration getParent() {
- return parent;
- }
+ if (axisConfig != null) {
+ Iterator modules = getEngagedModules().iterator();
- public void setParent(AxisConfiguration parent) {
- this.parent = parent;
- }
+ while (modules.hasNext()) {
+ QName moduleName = (QName) modules.next();
+ ModuleDescription moduleDesc = axisConfig.getModule(moduleName);
- /**
- * Adding module configuration , if there is moduleConfig tag in service
- *
- * @param moduleConfiguration
- */
- public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
- if (moduleConfigmap == null) {
- moduleConfigmap = new HashMap();
+ if (moduleDesc != null) {
+ service.engageModule(moduleDesc, axisConfig);
+ } else {
+ throw new AxisFault("Trying to engage a module which is not " + "available : "
+ + moduleName.getLocalPart());
+ }
+ }
}
- moduleConfigmap.put(moduleConfiguration.getModuleName(),
- moduleConfiguration);
- }
- public ModuleConfiguration getModuleConfig(QName moduleName) {
- return (ModuleConfiguration) moduleConfigmap.get(moduleName);
+ service.setLastupdate();
+ services.put(service.getName(), service);
}
public void addToengagedModules(QName moduleName) {
engagedModules.add(moduleName);
}
+ public void deserializeParameters(OMElement parameterElement) throws AxisFault {
+ this.paramInclude.deserializeParameters(parameterElement);
+ }
+
public void engageModuleToGroup(QName moduleName) {
if (moduleName == null) {
return;
}
+
boolean needToadd = true;
+
for (Iterator iterator = engagedModules.iterator(); iterator.hasNext();) {
QName modu = (QName) iterator.next();
+
if (modu.getLocalPart().equals(moduleName.getLocalPart())) {
- log
- .info(moduleName.getLocalPart()
- + " module has alredy been engaged on the service Group. "
- + " Operation terminated !!!");
+ log.info(moduleName.getLocalPart()
+ + " module has alredy been engaged on the service Group. "
+ + " Operation terminated !!!");
needToadd = false;
+
// return;
}
}
+
Iterator srevice = getServices();
ModuleDescription module = parent.getModule(moduleName);
+
if (module != null) {
while (srevice.hasNext()) {
+
// engagin per each service
AxisService axisService = (AxisService) srevice.next();
+
try {
axisService.engageModule(module, parent);
} catch (AxisFault axisFault) {
@@ -171,74 +161,97 @@
}
}
}
+
if (needToadd) {
addToengagedModules(moduleName);
}
}
+ public synchronized void removeService(QName name) throws AxisFault {
+ AxisService service = getService(name);
+
+ if (service != null) {
+ this.parent.notifyObservers(AxisEvent.SERVICE_DEPLOY, service);
+ }
+
+ services.remove(name);
+ }
+
+ public AxisConfiguration getAxisDescription() {
+ return parent;
+ }
+
public ArrayList getEngagedModules() {
return engagedModules;
}
- public Iterator getServices() {
- return services.values().iterator();
+ public ModuleConfiguration getModuleConfig(QName moduleName) {
+ return (ModuleConfiguration) moduleConfigmap.get(moduleName);
}
- public synchronized void addService(AxisService service) throws AxisFault {
- service.setParent(this);
- AxisConfiguration axisConfig = getParent();
- if (axisConfig != null) {
- Iterator modules = getEngagedModules().iterator();
- while (modules.hasNext()) {
- QName moduleName = (QName) modules.next();
- ModuleDescription moduleDesc = axisConfig.getModule(moduleName);
- if (moduleDesc != null) {
- service.engageModule(moduleDesc, axisConfig);
- } else {
- throw new AxisFault(
- "Trying to engage a module which is not "
- + "available : "
- + moduleName.getLocalPart());
- }
- }
- }
- service.setLastupdate();
- services.put(service.getName(), service);
+ public ArrayList getModuleRefs() {
+ return mdoulesList;
}
- public AxisConfiguration getAxisDescription() {
- return parent;
+ public Parameter getParameter(String name) {
+ return paramInclude.getParameter(name);
}
- public void setAxisDescription(AxisConfiguration axisDescription) {
- this.parent = axisDescription;
+ public ArrayList getParameters() {
+ return paramInclude.getParameters();
+ }
+
+ public AxisConfiguration getParent() {
+ return parent;
}
public AxisService getService(QName name) throws AxisFault {
return (AxisService) services.get(name);
}
- public void addModuleref(QName moduleref) {
- mdoulesList.add(moduleref);
+ public ClassLoader getServiceGroupClassLoader() {
+ return serviceGroupClassLoader;
}
- public ArrayList getModuleRefs() {
- return mdoulesList;
+ public String getServiceGroupName() {
+ return serviceGroupName;
}
- public synchronized void removeService(QName name) throws AxisFault {
- AxisService service = getService(name);
- if (service != null) {
- this.parent.notifyObservers(AxisEvent.SERVICE_DEPLOY, service);
+ public Iterator getServices() {
+ return services.values().iterator();
+ }
+
+ public boolean isParameterLocked(String parameterName) {
+
+ // checking the locked value of parent
+ boolean loscked = false;
+
+ if (getParent() != null) {
+ loscked = getParent().isParameterLocked(parameterName);
+ }
+
+ if (loscked) {
+ return true;
+ } else {
+ Parameter parameter = getParameter(parameterName);
+
+ return (parameter != null) && parameter.isLocked();
}
- services.remove(name);
}
- public ClassLoader getServiceGroupClassLoader() {
- return serviceGroupClassLoader;
+ public void setAxisDescription(AxisConfiguration axisDescription) {
+ this.parent = axisDescription;
+ }
+
+ public void setParent(AxisConfiguration parent) {
+ this.parent = parent;
}
public void setServiceGroupClassLoader(ClassLoader serviceGroupClassLoader) {
this.serviceGroupClassLoader = serviceGroupClassLoader;
}
-}
\ No newline at end of file
+
+ public void setServiceGroupName(String serviceGroupName) {
+ this.serviceGroupName = serviceGroupName;
+ }
+}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DefinedParameters.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DefinedParameters.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DefinedParameters.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DefinedParameters.java Fri Dec 16 09:13:57 2005
@@ -1,23 +1,22 @@
/*
- * 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.axis2.description;
+package org.apache.axis2.description;
public class DefinedParameters {
-
public static final String PARM_MEP = "mep";
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java Fri Dec 16 09:13:57 2005
@@ -1,22 +1,24 @@
/*
- * 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.axis2.description;
public interface DescriptionConstants {
+
/**
* Field EXECUTION_CHAIN_KEY
*/
@@ -25,14 +27,12 @@
/**
* Field EXECUTION_OUT_CHAIN_KEY
*/
- public static final String EXECUTION_OUT_CHAIN_KEY =
- "EXECUTION_OUT_CHAIN_KEY";
+ public static final String EXECUTION_OUT_CHAIN_KEY = "EXECUTION_OUT_CHAIN_KEY";
/**
* Field EXECUTION_FAULT_CHAIN_KEY
*/
- public static final String EXECUTION_FAULT_CHAIN_KEY =
- "EXECUTION_FAULT_CHAIN_KEY";
+ public static final String EXECUTION_FAULT_CHAIN_KEY = "EXECUTION_FAULT_CHAIN_KEY";
/**
* Field MODULEREF_KEY
@@ -45,9 +45,9 @@
public static final String OPERATION_KEY = "OPERATION_KEY";
/**
- * Field CLASSLOADER_KEY
+ * Field PROVIDER_KEY
*/
- public static final String CLASSLOADER_KEY = "CLASSLOADER_KEY";
+ public static final String MESSAGE_RECEIVER_KEY = "PROVIDER_KEY";
/**
* Field CONTEXTPATH_KEY
@@ -55,9 +55,9 @@
public static final String CONTEXTPATH_KEY = "CONTEXTPATH_KEY";
/**
- * Field PROVIDER_KEY
+ * Field CLASSLOADER_KEY
*/
- public static final String MESSAGE_RECEIVER_KEY = "PROVIDER_KEY";
+ public static final String CLASSLOADER_KEY = "CLASSLOADER_KEY";
/**
* Field STYLE_KEY
@@ -65,40 +65,38 @@
public static final String STYLE_KEY = "STYLE_KEY";
/**
- * Field PARAMETER_KEY
+ * Field SERVICE_CLASS_NAME
*/
- public static final String PARAMETER_KEY = "PARAMETER_KEY";
+ public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME";
/**
- * Field INFLOW_KEY
+ * Field SERVICE_CLASS
*/
- public static final String INFLOW_KEY = "INFLOW_KEY";
+ public static final String SERVICE_CLASS = "SERVICE_CLASS";
/**
- * Field OUTFLOW_KEY
+ * Field PHASES_KEY
*/
- public static final String OUTFLOW_KEY = "OUTFLOW_KEY";
+ public static final String PHASES_KEY = "PHASES_KEY";
/**
- * Field FAULTFLOW_KEY
+ * Field PARAMETER_KEY
*/
- public static final String IN_FAULTFLOW_KEY = "IN_FAULTFLOW_KEY";
+ public static final String PARAMETER_KEY = "PARAMETER_KEY";
public static final String OUT_FAULTFLOW_KEY = "OUT_FAULTFLOW_KEY";
/**
- * Field PHASES_KEY
+ * Field OUTFLOW_KEY
*/
- public static final String PHASES_KEY = "PHASES_KEY";
+ public static final String OUTFLOW_KEY = "OUTFLOW_KEY";
/**
- * Field SERVICE_CLASS
+ * Field FAULTFLOW_KEY
*/
- public static final String SERVICE_CLASS = "SERVICE_CLASS";
+ public static final String IN_FAULTFLOW_KEY = "IN_FAULTFLOW_KEY";
/**
- * Field SERVICE_CLASS_NAME
+ * Field INFLOW_KEY
*/
- public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME";
-
-
+ public static final String INFLOW_KEY = "INFLOW_KEY";
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Flow.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Flow.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Flow.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Flow.java Fri Dec 16 09:13:57 2005
@@ -1,18 +1,19 @@
/*
- * 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.axis2.description;
@@ -21,12 +22,13 @@
* any symantics.
*/
public interface Flow {
+
/**
- * Method getHandlerCount
+ * Method addHandler
*
- * @return
+ * @param handler
*/
- public int getHandlerCount();
+ public void addHandler(HandlerDescription handler);
/**
* Method getHandler
@@ -37,9 +39,9 @@
public HandlerDescription getHandler(int index);
/**
- * Method addHandler
+ * Method getHandlerCount
*
- * @param handler
+ * @return
*/
- public void addHandler(HandlerDescription handler);
+ public int getHandlerCount();
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowImpl.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowImpl.java Fri Dec 16 09:13:57 2005
@@ -1,18 +1,19 @@
/*
- * 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.axis2.description;
@@ -23,6 +24,7 @@
* Class FlowImpl
*/
public class FlowImpl implements Flow {
+
/**
* Field list
*/
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowInclude.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowInclude.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowInclude.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowInclude.java Fri Dec 16 09:13:57 2005
@@ -1,18 +1,19 @@
/*
- * 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.axis2.description;
@@ -22,18 +23,20 @@
public interface FlowInclude {
/**
- * Method getInFlow
+ * Method getFaultInFlow
*
* @return
*/
- public Flow getInFlow();
+ public Flow getFaultInFlow();
+
+ public Flow getFaultOutFlow();
/**
- * Method setInFlow
+ * Method getInFlow
*
- * @param inFlow
+ * @return
*/
- public void setInFlow(Flow inFlow);
+ public Flow getInFlow();
/**
* Method getOutFlow
@@ -43,32 +46,30 @@
public Flow getOutFlow();
/**
- * Method setOutFlow
+ * Method setFaultInFlow
*
- * @param outFlow
+ * @param faultFlow
*/
- public void setOutFlow(Flow outFlow);
+ public void setFaultInFlow(Flow faultFlow);
/**
- * Method getFaultInFlow
+ * Method setFaultInFlow
*
- * @return
+ * @param faultFlow
*/
- public Flow getFaultInFlow();
+ public void setFaultOutFlow(Flow faultFlow);
/**
- * Method setFaultInFlow
+ * Method setInFlow
*
- * @param faultFlow
+ * @param inFlow
*/
- public void setFaultInFlow(Flow faultFlow);
-
- public Flow getFaultOutFlow();
+ public void setInFlow(Flow inFlow);
/**
- * Method setFaultInFlow
+ * Method setOutFlow
*
- * @param faultFlow
+ * @param outFlow
*/
- public void setFaultOutFlow(Flow faultFlow);
+ public void setOutFlow(Flow outFlow);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowIncludeImpl.java?rev=357187&r1=357186&r2=357187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/FlowIncludeImpl.java Fri Dec 16 09:13:57 2005
@@ -1,18 +1,19 @@
/*
- * 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.axis2.description;
@@ -20,6 +21,13 @@
* Class FlowIncludeImpl
*/
public class FlowIncludeImpl implements FlowInclude {
+
+ /**
+ * Field fault
+ */
+ private Flow In_fault;
+ private Flow Out_fault;
+
/**
* Field in
*/
@@ -31,13 +39,6 @@
private Flow out;
/**
- * Field fault
- */
- private Flow In_fault;
-
- private Flow Out_fault;
-
- /**
* Method getFaultInFlow
*
* @return
@@ -46,6 +47,10 @@
return In_fault;
}
+ public Flow getFaultOutFlow() {
+ return this.Out_fault;
+ }
+
/**
* Method getInFlow
*
@@ -71,10 +76,6 @@
*/
public void setFaultInFlow(Flow flow) {
this.In_fault = flow;
- }
-
- public Flow getFaultOutFlow() {
- return this.Out_fault;
}
public void setFaultOutFlow(Flow faultFlow) {