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 ch...@apache.org on 2006/10/12 13:29:59 UTC
svn commit: r463207 - in
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2:
deployment/ deployment/repository/util/ description/ engine/
Author: chinthaka
Date: Thu Oct 12 04:29:58 2006
New Revision: 463207
URL: http://svn.apache.org/viewvc?view=rev&rev=463207
Log:
Fixing couple of variable naming and spelling errors. (This is of low priority at this instance, but it was bit annoying when I was looking at them.)
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Thu Oct 12 04:29:58 2006
@@ -234,7 +234,7 @@
WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
new WSDL11ToAxisServiceBuilder(wsdlStream, null, null);
axisService = wsdl2AxisServiceBuilder.populateService();
- axisService.setWsdlfound(true);
+ axisService.setWsdlFound(true);
axisService.setName(serviceName);
}
if (axisService == null) {
@@ -264,7 +264,7 @@
WSDL11ToAxisServiceBuilder wsdl2AxisServiceBuilder =
new WSDL11ToAxisServiceBuilder(wsdlStream, axisService);
axisService = wsdl2AxisServiceBuilder.populateService();
- axisService.setWsdlfound(true);
+ axisService.setWsdlFound(true);
// Set the default message receiver for the operations that were
// not listed in the services.xml
Iterator operations = axisService.getOperations();
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Oct 12 04:29:58 2006
@@ -253,7 +253,7 @@
}
if (!service.isUseUserWSDL()) {
// Generating schema for the service if the impl class is Java
- if (!service.isWsdlfound()) {
+ if (!service.isWsdlFound()) {
//trying to generate WSDL for the service using JAM and Java reflection
try {
if (generateWsdl(service)) {
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceGroupBuilder.java Thu Oct 12 04:29:58 2006
@@ -80,7 +80,7 @@
if (axisService == null) {
axisService = new AxisService(serviceName);
} else {
- axisService.setWsdlfound(true);
+ axisService.setWsdlFound(true);
}
// the service that has to be deployed
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Thu Oct 12 04:29:58 2006
@@ -54,7 +54,6 @@
if (TAG_SERVICE.equals(elementName)) {
AxisService axisService = null;
-// OMAttribute serviceNameatt = rootElement.getAttribute(new QName(ATTRIBUTE_NAME));
String serviceName = DescriptionBuilder.getShortFileName(currentFile.getName());
if (serviceName != null) {
axisService = (AxisService) wsdlServices.get(serviceName);
@@ -66,7 +65,7 @@
if (axisService == null) {
axisService = new AxisService(serviceName);
} else {
- axisService.setWsdlfound(true);
+ axisService.setWsdlFound(true);
}
axisService.setParent(axisServiceGroup);
@@ -83,7 +82,7 @@
axisConfig);
return groupBuilder.populateServiceGroup(axisServiceGroup);
}
- throw new AxisFault("In valid services.xml found");
+ throw new AxisFault("Invalid services.xml found");
}
/**
@@ -217,18 +216,18 @@
boolean isDirectory = serviceFile.isDirectory();
if (isDirectory) {
try {
- File meta_inf = new File(serviceFile, META_INF);
+ File metaInfFolder = new File(serviceFile, META_INF);
- if (!meta_inf.exists()) {
- meta_inf = new File(serviceFile, META_INF.toLowerCase());
- if (!meta_inf.exists()) {
+ if (!metaInfFolder.exists()) {
+ metaInfFolder = new File(serviceFile, META_INF.toLowerCase());
+ if (!metaInfFolder.exists()) {
throw new DeploymentException(
Messages.getMessage(
DeploymentErrorMsgs.META_INF_MISSING, serviceFile.getName()));
}
}
- File files[] = meta_inf.listFiles();
+ File files[] = metaInfFolder.listFiles();
for (int i = 0; i < files.length; i++) {
File file1 = files[i];
if (file1.getName().toLowerCase().endsWith(SUFFIX_WSDL)) {
@@ -362,7 +361,7 @@
throws DeploymentException {
// get attribute values
- boolean foundmoduleXML = false;
+ boolean moduleXMLFound = false;
if (!explodedDir) {
ZipInputStream zin;
FileInputStream fin;
@@ -372,7 +371,7 @@
ZipEntry entry;
while ((entry = zin.getNextEntry()) != null) {
if (entry.getName().equalsIgnoreCase(MODULE_XML)) {
- foundmoduleXML = true;
+ moduleXMLFound = true;
ModuleBuilder builder = new ModuleBuilder(zin, module, axisConfig);
// setting module name
module.setName(
@@ -385,7 +384,7 @@
}
zin.close();
fin.close();
- if (!foundmoduleXML) {
+ if (!moduleXMLFound) {
throw new DeploymentException(
Messages.getMessage(
DeploymentErrorMsgs.MODULE_XML_MISSING, archiveFile.getAbsolutePath()));
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java Thu Oct 12 04:29:58 2006
@@ -95,7 +95,7 @@
//private XmlSchema schema;
//wsdl is there for this service or not (in side META-INF)
- private boolean wsdlfound = false;
+ private boolean wsdlFound = false;
//to store the scope of the service
private String scope;
@@ -649,7 +649,7 @@
printWSDLError(out);
}
} else {
- setWsdlfound(true);
+ setWsdlFound(true);
//pick the endpoint and take it as the epr for the WSDL
getWSDL(out, new String[]{this.endpoint}, "services");
}
@@ -657,7 +657,7 @@
}
private void getWSDL(OutputStream out, String [] serviceURL, String servicePath) throws AxisFault {
- if (this.wsdlfound) {
+ if (this.wsdlFound) {
AxisService2OM axisService2WOM = new AxisService2OM(this,
serviceURL, "document", "literal", servicePath);
try {
@@ -708,7 +708,7 @@
printWSDLError(out);
}
} else {
- setWsdlfound(true);
+ setWsdlFound(true);
//pick the endpoint and take it as the epr for the WSDL
getWSDL2(out, new String[]{this.endpoint});
}
@@ -721,7 +721,7 @@
}
private void getWSDL2(OutputStream out, String [] serviceURL) throws AxisFault {
- if (this.wsdlfound) {
+ if (this.wsdlFound) {
AxisService2WSDL2 axisService2WSDL2 = new AxisService2WSDL2(this, serviceURL);
try {
OMElement wsdlElement = axisService2WSDL2.generateOM();
@@ -961,12 +961,12 @@
}
}
- public boolean isWsdlfound() {
- return wsdlfound;
+ public boolean isWsdlFound() {
+ return wsdlFound;
}
- public void setWsdlfound(boolean wsdlfound) {
- this.wsdlfound = wsdlfound;
+ public void setWsdlFound(boolean wsdlFound) {
+ this.wsdlFound = wsdlFound;
}
public String getScope() {
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Thu Oct 12 04:29:58 2006
@@ -6,8 +6,6 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.addressing.wsdl.WSDL11ActionHelper;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.util.ExternalPolicySerializer;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.util.XMLUtils;
import org.apache.axis2.wsdl.SOAPHeaderMessage;
@@ -27,9 +25,9 @@
import javax.wsdl.*;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.extensions.soap12.SOAP12Address;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.extensions.soap.*;
+import javax.wsdl.extensions.soap12.SOAP12Address;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLLocator;
import javax.wsdl.xml.WSDLReader;
@@ -185,10 +183,10 @@
setup();
// Setting wsdl4jdefintion to axisService , so if some one want
// to play with it he can do that by getting the parameter
- Parameter wsdldefintionParamter = new Parameter();
- wsdldefintionParamter.setName(WSDLConstants.WSDL_4_J_DEFINITION);
- wsdldefintionParamter.setValue(wsdl4jDefinition);
- axisService.addParameter(wsdldefintionParamter);
+ Parameter wsdlDefinitionParameter = new Parameter();
+ wsdlDefinitionParameter.setName(WSDLConstants.WSDL_4_J_DEFINITION);
+ wsdlDefinitionParameter.setValue(wsdl4jDefinition);
+ axisService.addParameter(wsdlDefinitionParameter);
if (wsdl4jDefinition == null) {
return null;
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=463207&r1=463206&r2=463207
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Thu Oct 12 04:29:58 2006
@@ -212,14 +212,14 @@
* @param axisService
*/
private void isWSDLEnable(AxisService axisService) {
- if (!axisService.isWsdlfound()) {
+ if (!axisService.isWsdlFound()) {
Iterator operatins = axisService.getOperations();
if (operatins.hasNext()) {
while (operatins.hasNext()) {
AxisOperation axisOperation = (AxisOperation) operatins
.next();
if (axisOperation.getMessageReceiver() == null) {
- axisService.setWsdlfound(false);
+ axisService.setWsdlFound(false);
return;
}
String messageReceiverClass = axisOperation
@@ -229,13 +229,13 @@
|| "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
.equals(messageReceiverClass) || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
.equals(messageReceiverClass))) {
- axisService.setWsdlfound(false);
+ axisService.setWsdlFound(false);
return;
}
}
- axisService.setWsdlfound(true);
+ axisService.setWsdlFound(true);
} else {
- axisService.setWsdlfound(false);
+ axisService.setWsdlFound(false);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org