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/22 04:38:43 UTC
svn commit: r358474 [3/3] - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2: rpc/
rpc/client/ rpc/receivers/ schema/ schema/typemap/ schema/util/
schema/writer/ util/ wsdl/codegen/ wsdl/codegen/emitter/
wsdl/codegen/extension/ wsd...
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java Wed Dec 21 19:38:20 2005
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.extension;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.wsdl.WSDLExtensibilityElement;
import org.apache.wsdl.WSDLTypes;
@@ -31,7 +30,7 @@
public class WSDLValidatorExtension extends AbstractCodeGenerationExtension {
private static String TARGETNAMESPACE_STRING = "targetNamespace";
-
+
public void engage() throws CodeGenerationException {
//WSDLDescription wom = this.configuration.getWom();
WSDLTypes typesList = configuration.getWom().getTypes();
@@ -49,26 +48,26 @@
//first check whether the schema include only a single import statement.
//As per the nature of WSDL if the schema has a single import ONLY, then the
//schema element need not contain a target namespace.
- NodeList importNodeList = schemaElement.getElementsByTagNameNS(schemaElement.getNamespaceURI(),"import");
+ NodeList importNodeList = schemaElement.getElementsByTagNameNS(schemaElement.getNamespaceURI(), "import");
NodeList allNodes = schemaElement.getElementsByTagName("*");
//checking the number of child elements and the number of import elements should get us what we need
- if (importNodeList.getLength()==1 && allNodes.getLength()==1){
+ if (importNodeList.getLength() == 1 && allNodes.getLength() == 1) {
return;
}
NamedNodeMap attributes = schemaElement.getAttributes();
for (int i = 0; i < attributes.getLength(); i++) {
-
+
if (TARGETNAMESPACE_STRING.equalsIgnoreCase(
- attributes.item(i).getNodeName())){
+ attributes.item(i).getNodeName())) {
targetnamespaceFound = true;
break;
}
}
if (!targetnamespaceFound)
throw new CodeGenerationException(
- "Invalid WSDL: The WSDL Types Schema does not define a targetNamespace in "+schema.getName() );
+ "Invalid WSDL: The WSDL Types Schema does not define a targetNamespace in " + schema.getName());
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Wed Dec 21 19:38:20 2005
@@ -17,7 +17,6 @@
package org.apache.axis2.wsdl.codegen.extension;
import com.ibm.wsdl.util.xml.DOM2Writer;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.XSLTConstants;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
@@ -131,9 +130,9 @@
schemaFolder.mkdir();
//compile these schemas
while (!importedSchemaStack.isEmpty()) {
- Element element = (Element)importedSchemaStack.pop();
+ Element element = (Element) importedSchemaStack.pop();
String tagetNamespace = element.getAttribute("targetNamespace");
- if (!processedSchemas.contains(tagetNamespace)){
+ if (!processedSchemas.contains(tagetNamespace)) {
// we are not using DOM toString method here, as it seems it depends on the
// JDK version that is being used.
@@ -280,7 +279,7 @@
DocumentBuilder documentBuilder = getNamespaceAwareDocumentBuilder();
for (int i = 0; i < schemaNames.length; i++) {
//the location for the third party schema;s is hardcoded
- if (!"".equals(schemaNames[i].trim())){
+ if (!"".equals(schemaNames[i].trim())) {
InputStream schemaStream = this.getClass().getResourceAsStream(SCHEMA_PATH + schemaNames[i]);
Document doc = documentBuilder.parse(schemaStream);
additionalSchemaElements.add(doc.getDocumentElement());
@@ -328,25 +327,25 @@
protected void foo(WSDLBindingOperation bindingOp) {
WSDLBindingMessageReference input = bindingOp.getInput();
- if(input != null){
- Iterator extIterator = input.getExtensibilityElements()
- .iterator();
- while (extIterator.hasNext()) {
- WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
- if (ExtensionConstants.SOAP_11_BODY.equals(element.getType()) ||
- ExtensionConstants.SOAP_12_BODY.equals(element.getType())) {
- if (WSDLConstants.WSDL_USE_ENCODED.equals(
- ((SOAPBody) element).getUse())) {
- throw new RuntimeException(
- "The use 'encoded' is not supported!");
- }
- }
- }
+ if (input != null) {
+ Iterator extIterator = input.getExtensibilityElements()
+ .iterator();
+ while (extIterator.hasNext()) {
+ WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
+ if (ExtensionConstants.SOAP_11_BODY.equals(element.getType()) ||
+ ExtensionConstants.SOAP_12_BODY.equals(element.getType())) {
+ if (WSDLConstants.WSDL_USE_ENCODED.equals(
+ ((SOAPBody) element).getUse())) {
+ throw new RuntimeException(
+ "The use 'encoded' is not supported!");
+ }
+ }
+ }
}
}
private XmlObject[] convertToXMLObjectArray(Vector vec) {
- return (XmlObject[])vec.toArray(new XmlObject[vec.size()]);
+ return (XmlObject[]) vec.toArray(new XmlObject[vec.size()]);
}
/**
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java Wed Dec 21 19:38:20 2005
@@ -23,11 +23,11 @@
* limitations under the License.
*/
-public class AntBuildWriter extends ClassWriter{
+public class AntBuildWriter extends ClassWriter {
private String databindingFramework = ConfigPropertyFileLoader.getDefaultDBFrameworkName();
- public AntBuildWriter(String outputFileLocation) {
+ public AntBuildWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
}
@@ -43,18 +43,18 @@
public void createOutFile(String packageName, String fileName) throws Exception {
File outputFile = FileWriter.createClassFile(outputFileLocation,
"",
- packageName.replaceAll("\\.","_")+"build",
+ packageName.replaceAll("\\.", "_") + "build",
".xml");
//set the existing flag
fileExists = outputFile.exists();
- if (!fileExists){
+ if (!fileExists) {
this.stream = new FileOutputStream(outputFile);
}
}
- //overridden to get the correct behavior
+ //overridden to get the correct behavior
protected String findTemplate(Map languageSpecificPropertyMap) {
- String ownClazzName = this.getClass().getName();
+ String ownClazzName = this.getClass().getName();
String key;
String propertyValue;
String templateName = null;
@@ -64,12 +64,12 @@
while (keys.hasNext()) {
//check for template entries
key = keys.next().toString();
- if (key.endsWith(TEMPLATE_SUFFIX)){
+ if (key.endsWith(TEMPLATE_SUFFIX)) {
// check if the class name is there
propertyValue = languageSpecificPropertyMap.get(key).toString();
- if (propertyValue.startsWith(ownClazzName)){
- if (key.indexOf(databindingFramework)!=-1){
- templateName = propertyValue.substring(propertyValue.indexOf(SEPERATOR_STRING)+1) ;
+ if (propertyValue.startsWith(ownClazzName)) {
+ if (key.indexOf(databindingFramework) != -1) {
+ templateName = propertyValue.substring(propertyValue.indexOf(SEPERATOR_STRING) + 1);
break;
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java Wed Dec 21 19:38:20 2005
@@ -29,5 +29,5 @@
this.language = language;
}
-
+
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java Wed Dec 21 19:38:20 2005
@@ -31,8 +31,8 @@
import java.util.Iterator;
import java.util.Map;
-public abstract class ClassWriter {
-
+public abstract class ClassWriter {
+
private static Log log = LogFactory.getLog(ClassWriter.class);
protected File outputFileLocation = null;
@@ -59,22 +59,22 @@
/**
* Load the template
*/
- public void loadTemplate() throws CodeGenerationException{
+ public void loadTemplate() throws CodeGenerationException {
// the default behavior for the class writers is to use the property map from the languge specific types
// The properties are arranged in the following order
// <lang-name>.* .template=<write-class>,<template-name>
//first get the language specific property map
Class clazz = this.getClass();
- Map languageSpecificPropertyMap = (Map)ConfigPropertyFileLoader.getLanguageSpecificPropertiesMap().get(this.language);
- if (languageSpecificPropertyMap==null){
+ Map languageSpecificPropertyMap = (Map) ConfigPropertyFileLoader.getLanguageSpecificPropertiesMap().get(this.language);
+ if (languageSpecificPropertyMap == null) {
throw new CodeGenerationException("No language specific properties!!!");
}
String templateName = findTemplate(languageSpecificPropertyMap);
- if (templateName!=null){
+ if (templateName != null) {
this.xsltStream = clazz.getResourceAsStream(templateName);
- }else{
+ } else {
throw new CodeGenerationException("template for this writer is not found");
}
@@ -84,7 +84,7 @@
protected String findTemplate(Map languageSpecificPropertyMap) {
//search through the proprty names to find the template relevant to this class
- String ownClazzName = this.getClass().getName();
+ String ownClazzName = this.getClass().getName();
String key;
String propertyValue;
String templateName = null;
@@ -93,12 +93,12 @@
while (keys.hasNext()) {
//check for template entries
key = keys.next().toString();
- if (key.endsWith(TEMPLATE_SUFFIX)){
+ if (key.endsWith(TEMPLATE_SUFFIX)) {
// check if the class name is there
propertyValue = languageSpecificPropertyMap.get(key).toString();
- if (propertyValue.startsWith(ownClazzName)){
+ if (propertyValue.startsWith(ownClazzName)) {
//bingo! we found the right template
- templateName = propertyValue.substring(propertyValue.indexOf(SEPERATOR_STRING)+1) ;
+ templateName = propertyValue.substring(propertyValue.indexOf(SEPERATOR_STRING) + 1);
break;
}
}
@@ -121,7 +121,7 @@
getFileExtensionForLanguage(language));
//set the existing flag
fileExists = outputFile.exists();
- if (!fileExists){
+ if (!fileExists) {
this.stream = new FileOutputStream(outputFile);
} else {
log.info(Messages.getMessage("fileExistsNoOverwrite", outputFile.toString()));
@@ -130,18 +130,19 @@
/**
* Find the file name extension
+ *
* @param language
* @return extension
*/
- protected String getFileExtensionForLanguage(String language){
- Map languageSpecificPropertyMap = (Map)ConfigPropertyFileLoader.getLanguageSpecificPropertiesMap().get(this.language);
+ protected String getFileExtensionForLanguage(String language) {
+ Map languageSpecificPropertyMap = (Map) ConfigPropertyFileLoader.getLanguageSpecificPropertiesMap().get(this.language);
Iterator keys = languageSpecificPropertyMap.keySet().iterator();
String key;
String extension = null;
while (keys.hasNext()) {
//check for template entries
key = keys.next().toString();
- if (key.endsWith(EXTENSION_SUFFIX)){
+ if (key.endsWith(EXTENSION_SUFFIX)) {
extension = languageSpecificPropertyMap.get(key).toString();
//add a . to the front
extension = "." + extension;
@@ -158,7 +159,7 @@
* @throws Exception
*/
public void parse(Document doc) throws Exception {
- if (!fileExists){
+ if (!fileExists) {
XSLTTemplateProcessor.parse(this.stream,
doc,
this.xsltStream);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java Wed Dec 21 19:38:20 2005
@@ -29,7 +29,5 @@
this.language = language;
}
-
-
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java Wed Dec 21 19:38:20 2005
@@ -30,5 +30,5 @@
this.language = language;
}
-
+
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java Wed Dec 21 19:38:20 2005
@@ -29,5 +29,5 @@
this.language = language;
}
-
+
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java Wed Dec 21 19:38:20 2005
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-public class PolicyFileWriter extends ClassWriter{
+public class PolicyFileWriter extends ClassWriter {
- public PolicyFileWriter(File outputFileLocation) {
+ public PolicyFileWriter(File outputFileLocation) {
this.outputFileLocation = outputFileLocation;
}
@@ -34,7 +34,7 @@
".xml");
//set the existing flag
fileExists = outputFile.exists();
- if (!fileExists){
+ if (!fileExists) {
this.stream = new FileOutputStream(outputFile);
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java Wed Dec 21 19:38:20 2005
@@ -32,6 +32,7 @@
/**
* Pretty print contents of the java source file
+ *
* @param file
*/
public static void prettify(File file) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java Wed Dec 21 19:38:20 2005
@@ -34,7 +34,6 @@
}
-
public void createOutFile(String packageName, String fileName) throws Exception {
File outputFile = FileWriter.createClassFile(outputFileLocation,
packageName,
@@ -42,7 +41,7 @@
".xml");
//set the existing flag
fileExists = outputFile.exists();
- if (!fileExists){
+ if (!fileExists) {
this.stream = new FileOutputStream(outputFile);
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java Wed Dec 21 19:38:20 2005
@@ -30,6 +30,5 @@
this.language = language;
}
-
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java Wed Dec 21 19:38:20 2005
@@ -29,5 +29,5 @@
this.language = language;
}
-
+
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMapper.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMapper.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMapper.java Wed Dec 21 19:38:20 2005
@@ -40,15 +40,15 @@
*
* @param qname name of the XML element to be mapped
* @return an Object that represents the particular class in a pre specified form.
- * it can be a specific format to the databinding framework used
- * This allows tight integrations with the databinding framework, allowing the emitter
- * to write the databinding classes in his own way
- *
+ * it can be a specific format to the databinding framework used
+ * This allows tight integrations with the databinding framework, allowing the emitter
+ * to write the databinding classes in his own way
*/
public Object getTypeMappingObject(QName qname);
/**
* Get the parameter name
+ *
* @param qname name of the XML element to get a parameter
* @return a unique parameter name
*/
@@ -56,18 +56,19 @@
/**
* Adds a type mapping name to the type mapper
- * @see #getTypeMappingName(javax.xml.namespace.QName)
+ *
* @param qname
* @param value
+ * @see #getTypeMappingName(javax.xml.namespace.QName)
*/
public void addTypeMappingName(QName qname, String value);
/**
* Adds a type mapping object to the type mapper
*
- * @see #getTypeMappingObject(javax.xml.namespace.QName)
* @param qname the xml Qname that this type refers to
* @param value the type mapping object
+ * @see #getTypeMappingObject(javax.xml.namespace.QName)
*/
- public void addTypeMappingObject(QName qname, Object value);
+ public void addTypeMappingObject(QName qname, Object value);
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java Wed Dec 21 19:38:20 2005
@@ -39,15 +39,14 @@
private static final String PARAMETER_NAME_SUFFIX = "param";
-
-
/**
* Behavior of this method is such that when the type mapping is not found
* it returns the default type mapping from the constant
+ *
* @see TypeMapper#getTypeMappingName(javax.xml.namespace.QName)
*/
public String getTypeMappingName(QName qname) {
-
+
if ((qname != null)) {
Object o = qName2NameMap.get(qname);
if (o != null) {
@@ -78,25 +77,24 @@
}
/**
- * @see TypeMapper#getTypeMappingObject(javax.xml.namespace.QName)
* @param qname
* @return object represneting a specific form of the XSD compilation
+ * @see TypeMapper#getTypeMappingObject(javax.xml.namespace.QName)
*/
public Object getTypeMappingObject(QName qname) {
return qName2ObjectMap.get(qname);
}
/**
- * @see TypeMapper#addTypeMappingObject(javax.xml.namespace.QName, Object)
* @param qname
* @param value
+ * @see TypeMapper#addTypeMappingObject(javax.xml.namespace.QName, Object)
*/
public void addTypeMappingObject(QName qname, Object value) {
- qName2ObjectMap.put(qname,value);
+ qName2ObjectMap.put(qname, value);
}
/**
- *
* @return
*/
public HashMap getAllTypeMappings() {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/package.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/package.html?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/package.html (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/package.html Wed Dec 21 19:38:20 2005
@@ -1,5 +1,5 @@
<html>
<body>
- This package is a "non class containing" one that has the xsl templates for the C# class generation
- </body>
+This package is a "non class containing" one that has the xsl templates for the C# class generation
+</body>
</html>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/package.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/package.html?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/package.html (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/package.html Wed Dec 21 19:38:20 2005
@@ -1,6 +1,6 @@
<html>
<body>
- This package is a "non class containing" one that has the xsl templates for the Java class generation
+This package is a "non class containing" one that has the xsl templates for the Java class generation
- </body>
+</body>
</html>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java Wed Dec 21 19:38:20 2005
@@ -38,11 +38,11 @@
/* Note - Should be a non regular expression character. If not it should be properly escaped */
private static final String SEPERATOR_CHAR = ",";
- static{
+ static {
try {
- InputStream stream =ConfigPropertyFileLoader.class.getResourceAsStream(CODEGEN_CONFIG_PROPERTIES);
- if (stream ==null) {
+ InputStream stream = ConfigPropertyFileLoader.class.getResourceAsStream(CODEGEN_CONFIG_PROPERTIES);
+ if (stream == null) {
URL url = ConfigPropertyFileLoader.class.getResource(CODEGEN_CONFIG_PROPERTIES);
stream = new FileInputStream(url.toString());
}
@@ -57,26 +57,25 @@
//load the extension class names
String tempString = props.getProperty(CODE_GEN_KEY_PREFIX);
- if (tempString!=null){
+ if (tempString != null) {
extensionClassNames = tempString.split(SEPERATOR_CHAR);
}
//load the data binding framework names
tempString = props.getProperty(DATA_BINDING_FRAMEWORK_NAME_KEY);
- if (tempString!=null){
+ if (tempString != null) {
databindingFrameworkNames = tempString.split(SEPERATOR_CHAR);
}
-
//populate the data binding framework name to extension name map
tempString = props.getProperty(DATA_BINDING_FRAMEWORK_EXTENSION_NAME_KEY);
- if (tempString!=null){
+ if (tempString != null) {
String[] frameworkExtensionNames = tempString.split(SEPERATOR_CHAR);
try {
for (int i = 0; i < frameworkExtensionNames.length; i++) {
- databindingFrameworkNameToExtensionMap.put(databindingFrameworkNames[i],frameworkExtensionNames[i]);
+ databindingFrameworkNameToExtensionMap.put(databindingFrameworkNames[i], frameworkExtensionNames[i]);
}
} catch (ArrayIndexOutOfBoundsException e) {
throw new Exception("Number of frameworks and extension names do not match!");
@@ -87,32 +86,32 @@
//load the default framework name
tempString = props.getProperty(DATA_BINDING_FRAMEWORK_DEFAULT_NAME_KEY);
- if (tempString==null || !databindingFrameworkNameToExtensionMap.containsKey(tempString)) {
+ if (tempString == null || !databindingFrameworkNameToExtensionMap.containsKey(tempString)) {
throw new Exception("Unknown framework specified for default!");
}
defaultDBFrameworkName = tempString;
//load the third party schema names
tempString = props.getProperty(THIRD_PARTY_SCHEMA_KEY_PREFIX);
- if (tempString!=null){
+ if (tempString != null) {
thirdPartySchemaNames = tempString.split(SEPERATOR_CHAR);
}
//load the language names
tempString = props.getProperty(LANGUAGE_TYPE_KEY_PREFIX);
- if (tempString!=null){
+ if (tempString != null) {
languageTypes = tempString.split(SEPERATOR_CHAR);
//load the language emitter map
tempString = props.getProperty(EMITTER_CLASS_KEY);
- if (tempString==null){
+ if (tempString == null) {
throw new Exception("No emitters found");
- }else{
+ } else {
String[] tempClassNames = tempString.split(SEPERATOR_CHAR);
//populate the map
languageEmitterMap = new HashMap();
for (int i = 0; i < tempClassNames.length; i++) {
- languageEmitterMap.put(languageTypes[i],tempClassNames[i]);
+ languageEmitterMap.put(languageTypes[i], tempClassNames[i]);
}
}
@@ -120,7 +119,7 @@
// load the default language
tempString = props.getProperty(DEFAULT_LANGUAGE_TYPE_KEY);
- if (null==tempString || !languageEmitterMap.containsKey(tempString) ){
+ if (null == tempString || !languageEmitterMap.containsKey(tempString)) {
throw new Exception("Unknown Language specified for default!");
}
defaultLanguage = tempString;
@@ -130,32 +129,33 @@
//
String languageType;
String tempkey;
- HashMap langSpecificMap ;
+ HashMap langSpecificMap;
for (int i = 0; i < languageTypes.length; i++) {
languageType = languageTypes[i];
langSpecificMap = new HashMap();
Enumeration keyEnum = props.keys();
while (keyEnum.hasMoreElements()) {
tempkey = keyEnum.nextElement().toString();
- if (tempkey.startsWith(languageType+".")){
- langSpecificMap.put(tempkey,props.get(tempkey));
+ if (tempkey.startsWith(languageType + ".")) {
+ langSpecificMap.put(tempkey, props.get(tempkey));
}
}
//now add this to the lang specific properties map
- languageSpecificPropertiesMap.put(languageType,langSpecificMap);
+ languageSpecificPropertiesMap.put(languageType, langSpecificMap);
}
} catch (IOException e) {
throw new RuntimeException(e);
- }catch (Exception e){
- throw new RuntimeException("Exception while loading the property file",e);
+ } catch (Exception e) {
+ throw new RuntimeException("Exception while loading the property file", e);
}
}
/**
* get the extension class names
+ *
* @return
*/
public static String[] getExtensionClassNames() {
@@ -164,6 +164,7 @@
/**
* get the third party schema names list
+ *
* @return
*/
public static String[] getThirdPartySchemaNames() {
@@ -172,6 +173,7 @@
/**
* get the language type names
+ *
* @return
*/
public static String[] getLanguageTypes() {
@@ -180,6 +182,7 @@
/**
* get the emitter names map keyd with the language name
+ *
* @return
*/
public static Map getLanguageEmitterMap() {
@@ -188,6 +191,7 @@
/**
* get the default language name
+ *
* @return
*/
public static String getDefaultLanguage() {
@@ -196,6 +200,7 @@
/**
* get the language specific properties
+ *
* @return
*/
public static Map getLanguageSpecificPropertiesMap() {
@@ -204,6 +209,7 @@
/**
* get the databinding framework names
+ *
* @return
*/
public static String[] getDatabindingFrameworkNames() {
@@ -213,6 +219,7 @@
/**
* get the extensions map for the databinding frameworks
* the entries are keys by the framework name
+ *
* @return
*/
public static Map getDatabindingFrameworkNameToExtensionMap() {
@@ -221,6 +228,7 @@
/**
* get the default DB framwork name
+ *
* @return
*/
public static String getDefaultDBFrameworkName() {