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 de...@apache.org on 2005/08/27 06:17:28 UTC
svn commit: r240389 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment:
AxisConfigBuilder.java DescriptionBuilder.java ServiceBuilder.java
Author: deepal
Date: Fri Aug 26 21:17:18 2005
New Revision: 240389
URL: http://svn.apache.org/viewcvs?rev=240389&view=rev
Log:
Fixed NPE , due to Deployment->OM conversion
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=240389&r1=240388&r2=240389&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Fri Aug 26 21:17:18 2005
@@ -63,13 +63,18 @@
processParameters(itr,axisConfiguration);
//process MessageReciver
- OMElement messageReceiver = config_element.getFirstChildWithName(
- new QName(MESSAGERECEIVER));
- MessageReceiver msgrecivere= loadMessageReceiver(
- Thread.currentThread().getContextClassLoader(),messageReceiver);
- OMAttribute mepAtt = messageReceiver.getAttribute(new QName(MEP));
- ((AxisConfigurationImpl)axisConfiguration).addMessageReceiver(
- mepAtt.getValue(),msgrecivere);
+
+ Iterator msgRecives = config_element.getChildrenWithName(new QName(MESSAGERECEIVER));
+ while (msgRecives.hasNext()) {
+ OMElement msgRev = (OMElement) msgRecives.next();
+ MessageReceiver msgrecivere= loadMessageReceiver(
+ Thread.currentThread().getContextClassLoader(),msgRev);
+ OMAttribute mepAtt = msgRev.getAttribute(new QName(MEP));
+ ((AxisConfigurationImpl)axisConfiguration).addMessageReceiver(
+ mepAtt.getValue(),msgrecivere);
+ }
+
+
//Process Module refs
Iterator moduleitr = config_element.getChildrenWithName(
@@ -142,6 +147,10 @@
//tranport impl class
OMAttribute trsClas = transport.getAttribute(
new QName(CLASSNAME));
+ if(trsClas == null){
+ throw new DeploymentException("TransportSEnder Implementation class is required " +
+ "for the transport" + name);
+ }
String clasName = trsClas.getValue();
Class sender;
try {
@@ -294,7 +303,12 @@
AxisObserver observer;
OMAttribute trsClas = observerelement.getAttribute(
new QName(CLASSNAME));
- String clasName = trsClas.getValue();
+ String clasName;
+ if (trsClas !=null) {
+ clasName = trsClas.getValue();
+ } else {
+ throw new DeploymentException("Observer Implementation Class is requird");
+ }
try {
Class observerclass = Class.forName(clasName, true, Thread.currentThread().
getContextClassLoader());
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=240389&r1=240388&r2=240389&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Fri Aug 26 21:17:18 2005
@@ -174,12 +174,14 @@
OMElement moduleref = (OMElement) moduleRefs.next();
OMAttribute moduleRefAttribute = moduleref.getAttribute(
new QName(REF));
- String refName = moduleRefAttribute.getValue();
- if(engine.getModule(new QName(refName)) == null) {
- throw new DeploymentException(Messages.getMessage(
- DeploymentErrorMsgs.MODEULE_NOT_FOUND, refName));
- } else {
- engine.getCurrentFileItem().addModule(new QName(refName));
+ if(moduleRefAttribute !=null){
+ String refName = moduleRefAttribute.getValue();
+ if(engine.getModule(new QName(refName)) == null) {
+ throw new DeploymentException(Messages.getMessage(
+ DeploymentErrorMsgs.MODEULE_NOT_FOUND, refName));
+ } else {
+ engine.getCurrentFileItem().addModule(new QName(refName));
+ }
}
}
}catch (AxisFault axisFault) {
@@ -225,11 +227,13 @@
//setting locking attribute
OMAttribute paraLocked = paramterElement.getAttribute(
new QName(ATTLOCKED));
- String lockedValue = paraLocked.getValue();
- if("true".equals(lockedValue)){
- paramter.setLocked(true);
- } else {
- paramter.setLocked(false);
+ if (paraLocked !=null) {
+ String lockedValue = paraLocked.getValue();
+ if("true".equals(lockedValue)){
+ paramter.setLocked(true);
+ } else {
+ paramter.setLocked(false);
+ }
}
parameterInclude.addParameter(paramter);
}
@@ -243,16 +247,18 @@
OMElement moduleref = (OMElement) moduleRefs.next();
OMAttribute moduleRefAttribute = moduleref.getAttribute(
new QName(REF));
- String refName = moduleRefAttribute.getValue();
- if(engine.getModule(new QName(refName)) == null) {
- throw new DeploymentException(Messages.getMessage(
- DeploymentErrorMsgs.MODEULE_NOT_FOUND, refName));
- } else {
- opeartion.addModule(new QName(refName));
+ if (moduleRefAttribute !=null) {
+ String refName = moduleRefAttribute.getValue();
+ if(engine.getModule(new QName(refName)) == null) {
+ throw new DeploymentException(Messages.getMessage(
+ DeploymentErrorMsgs.MODEULE_NOT_FOUND, refName));
+ } else {
+ opeartion.addModule(new QName(refName));
+ }
}
}
}catch (AxisFault axisFault) {
- throw new DeploymentException(axisFault);
+ throw new DeploymentException("Porcessing Operations Modules" + axisFault);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=240389&r1=240388&r2=240389&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Fri Aug 26 21:17:18 2005
@@ -86,17 +86,19 @@
//process service description
OMElement descriptionElement = service_element.getFirstChildWithName(
new QName(DESCRIPTION));
- OMElement descriptionValue = descriptionElement.getFirstElement();
- if(descriptionValue !=null){
- StringWriter writer = new StringWriter();
- descriptionValue.build();
- descriptionValue.serializeWithCache(new
- OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer)));
- writer.flush();
- service.setServiceDescription(writer.toString());
- } else {
- service.setServiceDescription(descriptionElement.getText());
- }
+ if (descriptionElement !=null) {
+ OMElement descriptionValue = descriptionElement.getFirstElement();
+ if(descriptionValue !=null){
+ StringWriter writer = new StringWriter();
+ descriptionValue.build();
+ descriptionValue.serializeWithCache(new
+ OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer)));
+ writer.flush();
+ service.setServiceDescription(writer.toString());
+ } else {
+ service.setServiceDescription(descriptionElement.getText());
+ }
+ }
//processing servicewide modules which required to engage gloabbly
Iterator moduleRefs = service_element.getChildrenWithName(