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 aj...@apache.org on 2006/06/02 08:55:04 UTC
svn commit: r411068 - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen:
./ extension/
Author: ajith
Date: Thu Jun 1 23:55:03 2006
New Revision: 411068
URL: http://svn.apache.org/viewvc?rev=411068&view=rev
Log:
1. Refactoring the Codegen Extensions. The stateful invocation model of the extensions is somewhat inefficient and now changed to a stateless model.
I. Removed the init(codegenConfiguration) method and added the codegenConfiguration to the method signature of the engage method
II Changed the implementations to suit this interface change.
III.Updated the CodeGenerationEngine.java to suit this change
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/CodeGenExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXBRIExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JaxMeExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/TypeMapperExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Thu Jun 1 23:55:03 2006
@@ -125,8 +125,7 @@
*/
private void addExtension(CodeGenExtension ext) {
if(ext != null) {
- ext.init(configuration);
- extensions.add(ext);
+ extensions.add(ext);
}
}
@@ -137,7 +136,7 @@
public void generate() throws CodeGenerationException {
try {
for (int i = 0; i < extensions.size(); i++) {
- ((CodeGenExtension) extensions.get(i)).engage();
+ ((CodeGenExtension) extensions.get(i)).engage(configuration);
}
Emitter emitter;
@@ -274,7 +273,7 @@
* @return
*/
private String getBaseURI(String currentURI){
- String baseURI= null;
+ String baseURI;
if (!currentURI.startsWith("http://")) {
// the uri should be a file
try {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java Thu Jun 1 23:55:03 2006
@@ -16,19 +16,11 @@
package org.apache.axis2.wsdl.codegen.extension;
-import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public abstract class AbstractCodeGenerationExtension implements CodeGenExtension {
- private static final Log log = LogFactory.getLog(AbstractCodeGenerationExtension.class);
-
- protected CodeGenConfiguration configuration;
-
- public void init(CodeGenConfiguration configuration) {
- this.configuration = configuration;
- }
-
+ protected Log log = LogFactory.getLog(this.getClass());
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/CodeGenExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/CodeGenExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/CodeGenExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/CodeGenExtension.java Thu Jun 1 23:55:03 2006
@@ -21,10 +21,7 @@
public interface CodeGenExtension {
-
- public void init(CodeGenConfiguration configuration);
-
- public void engage() throws CodeGenerationException;
+ public void engage(CodeGenConfiguration configuration) throws CodeGenerationException;
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java Thu Jun 1 23:55:03 2006
@@ -16,6 +16,7 @@
package org.apache.axis2.wsdl.codegen.extension;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
import org.apache.axis2.wsdl.databinding.TypeMapper;
@@ -23,7 +24,7 @@
public class DefaultDatabindingExtension extends AbstractDBProcessingExtension {
- public void engage() throws CodeGenerationException {
+ public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
TypeMapper mapper = configuration.getTypeMapper();
if (testFallThrough(configuration.getDatabindingType())) {
//if it's fall through for the default databinding extension and a mapper has
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXBRIExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXBRIExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXBRIExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXBRIExtension.java Thu Jun 1 23:55:03 2006
@@ -53,7 +53,7 @@
public static final String JAXB_RI_PROCESS_METHOD = "processSchemas";
- public void engage() {
+ public void engage(CodeGenConfiguration configuration) {
//test the databinding type. If not just fall through
if (testFallThrough(configuration.getDatabindingType())) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JaxMeExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JaxMeExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JaxMeExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JaxMeExtension.java Thu Jun 1 23:55:03 2006
@@ -16,6 +16,7 @@
package org.apache.axis2.wsdl.codegen.extension;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
@@ -59,7 +60,7 @@
boolean debug = false;
- public void engage() {
+ public void engage(CodeGenConfiguration configuration) {
//test the databinding type. If not just fall through
if (testFallThrough(configuration.getDatabindingType())) {
@@ -75,7 +76,7 @@
//there are no types to be code generated
//However if the type mapper is left empty it will be a problem for the other
//processes. Hence the default type mapper is set to the configuration
- this.configuration.setTypeMapper(new DefaultTypeMapper());
+ configuration.setTypeMapper(new DefaultTypeMapper());
return;
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JiBXExtension.java Thu Jun 1 23:55:03 2006
@@ -16,19 +16,18 @@
package org.apache.axis2.wsdl.codegen.extension;
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
+import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
+
+import javax.xml.namespace.QName;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
-import org.apache.axis2.wsdl.i18n.CodegenMessages;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisMessage;
-
public class JiBXExtension extends AbstractDBProcessingExtension {
public static final String BINDING_PATH_OPTION = "bindingfile";
@@ -38,7 +37,7 @@
"org.apache.axis2.jibx.CodeGenerationUtility";
public static final String BINDING_MAP_METHOD = "getBindingMap";
- public void engage() {
+ public void engage(CodeGenConfiguration configuration) {
// just return if JiBX binding not active
if (testFallThrough(configuration.getDatabindingType())) {
@@ -61,7 +60,7 @@
}
// load the actual utility class
- Class clazz = null;
+ Class clazz;
try {
clazz = JiBXExtension.class.getClassLoader().loadClass(JIBX_UTILITY_CLASS);
} catch (ClassNotFoundException e) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java Thu Jun 1 23:55:03 2006
@@ -17,12 +17,13 @@
package org.apache.axis2.wsdl.codegen.extension;
import org.apache.axis2.util.URLProcessor;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
public class PackageFinder extends AbstractCodeGenerationExtension {
- public void engage() {
- String packageName = this.configuration.getPackageName();
+ public void engage(CodeGenConfiguration configuration) {
+ String packageName = configuration.getPackageName();
if (packageName == null || URLProcessor.DEFAULT_PACKAGE.equals(packageName)) {
//use the target namespace from the axis service to form a package
//name
@@ -34,7 +35,7 @@
if (null == packageName || "".equals(packageName))
packageName = URLProcessor.DEFAULT_PACKAGE;
- this.configuration.setPackageName(packageName.toLowerCase());
+ configuration.setPackageName(packageName.toLowerCase());
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PolicyEvaluator.java Thu Jun 1 23:55:03 2006
@@ -16,14 +16,6 @@
package org.apache.axis2.wsdl.codegen.extension;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisModule;
@@ -37,26 +29,26 @@
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.util.XSLTConstants;
import org.apache.ws.policy.All;
+import org.apache.ws.policy.ExactlyOne;
import org.apache.ws.policy.Policy;
import org.apache.ws.policy.PrimitiveAssertion;
-import org.apache.ws.policy.ExactlyOne;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-public class PolicyEvaluator implements CodeGenExtension {
-
- CodeGenConfiguration configuration;
-
- AxisService axisService;
-
- HashMap ns2Exts = new HashMap();
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.util.HashMap;
+import java.util.Iterator;
- Element rootElement;
+public class PolicyEvaluator implements CodeGenExtension {
- public PolicyEvaluator() {
- }
+ private CodeGenConfiguration configuration;
+ private AxisService axisService;
+ private HashMap ns2Exts = new HashMap();
- public void init(CodeGenConfiguration configuration) {
+ private void init(CodeGenConfiguration configuration) {
this.configuration = configuration;
this.axisService = configuration.getAxisService();
@@ -109,16 +101,19 @@
}
}
- public void engage() {
-
- Document document = getEmptyDocument();
+ public void engage(CodeGenConfiguration configuration) {
+
+ //initialize
+ init(configuration);
+
+ Document document = getEmptyDocument();
Element rootElement = document.createElement("stubMethods");
AxisOperation axisOperation;
QName opName;
PolicyInclude policyInclude;
Policy policy;
- Iterator a = axisService.getOperations();
+
for (Iterator iterator = axisService.getOperations(); iterator.hasNext(); ) {
axisOperation = (AxisOperation) iterator.next();
@@ -208,7 +203,7 @@
class MTOMPolicyExtension implements PolicyExtension {
- boolean setOnce = false;
+ private boolean setOnce = false;
public void addMethodsToStub(Document document, Element element, QName operationName, Policy policy) {
@@ -229,7 +224,7 @@
element.appendChild(optimizeContent);
}
- };
+ }
class EncodePolicyExtension implements PolicyExtension {
public void addMethodsToStub(Document document, Element element, QName operationName, Policy policy) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Thu Jun 1 23:55:03 2006
@@ -1,5 +1,6 @@
package org.apache.axis2.wsdl.codegen.extension;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -25,7 +26,7 @@
*/
public class SchemaUnwrapperExtension extends AbstractCodeGenerationExtension {
- public void engage() throws CodeGenerationException {
+ public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
if (!configuration.isParametersWrapped()){
// //unwrap the schema since we are told to do so
// SchemaUnwrapper.unwrap(configuration.getWom());
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java Thu Jun 1 23:55:03 2006
@@ -33,7 +33,7 @@
/**
*
*/
- public void engage() {
+ public void engage(CodeGenConfiguration configuration) {
//test the databinding type. If not just fall through
if (testFallThrough(configuration.getDatabindingType())) {
return;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/TypeMapperExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/TypeMapperExtension.java?rev=411068&r1=411067&r2=411068&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/TypeMapperExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/TypeMapperExtension.java Thu Jun 1 23:55:03 2006
@@ -2,16 +2,16 @@
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
+import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -44,7 +44,7 @@
public class TypeMapperExtension implements CodeGenExtension {
- private CodeGenConfiguration configuration;
+
private static final String MAPPING_ELEMENT_NAME = "mapping";
private static final String NAMESPACE_ATTRIBUTE_NAME = "namespace";
@@ -52,19 +52,12 @@
private static final String VALUE_ELEMENT_NAME = "value";
private static final String DB_FRAMEWORK_ATTRIBUTE_NAME = "dbf";
- /**
- * Initialize the entension
- * @param configuration
- */
- public void init(CodeGenConfiguration configuration) {
- this.configuration = configuration;
- }
/**
*
* @throws CodeGenerationException
*/
- public void engage() throws CodeGenerationException {
+ public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
if (configuration.getTypeMappingFile()!=null){
//a type mapping is present. try building the
//mapping from it
@@ -79,7 +72,7 @@
}
//read the file as a DOM
- Document mappingDocument = buildDocument();
+ Document mappingDocument = buildDocument(configuration);
Element rootMappingsElement = mappingDocument.getDocumentElement();
//override the databinding framework name. If a mapping file is
@@ -124,7 +117,7 @@
* @return
* @throws CodeGenerationException
*/
- private Document buildDocument() throws CodeGenerationException {
+ private Document buildDocument(CodeGenConfiguration configuration) throws CodeGenerationException {
try {
DocumentBuilderFactory documentBuilderFactory
= DocumentBuilderFactory.newInstance();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java?rev=411068&r1=411067&r2=411068&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 Thu Jun 1 23:55:03 2006
@@ -16,6 +16,7 @@
package org.apache.axis2.wsdl.codegen.extension;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
import org.apache.ws.commons.schema.XmlSchema;
@@ -24,7 +25,7 @@
public class WSDLValidatorExtension extends AbstractCodeGenerationExtension {
- public void engage() throws CodeGenerationException {
+ public void engage(CodeGenConfiguration configuration) throws CodeGenerationException {
//WSDLDescription wom = this.configuration.getWom();
List schemaList = configuration.getAxisService().getSchema();
if (schemaList == null || schemaList.isEmpty()) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=411068&r1=411067&r2=411068&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 Thu Jun 1 23:55:03 2006
@@ -16,15 +16,6 @@
package org.apache.axis2.wsdl.codegen.extension;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
@@ -32,6 +23,14 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
public class XMLBeansExtension extends AbstractDBProcessingExtension {
public static final String SCHEMA_FOLDER = "schemas";
@@ -52,7 +51,7 @@
boolean debug = false;
- public void engage() {
+ public void engage(CodeGenConfiguration configuration) {
//test the databinding type. If not just fall through
if (testFallThrough(configuration.getDatabindingType())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org