You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/04 19:17:07 UTC
svn commit: r514453 [7/26] - in
/webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/client/
src/org/apache/axis2/c...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java Sun Mar 4 10:16:54 2007
@@ -31,6 +31,7 @@
*
*
*/
+
public class ModuleDeployer implements Deployer {
private static final Log log = LogFactory.getLog(ModuleDeployer.class);
@@ -57,37 +58,37 @@
boolean explodedDir = deploymentFileData.getFile().isDirectory();
try {
deploymentFileData.setClassLoader(explodedDir,
- axisConfig.getModuleClassLoader());
+ axisConfig.getModuleClassLoader());
AxisModule metaData = new AxisModule();
metaData.setModuleClassLoader(deploymentFileData.getClassLoader());
metaData.setParent(axisConfig);
archiveReader.readModuleArchive(deploymentFileData, metaData, explodedDir,
- axisConfig);
+ axisConfig);
metaData.setFileName(deploymentFileData.getFile().toURL());
DeploymentEngine.addNewModule(metaData, axisConfig);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_MODULE,
- metaData.getName().getLocalPart()));
+ metaData.getName().getLocalPart()));
} catch (DeploymentException e) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- deploymentFileData.getName(),
- e.getMessage()),
- e);
+ deploymentFileData.getName(),
+ e.getMessage()),
+ e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
} catch (AxisFault axisFault) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- deploymentFileData.getName(),
- axisFault.getMessage()),
- axisFault);
+ deploymentFileData.getName(),
+ axisFault.getMessage()),
+ axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
} catch (MalformedURLException e) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- deploymentFileData.getName(),
- e.getMessage()),
- e);
+ deploymentFileData.getName(),
+ e.getMessage()),
+ e);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
moduleStatus = "Error:\n" + errorWriter.toString();
@@ -97,9 +98,9 @@
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_MODULE,
- deploymentFileData.getName(),
- t.getMessage()),
- t);
+ deploymentFileData.getName(),
+ t.getMessage()),
+ t);
}
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
t.printStackTrace(error_ptintWriter);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Sun Mar 4 10:16:54 2007
@@ -3,15 +3,15 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.deployment.util.Utils;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.util.Loader;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.ws.java2wsdl.AnnotationConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.java2wsdl.AnnotationConstants;
import org.codehaus.jam.JAnnotation;
import org.codehaus.jam.JClass;
import org.codehaus.jam.JamClassIterator;
@@ -19,7 +19,6 @@
import org.codehaus.jam.JamServiceFactory;
import org.codehaus.jam.JamServiceParams;
-import javax.xml.namespace.QName;
import java.io.File;
import java.io.FileInputStream;
import java.lang.reflect.Method;
@@ -47,6 +46,7 @@
*
*
*/
+
public class POJODeployer implements Deployer {
private static Log log = LogFactory.getLog(POJODeployer.class);
@@ -67,8 +67,11 @@
File file = deploymentFileData.getFile();
if (file != null) {
File parentFile = file.getParentFile();
- DeploymentClassLoader classLoader = new DeploymentClassLoader(new URL[]{parentFile.toURL()},
- configCtx.getAxisConfiguration().getSystemClassLoader(), true);
+ DeploymentClassLoader classLoader =
+ new DeploymentClassLoader(new URL[]{parentFile.toURL()},
+ configCtx
+ .getAxisConfiguration().getSystemClassLoader(),
+ true);
Thread.currentThread().setContextClassLoader(classLoader);
String className = file.getName();
className = className.replaceAll(".class", "");
@@ -89,7 +92,8 @@
* nothing will happen) 2. In the next stage for all the methods
* messages and port types will be creteated
*/
- JAnnotation annotation = jclass.getAnnotation(AnnotationConstants.WEB_SERVICE);
+ JAnnotation annotation =
+ jclass.getAnnotation(AnnotationConstants.WEB_SERVICE);
if (annotation != null) {
Class claxx = Class.forName(
"org.apache.axis2.jaxws.description.DescriptionFactory");
@@ -97,11 +101,12 @@
"createAxisService",
new Class[]{Class.class});
Class pojoClass = Loader.loadClass(classLoader, className);
- AxisService axisService = (AxisService)mthod.invoke(claxx, new Object[]{pojoClass});
+ AxisService axisService =
+ (AxisService) mthod.invoke(claxx, new Object[]{pojoClass});
Utils.fillAxisService(axisService,
- configCtx.getAxisConfiguration(),
- new ArrayList(),
- new ArrayList());
+ configCtx.getAxisConfiguration(),
+ new ArrayList(),
+ new ArrayList());
setMessageReceivers(axisService);
configCtx.getAxisConfiguration().addService(axisService);
} else {
@@ -121,8 +126,10 @@
WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT,
inOutmessageReceiver);
AxisService axisService = AxisService.createService(className,
- configCtx.getAxisConfiguration(),
- messageReciverMap, null, null, classLoader);
+ configCtx.getAxisConfiguration(),
+ messageReciverMap,
+ null, null,
+ classLoader);
configCtx.getAxisConfiguration().addService(axisService);
}
}
@@ -159,7 +166,8 @@
ArrayList axisServiceList = new ArrayList();
for (int i = 0; i < classList.size(); i++) {
String className = (String) classList.get(i);
- DeploymentClassLoader classLoader = new DeploymentClassLoader(new URL[]{deploymentFileData.getFile().toURL()},
+ DeploymentClassLoader classLoader = new DeploymentClassLoader(
+ new URL[]{deploymentFileData.getFile().toURL()},
configCtx.getAxisConfiguration().getSystemClassLoader(), true);
Thread.currentThread().setContextClassLoader(classLoader);
className = className.replaceAll(".class", "");
@@ -181,7 +189,8 @@
* nothing will happen) 2. In the next stage for all the methods
* messages and port types will be creteated
*/
- JAnnotation annotation = jclass.getAnnotation(AnnotationConstants.WEB_SERVICE);
+ JAnnotation annotation =
+ jclass.getAnnotation(AnnotationConstants.WEB_SERVICE);
if (annotation != null) {
Class claxx = Class.forName(
"org.apache.axis2.jaxws.description.DescriptionFactory");
@@ -189,11 +198,12 @@
"createAxisService",
new Class[]{Class.class});
Class pojoClass = Loader.loadClass(classLoader, className);
- AxisService axisService = (AxisService)mthod.invoke(claxx, new Object[]{pojoClass});
+ AxisService axisService =
+ (AxisService) mthod.invoke(claxx, new Object[]{pojoClass});
Utils.fillAxisService(axisService,
- configCtx.getAxisConfiguration(),
- new ArrayList(),
- new ArrayList());
+ configCtx.getAxisConfiguration(),
+ new ArrayList(),
+ new ArrayList());
setMessageReceivers(axisService);
axisServiceList.add(axisService);
}
@@ -219,33 +229,33 @@
public void setMessageReceivers(AxisService service) {
Iterator iterator = service.getOperations();
- while(iterator.hasNext()){
- AxisOperation operation = (AxisOperation) iterator.next();
- String MEP = operation.getMessageExchangePattern();
- if(MEP!=null){
- try {
- if(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_ONLY.equals(MEP)){
- Class inOnlyMessageReceiver = Loader.loadClass(
- "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver");
- MessageReceiver messageReceiver =
- (MessageReceiver) inOnlyMessageReceiver.newInstance();
- operation.setMessageReceiver(messageReceiver);
- } else {
- Class inoutMessageReceiver = Loader.loadClass(
- "org.apache.axis2.rpc.receivers.RPCMessageReceiver");
- MessageReceiver inOutmessageReceiver =
- (MessageReceiver) inoutMessageReceiver.newInstance();
- operation.setMessageReceiver(inOutmessageReceiver);
+ while (iterator.hasNext()) {
+ AxisOperation operation = (AxisOperation) iterator.next();
+ String MEP = operation.getMessageExchangePattern();
+ if (MEP != null) {
+ try {
+ if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(MEP)
+ || WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_ONLY.equals(MEP)) {
+ Class inOnlyMessageReceiver = Loader.loadClass(
+ "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver");
+ MessageReceiver messageReceiver =
+ (MessageReceiver) inOnlyMessageReceiver.newInstance();
+ operation.setMessageReceiver(messageReceiver);
+ } else {
+ Class inoutMessageReceiver = Loader.loadClass(
+ "org.apache.axis2.rpc.receivers.RPCMessageReceiver");
+ MessageReceiver inOutmessageReceiver =
+ (MessageReceiver) inoutMessageReceiver.newInstance();
+ operation.setMessageReceiver(inOutmessageReceiver);
+ }
+ } catch (ClassNotFoundException e) {
+ log.error(e);
+ } catch (InstantiationException e) {
+ log.error(e);
+ } catch (IllegalAccessException e) {
+ log.error(e);
}
- } catch (ClassNotFoundException e) {
- log.error(e);
- } catch (InstantiationException e) {
- log.error(e);
- } catch (IllegalAccessException e) {
- log.error(e);
}
- }
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Sun Mar 4 10:16:54 2007
@@ -17,17 +17,16 @@
package org.apache.axis2.deployment;
+import org.apache.axis2.deployment.repository.util.DeploymentFileData;
+import org.apache.axis2.deployment.repository.util.WSInfoList;
+import org.apache.axis2.util.Loader;
+
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
-
-import org.apache.axis2.deployment.repository.util.DeploymentFileData;
-import org.apache.axis2.deployment.repository.util.WSInfoList;
-import org.apache.axis2.util.Loader;
public class RepositoryListener implements DeploymentConstants {
@@ -130,8 +129,10 @@
if (path.length() >= 3 && path.charAt(0) == '/' && path.charAt(2) == ':') {
path = path.substring(1);
}
- java.io.File file = new java.io.File(URLDecoder.decode(urls[i].getPath()).replace('/',
- File.separatorChar).replace('|', ':'));
+ java.io.File file =
+ new java.io.File(URLDecoder.decode(urls[i].getPath()).replace('/',
+ File.separatorChar).replace(
+ '|', ':'));
if (file.isFile()) {
if (DeploymentFileData.isModuleArchiveFile(file.getName())) {
//adding modules in the class path
@@ -144,10 +145,10 @@
}
try {
- deploymentEngine.doDeploy();
- } catch (DeploymentException e) {
- // no need to do anything here, it has already been logged at the DeploymentEngine call
- }
+ deploymentEngine.doDeploy();
+ } catch (DeploymentException e) {
+ // no need to do anything here, it has already been logged at the DeploymentEngine call
+ }
}
/**
@@ -166,7 +167,8 @@
}
if (location.startsWith("file")) {
java.io.File file = new java.io.File(URLDecoder.decode(url.getPath()).replace('/',
- File.separatorChar).replace('|', ':'));
+ File.separatorChar).replace(
+ '|', ':'));
return file.getAbsolutePath();
} else {
return url.toString();
@@ -179,15 +181,15 @@
/**
* Finds a list of services in the folder and adds to wsInfoList.
*/
- public void checkServices() {
+ public void checkServices() {
findServicesInDirectory();
loadOtherDirectories();
-
+
try {
- update();
- } catch (DeploymentException e) {
- // no need to log anything here, it has been logged at DeploymentEngine
- }
+ update();
+ } catch (DeploymentException e) {
+ // no need to log anything here, it has been logged at DeploymentEngine
+ }
}
/**
@@ -199,28 +201,28 @@
checkModules();
directoryToExtensionMappingMap = deploymentEngine.getDirectoryToExtensionMappingMap();
try {
- deploymentEngine.doDeploy();
- } catch (DeploymentException e) {
- // no need to do anything here, it has already been logged
- }
+ deploymentEngine.doDeploy();
+ } catch (DeploymentException e) {
+ // no need to do anything here, it has already been logged
+ }
}
//This will load the files from the directories
// specified by axis2.xml (As <deployer>)
- private void loadOtherDirectories(){
- if(directoryToExtensionMappingMap.size()>0){
- Iterator keys = directoryToExtensionMappingMap.keySet().iterator();
- while (keys.hasNext()) {
- String s = (String) keys.next();
- findFileForGivenDirectory(s,(String)directoryToExtensionMappingMap.get(s));
- }
- }
+ private void loadOtherDirectories() {
+ if (directoryToExtensionMappingMap.size() > 0) {
+ Iterator keys = directoryToExtensionMappingMap.keySet().iterator();
+ while (keys.hasNext()) {
+ String s = (String) keys.next();
+ findFileForGivenDirectory(s, (String) directoryToExtensionMappingMap.get(s));
+ }
+ }
}
- private void findFileForGivenDirectory(String dir , String extension){
+ private void findFileForGivenDirectory(String dir, String extension) {
try {
- File fileTobeSearch = new File(deploymentEngine.getRepositoryDir(),dir);
- if(fileTobeSearch.exists()){
+ File fileTobeSearch = new File(deploymentEngine.getRepositoryDir(), dir);
+ if (fileTobeSearch.exists()) {
File[] files = fileTobeSearch.listFiles();
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
@@ -228,9 +230,9 @@
if (isSourceControlDir(file)) {
continue;
}
- if (!file.isDirectory()&&DeploymentFileData.getFileExtension(
+ if (!file.isDirectory() && DeploymentFileData.getFileExtension(
file.getName()).equals(extension)) {
- wsInfoList.addWSInfoItem(file,extension);
+ wsInfoList.addWSInfoItem(file, extension);
}
}
}
@@ -274,12 +276,12 @@
public void startListener() {
checkServices();
loadOtherDirectories();
-
+
try {
- update();
- } catch (DeploymentException e) {
- // no need to log the exception once again
- }
+ update();
+ } catch (DeploymentException e) {
+ // no need to log the exception once again
+ }
}
/**
@@ -288,11 +290,11 @@
public void update() throws DeploymentException {
wsInfoList.update();
}
-
+
public void updateRemote() throws Exception {
-
- findServicesInDirectory();
- update();
+
+ findServicesInDirectory();
+ update();
}
-
+
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Sun Mar 4 10:16:54 2007
@@ -96,7 +96,8 @@
service.setServiceDescription(descriptionElement.getText());
}
} else {
- OMAttribute serviceNameatt = service_element.getAttribute(new QName(ATTRIBUTE_NAME));
+ OMAttribute serviceNameatt =
+ service_element.getAttribute(new QName(ATTRIBUTE_NAME));
if (serviceNameatt != null) {
if (!"".equals(serviceNameatt.getAttributeValue().trim())) {
@@ -123,7 +124,8 @@
}
// Process WS-Addressing flag attribute
- OMAttribute addressingRequiredatt = service_element.getAttribute(new QName(ATTRIBUTE_WSADDRESSING));
+ OMAttribute addressingRequiredatt =
+ service_element.getAttribute(new QName(ATTRIBUTE_WSADDRESSING));
if (addressingRequiredatt != null) {
String addressingRequiredString = addressingRequiredatt.getAttributeValue();
service.setWSAddressingFlag(addressingRequiredString);
@@ -190,7 +192,7 @@
String packageAttributeValue = packageAttribute.getAttributeValue();
if (namespaceAttributeValue != null && packageAttributeValue != null) {
pkg2nsMap.put(packageAttributeValue.trim(),
- namespaceAttributeValue.trim());
+ namespaceAttributeValue.trim());
} else {
log.warn(
"Either value of @namespce or @packagename not available. Thus, generated will be selected.");
@@ -251,7 +253,7 @@
if (policyRefElements != null && policyRefElements.hasNext()) {
processPolicyRefElements(PolicyInclude.AXIS_SERVICE_POLICY,
- policyRefElements, service.getPolicyInclude());
+ policyRefElements, service.getPolicyInclude());
}
//processing service scope
@@ -306,7 +308,7 @@
if (objectSupplierValue != null) {
loadObjectSupplierClass(objectSupplierValue);
}
- // Set the default message receiver for the operations that were
+ // Set the default message receiver for the operations that were
// not listed in the services.xml
setDefaultMessageReceivers();
if (!service.isUseUserWSDL()) {
@@ -315,10 +317,11 @@
//trying to generate WSDL for the service using JAM and Java reflection
try {
if (generateWsdl(service)) {
- Utils.fillAxisService(service, axisConfig, excludeops,null);
+ Utils.fillAxisService(service, axisConfig, excludeops, null);
} else {
ArrayList nonRpcOperations = getNonPRCMethods(service);
- Utils.fillAxisService(service, axisConfig, excludeops, nonRpcOperations);
+ Utils.fillAxisService(service, axisConfig, excludeops,
+ nonRpcOperations);
}
} catch (Exception e) {
throw new DeploymentException(
@@ -341,22 +344,25 @@
// Need to call the same logic towice
setDefaultMessageReceivers();
- Iterator moduleConfigs = service_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
+ Iterator moduleConfigs =
+ service_element.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, service, service);
-
+
// Loading Data Locator(s) configured
OMElement dataLocatorElement =
- service_element.getFirstChildWithName(new QName(DRConstants.DATA_LOCATOR_ELEMENT));
+ service_element
+ .getFirstChildWithName(new QName(DRConstants.DATA_LOCATOR_ELEMENT));
if (dataLocatorElement != null) {
processDataLocatorConfig(dataLocatorElement, service);
- }
-
+ }
+
} catch (XMLStreamException e) {
throw new DeploymentException(e);
} catch (AxisFault axisFault) {
throw new DeploymentException(
Messages.getMessage(
- DeploymentErrorMsgs.OPERATION_PROCESS_ERROR, axisFault.getMessage()), axisFault);
+ DeploymentErrorMsgs.OPERATION_PROCESS_ERROR, axisFault.getMessage()),
+ axisFault);
}
return service;
}
@@ -412,7 +418,7 @@
String key = (String) keys.next();
if (qName.equals(service.getNameSpacesMap().get(key))) {
typeTable.addComplexSchema(packageName,
- new QName(qName, packageName, key));
+ new QName(qName, packageName, key));
}
}
}
@@ -424,7 +430,8 @@
try {
ClassLoader loader = service.getClassLoader();
Class serviceLifeCycleClassImpl = Loader.loadClass(loader, className);
- ServiceLifeCycle serviceLifeCycle = (ServiceLifeCycle) serviceLifeCycleClassImpl.newInstance();
+ ServiceLifeCycle serviceLifeCycle =
+ (ServiceLifeCycle) serviceLifeCycleClassImpl.newInstance();
serviceLifeCycle.startUp(configCtx, service);
service.setServiceLifeCycle(
serviceLifeCycle);
@@ -441,11 +448,11 @@
while (operatins.hasNext()) {
AxisOperation axisOperation = (AxisOperation) operatins
.next();
-
+
if (axisOperation.isControlOperation()) {
continue;
}
-
+
if (axisOperation.getMessageReceiver() == null) {
continue;
}
@@ -534,17 +541,21 @@
Iterator parameters = messageElement.getChildrenWithName(new QName(TAG_PARAMETER));
// processing <wsp:Policy> .. </..> elements
- Iterator policyElements = messageElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
+ Iterator policyElements =
+ messageElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
if (policyElements != null) {
- processPolicyElements(PolicyInclude.AXIS_MESSAGE_POLICY, policyElements, message.getPolicyInclude());
+ processPolicyElements(PolicyInclude.AXIS_MESSAGE_POLICY, policyElements,
+ message.getPolicyInclude());
}
// processing <wsp:PolicyReference> .. </..> elements
- Iterator policyRefElements = messageElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
+ Iterator policyRefElements =
+ messageElement.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
if (policyRefElements != null) {
- processPolicyRefElements(PolicyInclude.AXIS_MESSAGE_POLICY, policyRefElements, message.getPolicyInclude());
+ processPolicyRefElements(PolicyInclude.AXIS_MESSAGE_POLICY, policyRefElements,
+ message.getPolicyInclude());
}
processParameters(parameters, message, operation);
@@ -666,17 +677,21 @@
// setting the PolicyInclude
// processing <wsp:Policy> .. </..> elements
- Iterator policyElements = operation.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
+ Iterator policyElements =
+ operation.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY));
if (policyElements != null && policyElements.hasNext()) {
- processPolicyElements(PolicyInclude.AXIS_OPERATION_POLICY, policyElements, op_descrip.getPolicyInclude());
+ processPolicyElements(PolicyInclude.AXIS_OPERATION_POLICY, policyElements,
+ op_descrip.getPolicyInclude());
}
// processing <wsp:PolicyReference> .. </..> elements
- Iterator policyRefElements = operation.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
+ Iterator policyRefElements =
+ operation.getChildrenWithName(new QName(POLICY_NS_URI, TAG_POLICY_REF));
if (policyRefElements != null && policyRefElements.hasNext()) {
- processPolicyRefElements(PolicyInclude.AXIS_OPERATION_POLICY, policyRefElements, op_descrip.getPolicyInclude());
+ processPolicyRefElements(PolicyInclude.AXIS_OPERATION_POLICY, policyRefElements,
+ op_descrip.getPolicyInclude());
}
// Operation Parameters
@@ -686,11 +701,12 @@
processActionMappings(operation, op_descrip);
// loading the message receivers
- OMElement receiverElement = operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
+ OMElement receiverElement =
+ operation.getFirstChildWithName(new QName(TAG_MESSAGE_RECEIVER));
if (receiverElement != null) {
MessageReceiver messageReceiver = loadMessageReceiver(service.getClassLoader(),
- receiverElement);
+ receiverElement);
op_descrip.setMessageReceiver(messageReceiver);
} else {
@@ -748,26 +764,30 @@
}
}
-
-
+
/*
- * process data locator configuration for data retrieval.
- */
+ * process data locator configuration for data retrieval.
+ */
private void processDataLocatorConfig(OMElement dataLocatorElement, AxisService service) {
- OMAttribute serviceOverallDataLocatorclass = dataLocatorElement.getAttribute(new QName(DRConstants.CLASS_ATTRIBUTE));
- if (serviceOverallDataLocatorclass != null){
+ OMAttribute serviceOverallDataLocatorclass =
+ dataLocatorElement.getAttribute(new QName(DRConstants.CLASS_ATTRIBUTE));
+ if (serviceOverallDataLocatorclass != null) {
String className = serviceOverallDataLocatorclass.getAttributeValue();
service.addDataLocatorClassNames(DRConstants.SERVICE_LEVEL, className);
}
- Iterator iterator = dataLocatorElement.getChildrenWithName(new QName(DRConstants.DIALECT_LOCATOR_ELEMENT));
-
+ Iterator iterator = dataLocatorElement
+ .getChildrenWithName(new QName(DRConstants.DIALECT_LOCATOR_ELEMENT));
+
while (iterator.hasNext()) {
OMElement locatorElement = (OMElement) iterator.next();
- OMAttribute dialect = locatorElement.getAttribute(new QName(DRConstants.DIALECT_ATTRIBUTE));
- OMAttribute dialectclass = locatorElement.getAttribute(new QName(DRConstants.CLASS_ATTRIBUTE));
- service.addDataLocatorClassNames(dialect.getAttributeValue(), dialectclass.getAttributeValue());
-
- }
+ OMAttribute dialect =
+ locatorElement.getAttribute(new QName(DRConstants.DIALECT_ATTRIBUTE));
+ OMAttribute dialectclass =
+ locatorElement.getAttribute(new QName(DRConstants.CLASS_ATTRIBUTE));
+ service.addDataLocatorClassNames(dialect.getAttributeValue(),
+ dialectclass.getAttributeValue());
+
+ }
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Sun Mar 4 10:16:54 2007
@@ -35,6 +35,7 @@
*
*
*/
+
public class ServiceDeployer implements Deployer {
private static final Log log = LogFactory.getLog(ServiceDeployer.class);
private AxisConfiguration axisConfig;
@@ -56,7 +57,7 @@
String serviceStatus = "";
try {
deploymentFileData.setClassLoader(explodedDir,
- axisConfig.getServiceClassLoader());
+ axisConfig.getServiceClassLoader());
HashMap wsdlservice = archiveReader.processWSDLs(deploymentFileData);
if (wsdlservice != null && wsdlservice.size() > 0) {
Iterator services = wsdlservice.values().iterator();
@@ -77,35 +78,35 @@
sericeGroup, explodedDir, wsdlservice,
configCtx);
DeploymentEngine.addServiceGroup(sericeGroup,
- serviceList,
- deploymentFileData.getFile().toURL(),
- deploymentFileData,
- axisConfig);
+ serviceList,
+ deploymentFileData.getFile().toURL(),
+ deploymentFileData,
+ axisConfig);
log.info(Messages.getMessage(DeploymentErrorMsgs.DEPLOYING_WS,
- deploymentFileData.getName()));
+ deploymentFileData.getName()));
} catch (DeploymentException de) {
de.printStackTrace();
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
- deploymentFileData.getName(),
- de.getMessage()),
- de);
+ deploymentFileData.getName(),
+ de.getMessage()),
+ de);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
de.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
- throw de;
-
+ throw de;
+
} catch (AxisFault axisFault) {
log.error(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
- deploymentFileData.getName(),
- axisFault.getMessage()),
- axisFault);
+ deploymentFileData.getName(),
+ axisFault.getMessage()),
+ axisFault);
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
axisFault.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
-
+
throw new DeploymentException(axisFault);
-
+
} catch (Exception e) {
if (log.isInfoEnabled()) {
StringWriter sw = new StringWriter();
@@ -119,9 +120,9 @@
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
e.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
-
+
throw new DeploymentException(e);
-
+
} catch (Throwable t) {
if (log.isInfoEnabled()) {
StringWriter sw = new StringWriter();
@@ -135,13 +136,13 @@
PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
t.printStackTrace(error_ptintWriter);
serviceStatus = "Error:\n" + errorWriter.toString();
-
+
throw new DeploymentException(new Exception(t));
-
+
} finally {
if (serviceStatus.startsWith("Error:")) {
axisConfig.getFaultyServices().put(deploymentFileData.getFile().getAbsolutePath(),
- serviceStatus);
+ serviceStatus);
}
}
}
@@ -158,11 +159,11 @@
AxisServiceGroup serviceGroup = axisConfig.removeServiceGroup(fileName);
configCtx.removeServiceGroupContext(serviceGroup);
log.info(Messages.getMessage(DeploymentErrorMsgs.SERVICE_REMOVED,
- fileName));
+ fileName));
} catch (AxisFault axisFault) {
//May be a faulty service
axisConfig.removeFaultyService(fileName);
-
+
throw new DeploymentException(axisFault);
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Sun Mar 4 10:16:54 2007
@@ -55,10 +55,11 @@
processParameters(itr, axisServiceGroup, axisServiceGroup.getParent());
- Iterator moduleConfigs = serviceElement.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
+ Iterator moduleConfigs =
+ serviceElement.getChildrenWithName(new QName(TAG_MODULE_CONFIG));
processServiceModuleConfig(moduleConfigs, axisServiceGroup.getParent(),
- axisServiceGroup);
+ axisServiceGroup);
// processing service-wide modules which required to engage globally
Iterator moduleRefs = serviceElement.getChildrenWithName(new QName(TAG_MODULE));
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/URLBasedAxisConfigurator.java Sun Mar 4 10:16:54 2007
@@ -45,7 +45,8 @@
try {
if (axis2xml == null) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- axis2xmlStream = cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+ axis2xmlStream =
+ cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
} else {
axis2xmlStream = axis2xml.openStream();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Sun Mar 4 10:16:54 2007
@@ -116,19 +116,22 @@
if (axis2Stream == null) {
// both the axis2.xml.path and axis2.xml.url init parameters were not present
// try to find the default /WEB-INF/conf/axis2.xml
- axis2Stream = config.getServletContext().getResourceAsStream("/WEB-INF/conf/axis2.xml");
+ axis2Stream = config.getServletContext()
+ .getResourceAsStream("/WEB-INF/conf/axis2.xml");
log.debug("trying to load axis2.xml from module: /WEB-INF/conf/axis2.xml");
}
} // try
catch (Exception e) {
log.error(e, e);
- log.warn("Using default configuration: " + DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+ log.warn("Using default configuration: " + DeploymentConstants
+ .AXIS2_CONFIGURATION_RESOURCE);
// not there, use default configuration from class path resource.
} // catch
if (axis2Stream == null) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- axis2Stream = cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
+ axis2Stream =
+ cl.getResourceAsStream(DeploymentConstants.AXIS2_CONFIGURATION_RESOURCE);
}
axisConfig = populateAxisConfiguration(axis2Stream);
@@ -287,13 +290,15 @@
HashMap wsdlServices = new HashMap();
ArchiveReader archiveReader = new ArchiveReader();
String path = config.getServletContext().getRealPath("/WEB-INF");
- if(path != null){
- archiveReader.processFilesInFolder(new File(path),wsdlServices);
+ if (path != null) {
+ archiveReader.processFilesInFolder(new File(path), wsdlServices);
}
AxisServiceGroup serviceGroup = DeploymentEngine.buildServiceGroup(servicexml,
- Thread.currentThread().getContextClassLoader(),
- "annonServiceGroup", configContext,
- archiveReader, wsdlServices);
+ Thread.currentThread().getContextClassLoader(),
+ "annonServiceGroup",
+ configContext,
+ archiveReader,
+ wsdlServices);
axisConfig.addServiceGroup(serviceGroup);
}
} catch (AxisFault axisFault) {
@@ -309,7 +314,7 @@
super.setConfigContext(configContext);
// setting ServletContext into configctx
configContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT,
- config.getServletContext());
+ config.getServletContext());
// setting ServletContext into configctx
configContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT,
config.getServletContext());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Sun Mar 4 10:16:54 2007
@@ -100,7 +100,7 @@
return serviceList;
} else if (TAG_SERVICE_GROUP.equals(elementName)) {
ServiceGroupBuilder groupBuilder = new ServiceGroupBuilder(rootElement, wsdlServices,
- configCtx);
+ configCtx);
return groupBuilder.populateServiceGroup(axisServiceGroup);
}
throw new AxisFault("Invalid services.xml found");
@@ -135,7 +135,8 @@
if (entry.getName().equalsIgnoreCase(SERVICES_XML)) {
axisServiceGroup.setServiceGroupName(
DescriptionBuilder.getShortFileName(currentFile.getName()));
- return buildServiceGroup(zin, currentFile, axisServiceGroup, wsdls, configCtx);
+ return buildServiceGroup(zin, currentFile, axisServiceGroup, wsdls,
+ configCtx);
}
}
throw new DeploymentException(
@@ -172,10 +173,12 @@
return buildServiceGroup(in, currentFile, axisServiceGroup, wsdls, configCtx);
} catch (FileNotFoundException e) {
throw new DeploymentException(
- Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND, e.getMessage()));
+ Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND,
+ e.getMessage()));
} catch (XMLStreamException e) {
throw new DeploymentException(
- Messages.getMessage(DeploymentErrorMsgs.XML_STREAM_EXCEPTION, e.getMessage()));
+ Messages.getMessage(DeploymentErrorMsgs.XML_STREAM_EXCEPTION,
+ e.getMessage()));
} finally {
if (in != null) {
try {
@@ -199,8 +202,10 @@
* @return Returns AxisService.
* @throws DeploymentException
*/
- private AxisService processWSDLFile(WSDLToAxisServiceBuilder axisServiceBuilder, File serviceArchiveFile,
- boolean isArchive, InputStream in, String baseURI) throws DeploymentException {
+ private AxisService processWSDLFile(WSDLToAxisServiceBuilder axisServiceBuilder,
+ File serviceArchiveFile,
+ boolean isArchive, InputStream in, String baseURI)
+ throws DeploymentException {
try {
if (serviceArchiveFile != null && isArchive) {
@@ -213,7 +218,8 @@
} else if (axisServiceBuilder instanceof WSDL20ToAxisServiceBuilder) {
// trying to use the jar scheme as the base URI. I think this can be used to handle
// wsdl 1.1 as well without using a custome URI resolver. Need to look at it later.
- axisServiceBuilder.setBaseUri("jar:file:/"+ serviceArchiveFile.getAbsolutePath() + "!/" + baseURI);
+ axisServiceBuilder.setBaseUri(
+ "jar:file:/" + serviceArchiveFile.getAbsolutePath() + "!/" + baseURI);
}
} else {
if (serviceArchiveFile != null) {
@@ -224,7 +230,7 @@
return axisServiceBuilder.populateService();
} catch (AxisFault axisFault) {
log.info("Trouble processing wsdl file :" + axisFault.getMessage());
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(axisFault);
}
return null;
@@ -252,7 +258,8 @@
if (!metaInfFolder.exists()) {
throw new DeploymentException(
Messages.getMessage(
- DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
+ DeploymentErrorMsgs.META_INF_MISSING,
+ serviceFile.getName()));
}
}
@@ -299,21 +306,29 @@
// lets check the namespace of the root element and decide. But since we are
// using axiom (dude, you are becoming handy here :)), we will not build the
// whole thing.
- OMNamespace documentElementNS = ((OMElement)XMLUtils.toOM(in)).getNamespace();
+ OMNamespace documentElementNS =
+ ((OMElement) XMLUtils.toOM(in)).getNamespace();
if (documentElementNS != null) {
WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
- if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())) {
+ if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI
+ .equals(documentElementNS.getNamespaceURI())) {
// we have a WSDL 2.0 document here.
- wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(new ByteArrayInputStream(out.toByteArray()), null, null);
+ wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(
+ new ByteArrayInputStream(out.toByteArray()), null, null);
wsdlToAxisServiceBuilder.setBaseUri(entryName);
} else if (Constants.NS_URI_WSDL11.
equals(documentElementNS.getNamespaceURI())) {
- wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(new ByteArrayInputStream(out.toByteArray()), null, null);
+ wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(
+ new ByteArrayInputStream(out.toByteArray()), null, null);
} else {
new DeploymentException(Messages.getMessage("invalidWSDLFound"));
}
- AxisService service = processWSDLFile(wsdlToAxisServiceBuilder, serviceFile, true, new ByteArrayInputStream(out.toByteArray()), entry.getName());
- if(service != null) {
+ AxisService service = processWSDLFile(wsdlToAxisServiceBuilder,
+ serviceFile, true,
+ new ByteArrayInputStream(
+ out.toByteArray()),
+ entry.getName());
+ if (service != null) {
servicesMap.put(service.getName(), service);
}
}
@@ -340,8 +355,8 @@
return servicesMap;
}
- public AxisService getAxisServiceFromWsdl(InputStream in ,
- ClassLoader loader, String wsdlUrl) throws Exception{
+ public AxisService getAxisServiceFromWsdl(InputStream in,
+ ClassLoader loader, String wsdlUrl) throws Exception {
// ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
// now the question is which version of WSDL file this archive contains.
@@ -351,13 +366,17 @@
OMElement element = (OMElement) XMLUtils.toOM(in);
OMNamespace documentElementNS = element.getNamespace();
if (documentElementNS != null) {
- WSDL11ToAxisServiceBuilder wsdlToAxisServiceBuilder ;
+ WSDL11ToAxisServiceBuilder wsdlToAxisServiceBuilder;
ByteArrayOutputStream out = new ByteArrayOutputStream();
element.serialize(out);
if (Constants.NS_URI_WSDL11.
equals(documentElementNS.getNamespaceURI())) {
- wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(new ByteArrayInputStream(out.toByteArray()), null, null);
- wsdlToAxisServiceBuilder.setCustomWSLD4JResolver(new WarBasedWSDLLocator(wsdlUrl,loader,new ByteArrayInputStream(out.toByteArray())));
+ wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(
+ new ByteArrayInputStream(out.toByteArray()), null, null);
+ wsdlToAxisServiceBuilder.setCustomWSLD4JResolver(new WarBasedWSDLLocator(wsdlUrl,
+ loader,
+ new ByteArrayInputStream(
+ out.toByteArray())));
wsdlToAxisServiceBuilder.setCustomResolver(
new WarFileBasedURIResolver(loader));
return wsdlToAxisServiceBuilder.populateService();
@@ -368,7 +387,8 @@
return null;
}
- public void processFilesInFolder(File folder, HashMap servicesMap) throws FileNotFoundException, XMLStreamException, DeploymentException {
+ public void processFilesInFolder(File folder, HashMap servicesMap)
+ throws FileNotFoundException, XMLStreamException, DeploymentException {
File files[] = folder.listFiles();
for (int i = 0; i < files.length; i++) {
File file1 = files[i];
@@ -380,10 +400,11 @@
// lets check the namespace of the root element and decide. But since we are
// using axiom (dude, you are becoming handy here :)), we will not build the
// whole thing.
- OMNamespace documentElementNS = ((OMElement)XMLUtils.toOM(in)).getNamespace();
+ OMNamespace documentElementNS = ((OMElement) XMLUtils.toOM(in)).getNamespace();
if (documentElementNS != null) {
WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
- if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())) {
+ if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI
+ .equals(documentElementNS.getNamespaceURI())) {
// we have a WSDL 2.0 document here.
in2 = new FileInputStream(file1);
wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(in2, null, null);
@@ -396,7 +417,8 @@
}
FileInputStream in3 = new FileInputStream(file1);
- AxisService service = processWSDLFile(wsdlToAxisServiceBuilder, file1, false, in2, file1.toURI().toString());
+ AxisService service = processWSDLFile(wsdlToAxisServiceBuilder, file1, false,
+ in2, file1.toURI().toString());
try {
if (in2 != null) {
in2.close();
@@ -405,7 +427,7 @@
} catch (IOException e) {
log.info(e);
}
- if(service != null) {
+ if (service != null) {
servicesMap.put(service.getName(), service);
}
}
@@ -451,7 +473,8 @@
if (!moduleXMLFound) {
throw new DeploymentException(
Messages.getMessage(
- DeploymentErrorMsgs.MODULE_XML_MISSING, deploymentFile.getAbsolutePath()));
+ DeploymentErrorMsgs.MODULE_XML_MISSING,
+ deploymentFile.getAbsolutePath()));
}
} catch (Exception e) {
throw new DeploymentException(e);
@@ -459,7 +482,9 @@
} else {
File file = new File(deploymentFile.getAbsolutePath(), MODULE_XML);
- if (file.exists() || (file = new File(deploymentFile.getAbsolutePath(), MODULE_XML.toLowerCase())).exists()) {
+ if (file.exists() ||
+ (file = new File(deploymentFile.getAbsolutePath(), MODULE_XML.toLowerCase()))
+ .exists()) {
InputStream in = null;
try {
in = new FileInputStream(file);
@@ -472,7 +497,8 @@
builder.populateModule();
} catch (FileNotFoundException e) {
throw new DeploymentException(
- Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND, e.getMessage()));
+ Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND,
+ e.getMessage()));
} finally {
if (in != null) {
try {
@@ -485,7 +511,8 @@
} else {
throw new DeploymentException(
Messages.getMessage(
- DeploymentErrorMsgs.MODULE_XML_MISSING, deploymentFile.getAbsolutePath()));
+ DeploymentErrorMsgs.MODULE_XML_MISSING,
+ deploymentFile.getAbsolutePath()));
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java Sun Mar 4 10:16:54 2007
@@ -102,10 +102,11 @@
return ((filename.endsWith(".jar")) | (filename.endsWith(".aar")));
}
- public static String getFileExtension(String fileName){
+ public static String getFileExtension(String fileName) {
int index = fileName.lastIndexOf('.');
return fileName.substring(index);
}
+
public void setClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
}
@@ -118,7 +119,7 @@
try {
if (!file.exists()) {
throw new AxisFault(Messages.getMessage(DeploymentErrorMsgs.FILE_NOT_FOUND,
- file.getAbsolutePath()));
+ file.getAbsolutePath()));
}
urlsToLoadFrom = new URL[]{file.toURL()};
classLoader = new DeploymentClassLoader(urlsToLoadFrom, parent, lock);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Sun Mar 4 10:16:54 2007
@@ -17,15 +17,15 @@
package org.apache.axis2.deployment.repository.util;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.deployment.DeploymentEngine;
+import org.apache.axis2.deployment.DeploymentException;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.deployment.DeploymentEngine;
-import org.apache.axis2.deployment.DeploymentException;
-
public class WSInfoList implements DeploymentConstants {
/**
@@ -64,50 +64,63 @@
* @param type indicate either Service or Module
*/
public synchronized void addWSInfoItem(File file, String type) {
- if(TYPE_SERVICE.equals(type)){
+ if (TYPE_SERVICE.equals(type)) {
if (!isFileExist(file.getName())) { // checking whether the file is already deployed
WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), TYPE_SERVICE);
jarList.add(wsInfo);
- DeploymentFileData deploymentFileData = new DeploymentFileData(file, TYPE_SERVICE, deployer.isAntiJARLocking());
- deployer.addWSToDeploy(deploymentFileData); // inform that new web service is deployed
+ DeploymentFileData deploymentFileData =
+ new DeploymentFileData(file, TYPE_SERVICE, deployer.isAntiJARLocking());
+ deployer.addWSToDeploy(
+ deploymentFileData); // inform that new web service is deployed
} else {
if (deployer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
if (isModified(file, tempWSInfo)) { // check whether file is updated
tempWSInfo.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(),
- tempWSInfo.getLastModifiedDate(), TYPE_SERVICE);
+ tempWSInfo.getLastModifiedDate(), TYPE_SERVICE);
deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list
- DeploymentFileData deploymentFileData = new DeploymentFileData(file, TYPE_SERVICE, deployer.isAntiJARLocking());
+ DeploymentFileData deploymentFileData = new DeploymentFileData(file,
+ TYPE_SERVICE,
+ deployer.isAntiJARLocking());
deployer.addWSToDeploy(deploymentFileData); // add entry to deploylist
}
}
}
- } else if (TYPE_MODULE.equals(type)){
- if (!isFileExist(file.getName())) { // checking whether the file is already deployed
+ } else if (TYPE_MODULE.equals(type)) {
+ if (!isFileExist(file.getName()))
+ { // checking whether the file is already deployed
WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), TYPE_MODULE);
jarList.add(wsInfo);
- DeploymentFileData deploymentFileData = new DeploymentFileData(file, TYPE_MODULE, false);
- deployer.addWSToDeploy(deploymentFileData); // inform that new web service is deployed
+ DeploymentFileData deploymentFileData =
+ new DeploymentFileData(file, TYPE_MODULE, false);
+ deployer.addWSToDeploy(
+ deploymentFileData); // inform that new web service is deployed
}
} else {
- if(file!=null){
+ if (file != null) {
String extension = DeploymentFileData.getFileExtension(file.getName());
if (!isFileExist(file.getName())) {
WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), extension);
jarList.add(wsInfo);
- DeploymentFileData deploymentFileData = new DeploymentFileData(file, extension, deployer.isAntiJARLocking());
- deployer.addWSToDeploy(deploymentFileData); // inform that new web service is deployed
+ DeploymentFileData deploymentFileData =
+ new DeploymentFileData(file, extension, deployer.isAntiJARLocking());
+ deployer.addWSToDeploy(
+ deploymentFileData); // inform that new web service is deployed
} else {
if (deployer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
if (isModified(file, tempWSInfo)) { // check whether file is updated
tempWSInfo.setLastModifiedDate(file.lastModified());
WSInfo wsInfo = new WSInfo(tempWSInfo.getFileName(),
- tempWSInfo.getLastModifiedDate(), extension);
- deployer.addWSToUndeploy(wsInfo); // add entry to undeploy list
- DeploymentFileData deploymentFileData = new DeploymentFileData(file, extension, deployer.isAntiJARLocking());
- deployer.addWSToDeploy(deploymentFileData); // add entry to deploylist
+ tempWSInfo.getLastModifiedDate(), extension);
+ deployer.addWSToUndeploy(
+ wsInfo); // add entry to undeploy list
+ DeploymentFileData deploymentFileData = new DeploymentFileData(file,
+ extension,
+ deployer.isAntiJARLocking());
+ deployer.addWSToDeploy(
+ deploymentFileData); // add entry to deploylist
}
}
}
@@ -115,7 +128,7 @@
check = true;
}
}
- if(file!=null){
+ if (file != null) {
String jarname = file.getName();
currentJars.add(jarname);
}
@@ -159,7 +172,8 @@
}
if (!exist) {
tempvector.add(fileitem);
- WSInfo wsInfo = new WSInfo(fileitem.getFileName(), fileitem.getLastModifiedDate(), fileitem.getType());
+ WSInfo wsInfo = new WSInfo(fileitem.getFileName(), fileitem.getLastModifiedDate(),
+ fileitem.getType());
deployer.addWSToUndeploy(wsInfo); // this is to be undeployed
}
@@ -185,9 +199,9 @@
public void update() throws DeploymentException {
synchronized (deployer) {
checkForUndeployedServices();
-
- deployer.unDeploy();
- deployer.doDeploy();
+
+ deployer.unDeploy();
+ deployer.doDeploy();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java Sun Mar 4 10:16:54 2007
@@ -124,7 +124,7 @@
//we don't care about this either
return lastImportLocation.toString();
}
-
+
public void close() {
//TODO: FIXME:
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java Sun Mar 4 10:16:54 2007
@@ -26,8 +26,9 @@
*
*
*/
+
public class WarBasedWSDLLocator extends DefaultURIResolver implements WSDLLocator {
- protected static final Log log = LogFactory
+ protected static final Log log = LogFactory
.getLog(WarBasedWSDLLocator.class);
private InputStream baseInputStream;
@@ -35,7 +36,8 @@
private String baseURI;
private ClassLoader classLoader;
- public WarBasedWSDLLocator(String baseURI, ClassLoader classLoader, InputStream baseInputStream) {
+ public WarBasedWSDLLocator(String baseURI, ClassLoader classLoader,
+ InputStream baseInputStream) {
this.baseURI = baseURI;
this.baseInputStream = baseInputStream;
this.classLoader = classLoader;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java Sun Mar 4 10:16:54 2007
@@ -24,6 +24,7 @@
*
*
*/
+
public class WarFileBasedURIResolver extends DefaultURIResolver {
protected static final Log log = LogFactory
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sun Mar 4 10:16:54 2007
@@ -266,10 +266,11 @@
// Find static getServiceObject() method, call it if there
Method method = serviceObjectMaker.
getMethod("getServiceObject",
- new Class[]{AxisService.class});
+ new Class[]{AxisService.class});
Object obj = null;
if (method != null) {
- obj = method.invoke(serviceObjectMaker.newInstance(), new Object[]{axisService});
+ obj = method.invoke(serviceObjectMaker.newInstance(),
+ new Object[]{axisService});
}
if (obj == null) {
log.warn("ServiceObjectSupplier implmentation Object could not be found");
@@ -289,8 +290,9 @@
Java2WSDLConstants.URI_2001_SCHEMA_XSD);
axisService.setNameSpacesMap(map);
SchemaGenerator schemaGenerator = new SchemaGenerator(serviceClassLoader,
- serviceClass.trim(), axisService.getSchematargetNamespace(),
- axisService.getSchematargetNamespacePrefix());
+ serviceClass.trim(),
+ axisService.getSchematargetNamespace(),
+ axisService.getSchematargetNamespacePrefix());
schemaGenerator.setExcludeMethods(excludeOperations);
schemaGenerator.setNonRpcMethods(nonRpcMethods);
if (!axisService.isElementFormDefault()) {
@@ -314,9 +316,9 @@
for (int i = 0; i < method.length; i++) {
JMethod jmethod = method[i];
- JAnnotation methodAnnon= jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
- if(methodAnnon!=null){
- if(methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()){
+ JAnnotation methodAnnon = jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
+ if (methodAnnon != null) {
+ if (methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()) {
continue;
}
}
@@ -338,7 +340,8 @@
QName complexSchemaType = table.getComplexSchemaType(jmethod.getSimpleName());
inMessage.setElementQName(complexSchemaType);
if (complexSchemaType != null) {
- axisService.addMessageElementQNameToOperationMapping(complexSchemaType, operation);
+ axisService.addMessageElementQNameToOperationMapping(complexSchemaType,
+ operation);
}
}
if (!jmethod.getReturnType().isVoidType()) {
@@ -348,14 +351,16 @@
Java2WSDLConstants.RESPONSE);
outMessage.setElementQName(qNamefortheType);
if (qNamefortheType != null) {
- axisService.addMessageElementQNameToOperationMapping(qNamefortheType, operation);
+ axisService.addMessageElementQNameToOperationMapping(qNamefortheType,
+ operation);
}
outMessage.setName(opName + Java2WSDLConstants.RESPONSE);
}
if (jmethod.getExceptionTypes().length > 0) {
AxisMessage faultMessage = new AxisMessage();
faultMessage.setName(jmethod.getSimpleName() + "Fault");
- faultMessage.setElementQName(table.getComplexSchemaType(jmethod.getSimpleName() + "Fault"));
+ faultMessage.setElementQName(
+ table.getComplexSchemaType(jmethod.getSimpleName() + "Fault"));
operation.setFaultMessages(faultMessage);
}
} else {
@@ -371,7 +376,7 @@
pinfo.setOperationPhases(operation);
axisService.addOperation(operation);
}
- if(operation.getInputAction()==null){
+ if (operation.getInputAction() == null) {
operation.setSoapAction("urn:" + opName);
}
}
@@ -394,7 +399,8 @@
if (jmethod.getExceptionTypes().length > 0) {
AxisMessage faultMessage = new AxisMessage();
faultMessage.setName(jmethod.getSimpleName() + "Fault");
- faultMessage.setElementQName(table.getComplexSchemaType(jmethod.getSimpleName() + "Fault"));
+ faultMessage
+ .setElementQName(table.getComplexSchemaType(jmethod.getSimpleName() + "Fault"));
operation.setFaultMessages(faultMessage);
}
operation.setName(new QName(opName));
@@ -403,10 +409,10 @@
inMessage.setElementQName(table.getComplexSchemaType(jmethod.getSimpleName()));
inMessage.setName(opName + Java2WSDLConstants.MESSAGE_SUFFIX);
}
- JAnnotation methodAnnon= jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
- if(methodAnnon!=null){
- String action= methodAnnon.getValue(AnnotationConstants.ACTION).asString();
- if(action!=null&&!"".equals(action)){
+ JAnnotation methodAnnon = jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
+ if (methodAnnon != null) {
+ String action = methodAnnon.getValue(AnnotationConstants.ACTION).asString();
+ if (action != null && !"".equals(action)) {
operation.setSoapAction(action);
}
}
@@ -466,10 +472,11 @@
}
File inputFile = Utils.createTempFile(servicename, fin);
DeploymentFileData filedata = new DeploymentFileData(inputFile,
- DeploymentConstants.TYPE_SERVICE, false);
+ DeploymentConstants.TYPE_SERVICE,
+ false);
filedata.setClassLoader(false,
- moduleClassLoader);
+ moduleClassLoader);
HashMap wsdlservice = archiveReader.processWSDLs(filedata);
if (wsdlservice != null && wsdlservice.size() > 0) {
Iterator servicesitr = wsdlservice.values().iterator();
@@ -513,7 +520,7 @@
return uri;
}
int leadingSlashes = 0;
- for (leadingSlashes = 0 ; leadingSlashes < uri.length()
+ for (leadingSlashes = 0; leadingSlashes < uri.length()
&& uri.charAt(leadingSlashes) == '/'; ++leadingSlashes) {
}
boolean isDir = (uri.charAt(uri.length() - 1) == '/');
@@ -538,7 +545,7 @@
while (leadingSlashes-- > 0) {
sb.append('/');
}
- for (Iterator it = clean.iterator() ; it.hasNext() ; ) {
+ for (Iterator it = clean.iterator(); it.hasNext();) {
sb.append(it.next());
if (it.hasNext()) {
sb.append('/');
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Sun Mar 4 10:16:54 2007
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Map;
-public class AxisBinding extends AxisDescription{
+public class AxisBinding extends AxisDescription {
private QName name;
@@ -36,11 +36,11 @@
private Map faults;
public AxisBindingMessage getFault(String name) {
- return (AxisBindingMessage)faults.get(name);
+ return (AxisBindingMessage) faults.get(name);
}
public void addFault(AxisBindingMessage fault) {
- this.faults.put(fault.getName(),fault);
+ this.faults.put(fault.getName(), fault);
}
public AxisBinding() {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Sun Mar 4 10:16:54 2007
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Map;
-public class AxisBindingMessage extends AxisDescription{
+public class AxisBindingMessage extends AxisDescription {
private String name;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Sun Mar 4 10:16:54 2007
@@ -59,7 +59,7 @@
if (isParameterLocked(param.getName())) {
throw new AxisFault(Messages.getMessage("paramterlockedbyparent",
- param.getName()));
+ param.getName()));
}
parameterInclude.addParameter(param);
@@ -78,10 +78,10 @@
public Parameter getParameter(String name) {
Parameter parameter = parameterInclude.getParameter(name);
- if(parameter!=null){
+ if (parameter != null) {
return parameter;
}
- if(parent != null) {
+ if (parent != null) {
return parent.getParameter(name);
}
return null;
@@ -159,14 +159,14 @@
* policy of this AxisDescription instance. (4) If not throw an AxisFault to
* notify the user. (5) Else notify each module about the new effective
* policy.
- *
+ *
* @param policy the new policy of this AxisDescription instance. The effective
- * policy is the merge of this argument with effective policy of
- * parent of this AxisDescription.
+ * policy is the merge of this argument with effective policy of
+ * parent of this AxisDescription.
* @throws AxisFault if any module is unable to execute the effective policy of
- * this AxisDescription instance successfully or no module to
- * execute some portion (one or more PrimtiveAssertions ) of
- * that effective policy.
+ * this AxisDescription instance successfully or no module to
+ * execute some portion (one or more PrimtiveAssertions ) of
+ * that effective policy.
*/
public void applyPolicy(Policy policy) throws AxisFault {
AxisConfiguration configuration = getAxisConfiguration();
@@ -242,11 +242,11 @@
/**
* Applies the policies on the Description Hierarchy recursively.
- *
+ *
* @throws AxisFault
*/
public void applyPolicy() throws AxisFault {
-
+
if (this instanceof AxisMessage) {
return;
}
@@ -345,7 +345,7 @@
}
private void engageModulesToAxisDescription(List moduleList,
- AxisDescription description) throws AxisFault {
+ AxisDescription description) throws AxisFault {
AxisModule axisModule;
Module module;
@@ -382,12 +382,12 @@
/**
* Engaging a module to different level
- *
+ *
* @param axisModule
* @param axisConfig
*/
public abstract void engageModule(AxisModule axisModule,
- AxisConfiguration axisConfig) throws AxisFault;
+ AxisConfiguration axisConfig) throws AxisFault;
public abstract boolean isEngaged(QName axisModule);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Sun Mar 4 10:16:54 2007
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Map;
-public class AxisEndpoint extends AxisDescription{
+public class AxisEndpoint extends AxisDescription {
// The name of the endpoint
private String name;
@@ -39,7 +39,7 @@
private Map options;
public AxisEndpoint() {
- options = new HashMap();
+ options = new HashMap();
}
public void setProperty(String name, Object value) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisMessage.java Sun Mar 4 10:16:54 2007
@@ -149,10 +149,10 @@
public void engageModule(AxisModule axisModule, AxisConfiguration axisConfig) throws AxisFault {
throw new UnsupportedOperationException("Sorry we do not support this");
}
-
+
public boolean isEngaged(QName moduleName) {
throw new UnsupportedOperationException("axisMessage.isEngaged(qName) is not supported");
-
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org