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/19 06:55:09 UTC
svn commit: r357644 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
deployment/ deployment/listener/ deployment/repository/util/ description/
Author: dims
Date: Sun Dec 18 21:55:00 2005
New Revision: 357644
URL: http://svn.apache.org/viewcvs?rev=357644&view=rev
Log:
cleanup deployment constants.
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Sun Dec 18 21:55:00 2005
@@ -60,54 +60,54 @@
// processing Parameters
// Processing service level parameters
- Iterator itr = config_element.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = config_element.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, axisConfiguration, axisConfiguration);
// process MessageReciver
- Iterator msgRecives = config_element.getChildrenWithName(new QName(MESSAGERECEIVER));
+ Iterator msgRecives = config_element.getChildrenWithName(new QName(TAG_MESSAGE_RECEIVER));
while (msgRecives.hasNext()) {
OMElement msgRev = (OMElement) msgRecives.next();
MessageReceiver msgrecivere =
loadMessageReceiver(Thread.currentThread().getContextClassLoader(), msgRev);
- OMAttribute mepAtt = msgRev.getAttribute(new QName(MEP));
+ OMAttribute mepAtt = msgRev.getAttribute(new QName(TAG_MEP));
axisConfiguration.addMessageReceiver(mepAtt.getAttributeValue(), msgrecivere);
}
// Process Module refs
Iterator moduleitr =
- config_element.getChildrenWithName(new QName(DeploymentConstants.MODULEST));
+ config_element.getChildrenWithName(new QName(DeploymentConstants.TAG_MODULE));
processModuleRefs(moduleitr);
// Proccessing Transport Senders
- Iterator trs_senders = config_element.getChildrenWithName(new QName(TRANSPORTSENDER));
+ Iterator trs_senders = config_element.getChildrenWithName(new QName(TAG_TRANSPORT_SENDER));
processTransportSenders(trs_senders);
// Proccessing Transport Receivers
- Iterator trs_Reivers = config_element.getChildrenWithName(new QName(TRANSPORTRECEIVER));
+ Iterator trs_Reivers = config_element.getChildrenWithName(new QName(TAG_TRANSPORT_RECEIVER));
processTransportReceivers(trs_Reivers);
// Process Observers
- Iterator obs_ittr = config_element.getChildrenWithName(new QName(LISTENERST));
+ Iterator obs_ittr = config_element.getChildrenWithName(new QName(TAG_LISTENER));
processObservers(obs_ittr);
// processing Phase orders
- Iterator phaserders = config_element.getChildrenWithName(new QName(PHASE_ORDER));
+ Iterator phaseorders = config_element.getChildrenWithName(new QName(TAG_PHASE_ORDER));
- processPhaseOrders(phaserders);
+ processPhaseOrders(phaseorders);
- Iterator moduleConfigs = config_element.getChildrenWithName(new QName(MODULECONFIG));
+ Iterator moduleConfigs = config_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processModuleConfig(moduleConfigs, axisConfiguration, axisConfiguration);
// setting host configuration
- OMElement hostElement = config_element.getFirstChildWithName(new QName(HOST_CONFIG));
+ OMElement hostElement = config_element.getFirstChildWithName(new QName(TAG_HOST_CONFIG));
if (hostElement != null) {
processHostCongiguration(hostElement, axisConfiguration);
@@ -142,7 +142,7 @@
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
- OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTNAME));
+ OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTRIBUTE_NAME));
if (moduleName_att == null) {
throw new DeploymentException(
@@ -151,7 +151,7 @@
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
new ModuleConfiguration(new QName(module), parent);
- Iterator parameters = moduleConfig.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
config.addModuleConfig(moduleConfiguration);
@@ -167,7 +167,7 @@
protected void processModuleRefs(Iterator moduleRefs) {
while (moduleRefs.hasNext()) {
OMElement moduleref = (OMElement) moduleRefs.next();
- OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(REF));
+ OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE));
String refName = moduleRefAttribute.getAttributeValue();
engine.addModule(new QName(refName));
@@ -183,7 +183,7 @@
while (oservers.hasNext()) {
OMElement observerelement = (OMElement) oservers.next();
AxisObserver observer;
- OMAttribute trsClas = observerelement.getAttribute(new QName(CLASSNAME));
+ OMAttribute trsClas = observerelement.getAttribute(new QName(TAG_CLASS_NAME));
String clasName;
if (trsClas != null) {
@@ -201,7 +201,7 @@
// processing Parameters
// Processing service level parameters
- Iterator itr = observerelement.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = observerelement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, observer, axisConfiguration);
@@ -220,13 +220,13 @@
private ArrayList processPhaseList(OMElement phaseOrders) throws DeploymentException {
ArrayList phaselist = new ArrayList();
- Iterator phases = phaseOrders.getChildrenWithName(new QName(PHASE));
+ Iterator phases = phaseOrders.getChildrenWithName(new QName(TAG_PHASE));
while (phases.hasNext()) {
OMElement phaseelement = (OMElement) phases.next();
String phaseName =
- phaseelement.getAttribute(new QName(ATTNAME)).getAttributeValue();
- String phaseClass = phaseelement.getAttributeValue(new QName(CLASSNAME));
+ phaseelement.getAttribute(new QName(ATTRIBUTE_NAME)).getAttributeValue();
+ String phaseClass = phaseelement.getAttributeValue(new QName(TAG_CLASS_NAME));
Phase phase;
try {
@@ -237,7 +237,7 @@
phase.setName(phaseName);
- Iterator handlers = phaseelement.getChildrenWithName(new QName(HANDERST));
+ Iterator handlers = phaseelement.getChildrenWithName(new QName(TAG_HANDLER));
while (handlers.hasNext()) {
OMElement omElement = (OMElement) handlers.next();
@@ -269,15 +269,15 @@
while (phaserders.hasNext()) {
OMElement phaseOrders = (OMElement) phaserders.next();
- String flowType = phaseOrders.getAttribute(new QName(TYPE)).getAttributeValue();
+ String flowType = phaseOrders.getAttribute(new QName(TAG_TYPE)).getAttributeValue();
- if (INFLOWST.equals(flowType)) {
+ if (TAG_FLOW_IN.equals(flowType)) {
info.setINPhases(processPhaseList(phaseOrders));
- } else if (IN_FAILTFLOW.equals(flowType)) {
+ } else if (TAG_FLOW_IN_FAULT.equals(flowType)) {
info.setIN_FaultPhases(processPhaseList(phaseOrders));
- } else if (OUTFLOWST.equals(flowType)) {
+ } else if (TAG_FLOW_OUT.equals(flowType)) {
info.setOUTPhases(processPhaseList(phaseOrders));
- } else if (OUT_FAILTFLOW.equals(flowType)) {
+ } else if (TAG_FLOW_OUT_FAULT.equals(flowType)) {
info.setOUT_FaultPhases(processPhaseList(phaseOrders));
}
}
@@ -289,7 +289,7 @@
OMElement transport = (OMElement) trs_senders.next();
// getting transport Name
- OMAttribute trsName = transport.getAttribute(new QName(ATTNAME));
+ OMAttribute trsName = transport.getAttribute(new QName(ATTRIBUTE_NAME));
if (trsName != null) {
String name = trsName.getAttributeValue();
@@ -297,7 +297,7 @@
transportIN = new TransportInDescription(new QName(name));
// transport impl class
- OMAttribute trsClas = transport.getAttribute(new QName(CLASSNAME));
+ OMAttribute trsClas = transport.getAttribute(new QName(TAG_CLASS_NAME));
if (trsClas != null) {
try {
@@ -324,12 +324,12 @@
// process Parameters
// processing Parameters
// Processing service level parameters
- Iterator itr = transport.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = transport.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, transportIN, axisConfiguration);
// process INFLOW
- OMElement inFlow = transport.getFirstChildWithName(new QName(INFLOWST));
+ OMElement inFlow = transport.getFirstChildWithName(new QName(TAG_FLOW_IN));
if (inFlow != null) {
throw new DeploymentException(
@@ -337,21 +337,21 @@
DeploymentErrorMsgs.INFLOW_NOT_ALLOWED_IN_TRS_OUT, name));
}
- OMElement outFlow = transport.getFirstChildWithName(new QName(OUTFLOWST));
+ OMElement outFlow = transport.getFirstChildWithName(new QName(TAG_FLOW_OUT));
if (outFlow != null) {
transportIN.setInFlow(processFlow(outFlow, axisConfiguration));
}
OMElement inFaultFlow =
- transport.getFirstChildWithName(new QName(IN_FAILTFLOW));
+ transport.getFirstChildWithName(new QName(TAG_FLOW_IN_FAULT));
if (inFaultFlow != null) {
transportIN.setFaultFlow(processFlow(inFaultFlow, axisConfiguration));
}
OMElement outFaultFlow =
- transport.getFirstChildWithName(new QName(OUT_FAILTFLOW));
+ transport.getFirstChildWithName(new QName(TAG_FLOW_OUT_FAULT));
if (outFaultFlow != null) {
throw new DeploymentException(
@@ -374,7 +374,7 @@
OMElement transport = (OMElement) trs_senders.next();
// getting transport Name
- OMAttribute trsName = transport.getAttribute(new QName(ATTNAME));
+ OMAttribute trsName = transport.getAttribute(new QName(ATTRIBUTE_NAME));
if (trsName != null) {
String name = trsName.getAttributeValue();
@@ -382,7 +382,7 @@
transportout = new TransportOutDescription(new QName(name));
// transport impl class
- OMAttribute trsClas = transport.getAttribute(new QName(CLASSNAME));
+ OMAttribute trsClas = transport.getAttribute(new QName(TAG_CLASS_NAME));
if (trsClas == null) {
throw new DeploymentException(
@@ -403,12 +403,12 @@
// process Parameters
// processing Parameters
// Processing service level parameters
- Iterator itr = transport.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = transport.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, transportout, axisConfiguration);
// process INFLOW
- OMElement inFlow = transport.getFirstChildWithName(new QName(INFLOWST));
+ OMElement inFlow = transport.getFirstChildWithName(new QName(TAG_FLOW_IN));
if (inFlow != null) {
throw new DeploymentException(
@@ -416,14 +416,14 @@
DeploymentErrorMsgs.INFLOW_NOT_ALLOWED_IN_TRS_OUT, name));
}
- OMElement outFlow = transport.getFirstChildWithName(new QName(OUTFLOWST));
+ OMElement outFlow = transport.getFirstChildWithName(new QName(TAG_FLOW_OUT));
if (outFlow != null) {
transportout.setOutFlow(processFlow(outFlow, axisConfiguration));
}
OMElement inFaultFlow =
- transport.getFirstChildWithName(new QName(IN_FAILTFLOW));
+ transport.getFirstChildWithName(new QName(TAG_FLOW_IN_FAULT));
if (inFaultFlow != null) {
throw new DeploymentException(
@@ -432,7 +432,7 @@
}
OMElement outFaultFlow =
- transport.getFirstChildWithName(new QName(OUT_FAILTFLOW));
+ transport.getFirstChildWithName(new QName(TAG_FLOW_OUT_FAULT));
if (outFaultFlow != null) {
transportout.setFaultFlow(processFlow(outFaultFlow, axisConfiguration));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Sun Dec 18 21:55:00 2005
@@ -18,78 +18,56 @@
package org.apache.axis2.deployment;
/**
- * DeployCons interface is to keep constent value required for Deployemnt
+ * Constants used during service/module deployment
*/
public interface DeploymentConstants {
public static String META_INF = "META-INF";
- public static final String SERVICE_WSDL_NAME = "service.wsdl";
- int SERVICE = 0; // if it is a service
- int MODULE = 1; // if it is a module
- String SERVICEXML = "META-INF/services.xml";
- String SERVICE_WSDL_WITH_FOLDER = "META-INF/service.wsdl";
- String PHASE_ORDER = "phaseOrder";
- String PHASEST = "phase";
- String PARAMETER = "parameter"; // paramater start tag
- String MODULEXML = "META-INF/module.xml";
- String MODULEST = "module";
- String MODULECONFIG = "moduleConfig";
- String MESSGES = "message";
- String LISTENERST = "listener"; // paramater start tag
- String LABEL = "label";
- String HOST_CONFIG = "hostConfiguration";
- String HANDERST = "handler";
- String TYPEMAPPINGST = "typeMapping"; // typeMapping start tag
- String TYPE = "type";
- String TRANSPORTTAG = "transport";
- String TRANSPORTSTAG = "transports";
- String TRANSPORTSENDER = "transportSender";
- String TRANSPORTRECEIVER = "transportReceiver";
-
- // for servicemetadata
- String STYLENAME = "style";
- String SERVICE_PATH = "/services/";
- String SERVICE_GROUP_ELEMENT = "serviceGroup";
-
- // element in a services.xml
- String SERVICE_ELEMENT = "service";
- String SERVICETAG = "service";
-
- // for handlers
- String REF = "ref";
- String PHASELAST = "phaseLast";
- String PHASEFIRST = "phaseFirst";
- String PHASE = "phase";
- String OUT_FAILTFLOW = "Outfaultflow"; // faultflow start tag
- String OUTFLOWST = "outflow"; // outflowr start tag
- String ORDER = "order"; // to resolve the order tag
- String OPRATIONST = "operation"; // operation start tag
-
- String MODULE_PATH = "/modules/";
- String MESSAGERECEIVER = "messageReceiver";
- String MEP = "mep";
-
- // for jws file extension
- String JWS_EXTENSION = ".jws";
- String IN_FAILTFLOW = "INfaultflow"; // faultflow start tag
- String INFLOWST = "inflow"; // inflow start tag
- String HOTUPDATE = "hotupdate";
- String HOTDEPLOYMENT = "hotdeployment";
- String EXTRACTSERVICEARCHIVE = "extractServiceArchive";
- String DISPATCH_ORDER = "dispatchOrder";
- String DISPATCHER = "dispatcher";
- String DESCRIPTION = "description";
- String CONTEXTPATHNAME = "contextPath";
- String CLASSNAME = "class";
- String BEFORE = "before";
- String BEANMAPPINGST = "beanMapping"; // beanMapping start tag
- String AXIS2CONFIG = "axisconfig";
- String ATUSE = "use";
+ public static String SERVICES_XML = "META-INF/services.xml";
+ public static String MODULE_XML = "META-INF/module.xml";
+ public static String SERVICE_PATH = "/services/";
+ public static String MODULE_PATH = "/modules/";
+
+ int TYPE_SERVICE = 0; // is it a service
+ int TYPE_MODULE = 1; // is it a module
+
+ String TAG_PHASE_ORDER = "phaseOrder";
+ String TAG_PHASE = "phase";
+ String TAG_PARAMETER = "parameter";
+ String TAG_MODULE = "module";
+ String TAG_MODULE_CONFIG = "moduleConfig";
+ String TAG_MESSAGE = "message";
+ String TAG_LISTENER = "listener";
+ String TAG_LABEL = "label";
+ String TAG_HOST_CONFIG = "hostConfiguration";
+ String TAG_HANDLER = "handler";
+ String TAG_TYPE = "type";
+ String TAG_TRANSPORT_SENDER = "transportSender";
+ String TAG_TRANSPORT_RECEIVER = "transportReceiver";
+ String TAG_SERVICE_GROUP = "serviceGroup";
+ String TAG_SERVICE = "service";
+ String TAG_REFERENCE = "ref";
+ String TAG_PHASE_LAST = "phaseLast";
+ String TAG_PHASE_FIRST = "phaseFirst";
+ String TAG_ORDER = "order"; // to resolve the order tag
+ String TAG_OPERATION = "operation"; // operation start tag
+ String TAG_MESSAGE_RECEIVER = "messageReceiver";
+ String TAG_MEP = "mep";
+
+ String TAG_FLOW_OUT_FAULT = "Outfaultflow"; // faultflow start tag
+ String TAG_FLOW_OUT = "outflow"; // outflow start tag
+ String TAG_FLOW_IN_FAULT = "INfaultflow"; // faultflow start tag
+ String TAG_FLOW_IN = "inflow"; // inflow start tag
+ String TAG_HOT_UPDATE = "hotupdate";
+ String TAG_HOT_DEPLOYMENT = "hotdeployment";
+ String TAG_EXTRACT_SERVICE_ARCHIVE = "extractServiceArchive";
+ String TAG_DISPATCH_ORDER = "dispatchOrder";
+ String TAG_DISPATCHER = "dispatcher";
+ String TAG_DESCRIPTION = "description";
+ String TAG_CLASS_NAME = "class";
+ String TAG_AFTER = "after";
+ String TAG_BEFORE = "before";
// for parameters
- String ATTNAME = "name";
- String ATTLOCKED = "locked";
-
- // for operations
- String ATQNAME = "name";
- String AFTER = "after";
+ String ATTRIBUTE_NAME = "name";
+ String ATTRIBUTE_LOCKED = "locked";
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Sun Dec 18 21:55:00 2005
@@ -335,7 +335,7 @@
try {
this.setPhasesinfo(config.getPhasesInfo());
- currentArchiveFile = new ArchiveFileData(modulearchive, MODULE);
+ currentArchiveFile = new ArchiveFileData(modulearchive, TYPE_MODULE);
axismodule = new ModuleDescription();
axismodule.setModuleClassLoader(currentArchiveFile.getClassLoader());
@@ -416,7 +416,7 @@
ClassLoader classLoader, AxisConfiguration axisConfig)
throws DeploymentException {
try {
- currentArchiveFile = new ArchiveFileData(SERVICE, "");
+ currentArchiveFile = new ArchiveFileData(TYPE_SERVICE, "");
currentArchiveFile.setClassLoader(classLoader);
ServiceBuilder builder = new ServiceBuilder(serviceInputStream, axisConfig,
@@ -498,7 +498,7 @@
StringWriter errorWriter = new StringWriter();
switch (type) {
- case SERVICE :
+ case TYPE_SERVICE :
currentArchiveFile.setClassLoader(explodedDir,
axisConfig.getServiceClassLoader());
archiveReader = new ArchiveReader();
@@ -561,7 +561,7 @@
break;
- case MODULE :
+ case TYPE_MODULE :
currentArchiveFile.setClassLoader(explodedDir,
axisConfig.getModuleClassLoader());
archiveReader = new ArchiveReader();
@@ -760,7 +760,7 @@
for (int i = 0; i < wsToUnDeploy.size(); i++) {
WSInfo wsInfo = (WSInfo) wsToUnDeploy.get(i);
- if (wsInfo.getType() == SERVICE) {
+ if (wsInfo.getType() == TYPE_SERVICE) {
serviceName = getAxisServiceName(wsInfo.getFileName());
// todo fix me deepal
@@ -903,8 +903,8 @@
*/
private void setDeploymentFeatures() {
String value;
- Parameter parahotdeployment = axisConfig.getParameter(HOTDEPLOYMENT);
- Parameter parahotupdate = axisConfig.getParameter(HOTUPDATE);
+ Parameter parahotdeployment = axisConfig.getParameter(TAG_HOT_DEPLOYMENT);
+ Parameter parahotupdate = axisConfig.getParameter(TAG_HOT_UPDATE);
if (parahotdeployment != null) {
value = (String) parahotdeployment.getValue();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Sun Dec 18 21:55:00 2005
@@ -118,7 +118,7 @@
protected MessageReceiver loadMessageReceiver(ClassLoader loader, OMElement reciverElement)
throws DeploymentException {
- OMAttribute recieverName = reciverElement.getAttribute(new QName(CLASSNAME));
+ OMAttribute recieverName = reciverElement.getAttribute(new QName(TAG_CLASS_NAME));
String className = recieverName.getAttributeValue();
MessageReceiver receiver = null;
@@ -161,7 +161,7 @@
return flow;
}
- Iterator handlers = flowelement.getChildrenWithName(new QName(HANDERST));
+ Iterator handlers = flowelement.getChildrenWithName(new QName(TAG_HANDLER));
while (handlers.hasNext()) {
OMElement handlerElement = (OMElement) handlers.next();
@@ -184,7 +184,7 @@
HandlerDescription handler = new HandlerDescription();
// Setting Handler name
- OMAttribute name_attribute = handler_element.getAttribute(new QName(ATTNAME));
+ OMAttribute name_attribute = handler_element.getAttribute(new QName(ATTRIBUTE_NAME));
if (name_attribute == null) {
throw new DeploymentException(Messages.getMessage(DeploymentErrorMsgs.INVALID_HANDLER,
@@ -194,7 +194,7 @@
}
// Setting Handler Class name
- OMAttribute class_attribute = handler_element.getAttribute(new QName(CLASSNAME));
+ OMAttribute class_attribute = handler_element.getAttribute(new QName(TAG_CLASS_NAME));
if (class_attribute == null) {
throw new DeploymentException((Messages.getMessage(DeploymentErrorMsgs.INVALID_HANDLER,
@@ -204,7 +204,7 @@
}
// processing phase Rules (order)
- OMElement order_element = handler_element.getFirstChildWithName(new QName(ORDER));
+ OMElement order_element = handler_element.getFirstChildWithName(new QName(TAG_ORDER));
if (order_element == null) {
throw new DeploymentException((Messages.getMessage(DeploymentErrorMsgs.INVALID_HANDLER,
@@ -217,13 +217,13 @@
String name = orderAttribute.getQName().getLocalPart();
String value = orderAttribute.getAttributeValue();
- if (AFTER.equals(name)) {
+ if (TAG_AFTER.equals(name)) {
handler.getRules().setAfter(value);
- } else if (BEFORE.equals(name)) {
+ } else if (TAG_BEFORE.equals(name)) {
handler.getRules().setBefore(value);
- } else if (PHASE.equals(name)) {
+ } else if (TAG_PHASE.equals(name)) {
handler.getRules().setPhaseName(value);
- } else if (PHASEFIRST.equals(name)) {
+ } else if (TAG_PHASE_FIRST.equals(name)) {
String boolval = getValue(value);
if (boolval.equals("true")) {
@@ -231,7 +231,7 @@
} else if (boolval.equals("false")) {
handler.getRules().setPhaseFirst(false);
}
- } else if (PHASELAST.equals(name)) {
+ } else if (TAG_PHASE_LAST.equals(name)) {
String boolval = getValue(value);
if (boolval.equals("true")) {
@@ -242,7 +242,7 @@
}
}
- Iterator parameters = handler_element.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = handler_element.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, handler, parent);
}
@@ -257,7 +257,7 @@
try {
while (moduleRefs.hasNext()) {
OMElement moduleref = (OMElement) moduleRefs.next();
- OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(REF));
+ OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE));
if (moduleRefAttribute != null) {
String refName = moduleRefAttribute.getAttributeValue();
@@ -300,7 +300,7 @@
parameter.setParameterElement(parameterElement);
// setting parameter Name
- OMAttribute paraName = parameterElement.getAttribute(new QName(ATTNAME));
+ OMAttribute paraName = parameterElement.getAttribute(new QName(ATTRIBUTE_NAME));
if (paraName == null) {
throw new DeploymentException(
@@ -323,7 +323,7 @@
}
// setting locking attribute
- OMAttribute paraLocked = parameterElement.getAttribute(new QName(ATTLOCKED));
+ OMAttribute paraLocked = parameterElement.getAttribute(new QName(ATTRIBUTE_LOCKED));
Parameter parentpara = null;
if (parent != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Sun Dec 18 21:55:00 2005
@@ -70,7 +70,7 @@
OMElement moduleElement = buildOM();
// Setting Module Name
- OMAttribute moduleNameAtt = moduleElement.getAttribute(new QName(ATTNAME));
+ OMAttribute moduleNameAtt = moduleElement.getAttribute(new QName(ATTRIBUTE_NAME));
if (moduleNameAtt != null) {
String moduleName = moduleNameAtt.getAttributeValue();
@@ -81,7 +81,7 @@
}
// Setting Module Class , if it is there
- OMAttribute moduleClassAtt = moduleElement.getAttribute(new QName(CLASSNAME));
+ OMAttribute moduleClassAtt = moduleElement.getAttribute(new QName(TAG_CLASS_NAME));
if (moduleClassAtt != null) {
String moduleClass = moduleClassAtt.getAttributeValue();
@@ -93,37 +93,37 @@
// processing Parameters
// Processing service level parameters
- Iterator itr = moduleElement.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = moduleElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, module, module.getParent());
// process INFLOW
- OMElement inFlow = moduleElement.getFirstChildWithName(new QName(INFLOWST));
+ OMElement inFlow = moduleElement.getFirstChildWithName(new QName(TAG_FLOW_IN));
if (inFlow != null) {
module.setInFlow(processFlow(inFlow, module));
}
- OMElement outFlow = moduleElement.getFirstChildWithName(new QName(OUTFLOWST));
+ OMElement outFlow = moduleElement.getFirstChildWithName(new QName(TAG_FLOW_OUT));
if (outFlow != null) {
module.setOutFlow(processFlow(outFlow, module));
}
- OMElement inFaultFlow = moduleElement.getFirstChildWithName(new QName(IN_FAILTFLOW));
+ OMElement inFaultFlow = moduleElement.getFirstChildWithName(new QName(TAG_FLOW_IN_FAULT));
if (inFaultFlow != null) {
module.setFaultInFlow(processFlow(inFaultFlow, module));
}
- OMElement outFaultFlow = moduleElement.getFirstChildWithName(new QName(OUT_FAILTFLOW));
+ OMElement outFaultFlow = moduleElement.getFirstChildWithName(new QName(TAG_FLOW_OUT_FAULT));
if (outFaultFlow != null) {
module.setFaultOutFlow(processFlow(outFaultFlow, module));
}
// processing Operations
- Iterator op_itr = moduleElement.getChildrenWithName(new QName(OPRATIONST));
+ Iterator op_itr = moduleElement.getChildrenWithName(new QName(TAG_OPERATION));
ArrayList operations = processOperations(op_itr);
for (int i = 0; i < operations.size(); i++) {
@@ -143,7 +143,7 @@
OMElement operation = (OMElement) operationsIterator.next();
// /getting operation name
- OMAttribute op_name_att = operation.getAttribute(new QName(ATTNAME));
+ OMAttribute op_name_att = operation.getAttribute(new QName(ATTRIBUTE_NAME));
if (op_name_att == null) {
throw new DeploymentException(
@@ -152,7 +152,7 @@
DeploymentErrorMsgs.INVALID_OP, "operation name missing")));
}
- OMAttribute op_mep_att = operation.getAttribute(new QName(MEP));
+ OMAttribute op_mep_att = operation.getAttribute(new QName(TAG_MEP));
String mepURL = null;
AxisOperation op_descrip;
@@ -181,14 +181,14 @@
op_descrip.setName(new QName(opname));
// Operation Parameters
- Iterator parameters = operation.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = operation.getChildrenWithName(new QName(TAG_PARAMETER));
ArrayList wsamapping = processParameters(parameters, op_descrip, module);
op_descrip.setWsamappingList(wsamapping);
// setting the mep of the operation
// loading the message recivers
- OMElement receiverElement = operation.getFirstChildWithName(new QName(MESSAGERECEIVER));
+ OMElement receiverElement = operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
if (receiverElement != null) {
MessageReceiver messageReceiver =
@@ -204,7 +204,7 @@
}
// Process Module Refs
- Iterator modules = operation.getChildrenWithName(new QName(MODULEST));
+ Iterator modules = operation.getChildrenWithName(new QName(TAG_MODULE));
processOperationModuleRefs(modules, op_descrip);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Sun Dec 18 21:55:00 2005
@@ -67,13 +67,13 @@
try {
// Processing service level parameters
- Iterator itr = service_element.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = service_element.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, service, service.getParent());
// process service description
OMElement descriptionElement =
- service_element.getFirstChildWithName(new QName(DESCRIPTION));
+ service_element.getFirstChildWithName(new QName(TAG_DESCRIPTION));
if (descriptionElement != null) {
OMElement descriptionValue = descriptionElement.getFirstElement();
@@ -89,7 +89,7 @@
service.setAxisServiceName(descriptionElement.getText());
}
} else {
- OMAttribute serviceNameatt = service_element.getAttribute(new QName(ATTNAME));
+ OMAttribute serviceNameatt = service_element.getAttribute(new QName(ATTRIBUTE_NAME));
if (serviceNameatt != null) {
service.setAxisServiceName(serviceNameatt.getAttributeValue());
@@ -97,13 +97,13 @@
}
// processing servicewide modules which required to engage gloabally
- Iterator moduleRefs = service_element.getChildrenWithName(new QName(MODULEST));
+ Iterator moduleRefs = service_element.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs);
// processing operations
Iterator operationsIterator =
- service_element.getChildrenWithName(new QName(OPRATIONST));
+ service_element.getChildrenWithName(new QName(TAG_OPERATION));
ArrayList ops = processOperations(operationsIterator);
for (int i = 0; i < ops.size(); i++) {
@@ -119,7 +119,7 @@
service.addOperation(operationDesc);
}
- Iterator moduleConfigs = service_element.getChildrenWithName(new QName(MODULECONFIG));
+ Iterator moduleConfigs = service_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, service, service);
} catch (XMLStreamException e) {
@@ -137,14 +137,14 @@
throws DeploymentException {
while (messages.hasNext()) {
OMElement messageElement = (OMElement) messages.next();
- OMAttribute lable = messageElement.getAttribute(new QName(LABEL));
+ OMAttribute lable = messageElement.getAttribute(new QName(TAG_LABEL));
if (lable == null) {
throw new DeploymentException("message lebel can not be null");
}
AxisMessage message = new AxisMessage();
- Iterator parameters = messageElement.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = messageElement.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, message, operation);
operation.addMessage(message, lable.getAttributeValue().trim());
@@ -161,7 +161,7 @@
try {
while (moduleRefs.hasNext()) {
OMElement moduleref = (OMElement) moduleRefs.next();
- OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(REF));
+ OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE));
if (moduleRefAttribute != null) {
String refName = moduleRefAttribute.getAttributeValue();
@@ -184,7 +184,7 @@
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
- OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTNAME));
+ OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTRIBUTE_NAME));
if (moduleName_att == null) {
throw new DeploymentException(
@@ -193,7 +193,7 @@
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
new ModuleConfiguration(new QName(module), parent);
- Iterator parameters = moduleConfig.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
operation.addModuleConfig(moduleConfiguration);
@@ -208,7 +208,7 @@
OMElement operation = (OMElement) operationsIterator.next();
// /getting operation name
- OMAttribute op_name_att = operation.getAttribute(new QName(ATTNAME));
+ OMAttribute op_name_att = operation.getAttribute(new QName(ATTRIBUTE_NAME));
if (op_name_att == null) {
throw new DeploymentException(
@@ -218,7 +218,7 @@
}
// setting the mep of the operation
- OMAttribute op_mep_att = operation.getAttribute(new QName(MEP));
+ OMAttribute op_mep_att = operation.getAttribute(new QName(TAG_MEP));
String mepurl = null;
if (op_mep_att != null) {
@@ -241,13 +241,13 @@
log.info(Messages.getMessage(DeploymentErrorMsgs.OP_NOT_FOUN_IN_WSDL, opname));
// Operation Parameters
- Iterator parameters = operation.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = operation.getChildrenWithName(new QName(TAG_PARAMETER));
ArrayList wsamappings = processParameters(parameters, op_descrip, service);
op_descrip.setWsamappingList(wsamappings);
// loading the message receivers
- OMElement receiverElement = operation.getFirstChildWithName(new QName(MESSAGERECEIVER));
+ OMElement receiverElement = operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
if (receiverElement != null) {
MessageReceiver messageReceiver = loadMessageReceiver(service.getClassLoader(),
@@ -263,12 +263,12 @@
}
// Process Module Refs
- Iterator modules = operation.getChildrenWithName(new QName(MODULEST));
+ Iterator modules = operation.getChildrenWithName(new QName(TAG_MODULE));
processOperationModuleRefs(modules, op_descrip);
// processing Messages
- Iterator messages = operation.getChildrenWithName(new QName(MESSGES));
+ Iterator messages = operation.getChildrenWithName(new QName(TAG_MESSAGE));
processMessages(messages, op_descrip);
@@ -279,7 +279,7 @@
info.setOperationPhases(op_descrip);
}
- Iterator moduleConfigs = operation.getChildrenWithName(new QName(MODULECONFIG));
+ Iterator moduleConfigs = operation.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processOperationModuleConfig(moduleConfigs, op_descrip, op_descrip);
@@ -295,7 +295,7 @@
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
- OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTNAME));
+ OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTRIBUTE_NAME));
if (moduleName_att == null) {
throw new DeploymentException(
@@ -304,7 +304,7 @@
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
new ModuleConfiguration(new QName(module), parent);
- Iterator parameters = moduleConfig.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
service.addModuleConfig(moduleConfiguration);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Sun Dec 18 21:55:00 2005
@@ -52,25 +52,25 @@
try {
// Processing service level parameters
- Iterator itr = servcice.getChildrenWithName(new QName(PARAMETER));
+ Iterator itr = servcice.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(itr, axisServiceGroup, axisServiceGroup.getParent());
- Iterator moduleConfigs = servcice.getChildrenWithName(new QName(MODULECONFIG));
+ Iterator moduleConfigs = servcice.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
axisServiceGroup);
// processing servicewide modules which required to engage gloabally
- Iterator moduleRefs = servcice.getChildrenWithName(new QName(MODULEST));
+ Iterator moduleRefs = servcice.getChildrenWithName(new QName(TAG_MODULE));
processModuleRefs(moduleRefs, axisServiceGroup);
- Iterator serviceitr = servcice.getChildrenWithName(new QName(SERVICE_ELEMENT));
+ Iterator serviceitr = servcice.getChildrenWithName(new QName(TAG_SERVICE));
while (serviceitr.hasNext()) {
OMElement service = (OMElement) serviceitr.next();
- OMAttribute serviceNameatt = service.getAttribute(new QName(ATTNAME));
+ OMAttribute serviceNameatt = service.getAttribute(new QName(ATTRIBUTE_NAME));
String serviceName = serviceNameatt.getAttributeValue();
if (serviceName == null) {
@@ -111,7 +111,7 @@
try {
while (moduleRefs.hasNext()) {
OMElement moduleref = (OMElement) moduleRefs.next();
- OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(REF));
+ OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE));
if (moduleRefAttribute != null) {
String refName = moduleRefAttribute.getAttributeValue();
@@ -134,7 +134,7 @@
throws DeploymentException {
while (moduleConfigs.hasNext()) {
OMElement moduleConfig = (OMElement) moduleConfigs.next();
- OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTNAME));
+ OMAttribute moduleName_att = moduleConfig.getAttribute(new QName(ATTRIBUTE_NAME));
if (moduleName_att == null) {
throw new DeploymentException(
@@ -143,7 +143,7 @@
String module = moduleName_att.getAttributeValue();
ModuleConfiguration moduleConfiguration =
new ModuleConfiguration(new QName(module), parent);
- Iterator parameters = moduleConfig.getChildrenWithName(new QName(PARAMETER));
+ Iterator parameters = moduleConfig.getChildrenWithName(new QName(TAG_PARAMETER));
processParameters(parameters, moduleConfiguration, parent);
axisService.addModuleConfig(moduleConfiguration);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java Sun Dec 18 21:55:00 2005
@@ -71,14 +71,14 @@
if (!file.isDirectory()) {
if (ArchiveFileData.isModuleArchiveFile(file.getName())) {
- wsInfoList.addWSInfoItem(file, MODULE);
+ wsInfoList.addWSInfoItem(file, TYPE_MODULE);
}
} else {
if ("lib".equals(file.getName()) || "Lib".equals(file.getName())) {
// this is a lib file no need to take this as a sevice
} else {
- wsInfoList.addWSInfoItem(file, MODULE);
+ wsInfoList.addWSInfoItem(file, TYPE_MODULE);
}
}
}
@@ -122,14 +122,14 @@
if (!file.isDirectory()) {
if (ArchiveFileData.isServiceArchiveFile(file.getName())) {
- wsInfoList.addWSInfoItem(file, SERVICE);
+ wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
}
} else {
if ("lib".equals(file.getName()) || "Lib".equals(file.getName())) {
// this is a lib file no need to take this as a sevice
} else {
- wsInfoList.addWSInfoItem(file, SERVICE);
+ wsInfoList.addWSInfoItem(file, TYPE_SERVICE);
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Sun Dec 18 21:55:00 2005
@@ -74,7 +74,7 @@
rootelementName = services.getLocalName();
- if (SERVICE_ELEMENT.equals(rootelementName)) {
+ if (TAG_SERVICE.equals(rootelementName)) {
AxisService axisService = (AxisService) wsdlServices.get(
DescriptionBuilder.getShortFileName(
engine.getCurrentFileItem().getName()));
@@ -94,7 +94,7 @@
serviceList.add(service);
return serviceList;
- } else if (SERVICE_GROUP_ELEMENT.equals(rootelementName)) {
+ } else if (TAG_SERVICE_GROUP.equals(rootelementName)) {
ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(services, wsdlServices,
axisConfig);
return groupBuilder.populateServiceGroup(axisServiceGroup);
@@ -208,7 +208,7 @@
ZipEntry entry;
while ((entry = zin.getNextEntry()) != null) {
- if (entry.getName().equals(SERVICEXML)) {
+ if (entry.getName().equals(SERVICES_XML)) {
axisServiceGroup.setServiceGroupName(
DescriptionBuilder.getShortFileName(
engine.getCurrentFileItem().getName()));
@@ -222,7 +222,7 @@
throw new DeploymentException(e);
}
} else {
- File file = new File(filename, SERVICEXML);
+ File file = new File(filename, SERVICES_XML);
if (file.exists()) {
InputStream in;
@@ -387,7 +387,7 @@
ZipEntry entry;
while ((entry = zin.getNextEntry()) != null) {
- if (entry.getName().equals(MODULEXML)) {
+ if (entry.getName().equals(MODULE_XML)) {
foundmoduleXML = true;
ModuleBuilder builder = new ModuleBuilder(zin, module, axisConfig);
@@ -414,7 +414,7 @@
throw new DeploymentException(e);
}
} else {
- File file = new File(filename, MODULEXML);
+ File file = new File(filename, MODULE_XML);
if (file.exists()) {
InputStream in;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Sun Dec 18 21:55:00 2005
@@ -64,13 +64,13 @@
*/
public void addWSInfoItem(File file, int type) {
switch (type) {
- case SERVICE : {
+ case TYPE_SERVICE : {
if (!isFileExist(file.getName())) { // checking whether the file is already deployed
- WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), SERVICE);
+ WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), TYPE_SERVICE);
jarList.add(wsInfo);
- ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(file, TYPE_SERVICE);
deployer.addWSToDeploy(archiveFileData); // inform that new web service is deployed
} else {
@@ -81,11 +81,11 @@
tempWSInfo.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(),
- tempWSInfo.getLastModifiedDate(), SERVICE);
+ tempWSInfo.getLastModifiedDate(), TYPE_SERVICE);
deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list
- ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(file, TYPE_SERVICE);
deployer.addWSToDeploy(archiveFileData); // add entry to deploylist
}
@@ -95,13 +95,13 @@
break;
}
- case MODULE : {
+ case TYPE_MODULE : {
if (!isFileExist(file.getName())) { // checking whether the file is already deployed
- WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), MODULE);
+ WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), TYPE_MODULE);
jarList.add(wsInfo);
- ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(file, TYPE_MODULE);
deployer.addWSToDeploy(archiveFileData); // inform that new web service is deployed
}
@@ -142,7 +142,7 @@
while (iter.hasNext()) {
WSInfo fileitem = (WSInfo) iter.next();
- if (fileitem.getType() == MODULE) {
+ if (fileitem.getType() == TYPE_MODULE) {
continue;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=357644&r1=357643&r2=357644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java Sun Dec 18 21:55:00 2005
@@ -65,7 +65,7 @@
*/
public void deserializeParameters(OMElement parameters) throws AxisFault {
Iterator iterator =
- parameters.getChildrenWithName(new QName(DeploymentConstants.PARAMETER));
+ parameters.getChildrenWithName(new QName(DeploymentConstants.TAG_PARAMETER));
while (iterator.hasNext()) {
@@ -78,7 +78,7 @@
// setting parameter Name
OMAttribute paraName =
- parameterElement.getAttribute(new QName(DeploymentConstants.ATTNAME));
+ parameterElement.getAttribute(new QName(DeploymentConstants.ATTRIBUTE_NAME));
parameter.setName(paraName.getAttributeValue());
@@ -97,7 +97,7 @@
// setting locking attribute
OMAttribute paraLocked =
- parameterElement.getAttribute(new QName(DeploymentConstants.ATTLOCKED));
+ parameterElement.getAttribute(new QName(DeploymentConstants.ATTRIBUTE_LOCKED));
if (paraLocked != null) {
String lockedValue = paraLocked.getAttributeValue();