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 2005/07/11 17:49:55 UTC
svn commit: r210150 [22/35] - in /webservices/axis/trunk/java: ./ etc/
modules/addressing/
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/addressing/test-resources/
modules/addressing/test/org/apache/axis2/handlers/addressing/ mod...
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java Mon Jul 11 08:49:30 2005
@@ -1,19 +1,15 @@
package org.apache.axis.tool.service.swing.ui;
+import org.apache.axis.tool.service.bean.Page3Bean;
+import org.apache.axis.tool.service.bean.WizardBean;
+import org.apache.axis.tool.util.Constants;
+
+import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-
-import org.apache.axis.tool.service.bean.Page3Bean;
-import org.apache.axis.tool.service.bean.WizardBean;
-import org.apache.axis.tool.util.Constants;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -30,7 +26,7 @@
* limitations under the License.
*/
-public class WizardPane3 extends WizardPane{
+public class WizardPane3 extends WizardPane {
private Page3Bean myBean;
@@ -44,11 +40,11 @@
public WizardPane3(WizardBean bean, JFrame ownerFrame) {
super(ownerFrame);
init();
- if (bean.getPage3bean()!=null){
+ if (bean.getPage3bean() != null) {
this.myBean = bean.getPage3bean();
setBeanValues();
- }else{
- this.myBean = new Page3Bean();
+ } else {
+ this.myBean = new Page3Bean();
bean.setPage3bean(myBean);
}
}
@@ -56,50 +52,54 @@
public boolean validateValues() {
String text1 = myBean.getOutputFileName();
String text2 = myBean.getOutputFolderName();
- boolean text1Validity = (text1!=null && text1.trim().length()>0);
- boolean text2Validity = (text2!=null && text2.trim().length()>0);
+ boolean text1Validity = (text1 != null && text1.trim().length() > 0);
+ boolean text2Validity = (text2 != null && text2.trim().length() > 0);
return text1Validity && text2Validity;
}
- private void setBeanValues(){
+ private void setBeanValues() {
this.outputFileLocationTextBox.setText(myBean.getOutputFolderName());
this.outputFileNameTextBox.setText(myBean.getOutputFileName());
}
- private void init(){
+ private void init() {
this.setLayout(null);
- this.setSize(width,height);
+ this.setSize(width, height);
initDescription("\nInput the location for the output file and the name for \n" +
- "the compiled jar file " );
+ "the compiled jar file ");
this.outputFileLocationLabel = new JLabel("Output Folder");
this.add(this.outputFileLocationLabel);
- this.outputFileLocationLabel.setBounds(hgap,descHeight,Constants.UIConstants.LABEL_WIDTH,Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileLocationLabel.setBounds(hgap, descHeight, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.outputFileLocationTextBox = new JTextField();
this.add(this.outputFileLocationTextBox);
- this.outputFileLocationTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2*hgap ,descHeight,Constants.UIConstants.TEXT_BOX_WIDTH,Constants.UIConstants.GENERAL_COMP_HEIGHT);
- this.outputFileLocationTextBox.addActionListener(new ActionListener(){
+ this.outputFileLocationTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, descHeight, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileLocationTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleLocationChange();
}
});
- this.outputFileLocationTextBox.addKeyListener(new KeyListener(){
- public void keyTyped(KeyEvent e) { }
+ this.outputFileLocationTextBox.addKeyListener(new KeyListener() {
+ public void keyTyped(KeyEvent e) {
+ }
+
public void keyPressed(KeyEvent e) {
handleLocationChange();
}
- public void keyReleased(KeyEvent e) {}
+
+ public void keyReleased(KeyEvent e) {
+ }
});
this.browseButton = new JButton(".");
this.add(this.browseButton);
- this.browseButton.setBounds(Constants.UIConstants.LABEL_WIDTH + 2*hgap +Constants.UIConstants.TEXT_BOX_WIDTH,descHeight,Constants.UIConstants.BROWSE_BUTTON_WIDTH,Constants.UIConstants.GENERAL_COMP_HEIGHT);
- this.browseButton.addActionListener(new ActionListener(){
+ this.browseButton.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap + Constants.UIConstants.TEXT_BOX_WIDTH, descHeight, Constants.UIConstants.BROWSE_BUTTON_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.browseButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
outputFileLocationTextBox.setText(browseForAFolder());
handleLocationChange();
@@ -108,32 +108,37 @@
});
-
this.outputFileNameLabel = new JLabel("Out File Name");
this.add(this.outputFileNameLabel);
- this.outputFileNameLabel.setBounds(hgap,descHeight +Constants.UIConstants.GENERAL_COMP_HEIGHT +vgap,Constants.UIConstants.LABEL_WIDTH,Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileNameLabel.setBounds(hgap, descHeight + Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.outputFileNameTextBox = new JTextField();
this.add(this.outputFileNameTextBox);
- this.outputFileNameTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2*hgap ,descHeight+Constants.UIConstants.GENERAL_COMP_HEIGHT +vgap,Constants.UIConstants.TEXT_BOX_WIDTH,Constants.UIConstants.GENERAL_COMP_HEIGHT);
- this.outputFileNameTextBox.addActionListener(new ActionListener(){
+ this.outputFileNameTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, descHeight + Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileNameTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleFileNameChange();
}
});
- this.outputFileNameTextBox.addKeyListener(new KeyListener(){
- public void keyTyped(KeyEvent e) { }
- public void keyPressed(KeyEvent e) { }
- public void keyReleased(KeyEvent e) { handleFileNameChange();}
+ this.outputFileNameTextBox.addKeyListener(new KeyListener() {
+ public void keyTyped(KeyEvent e) {
+ }
+
+ public void keyPressed(KeyEvent e) {
+ }
+
+ public void keyReleased(KeyEvent e) {
+ handleFileNameChange();
+ }
});
}
- private void handleLocationChange(){
+ private void handleLocationChange() {
myBean.setOutputFolderName(outputFileLocationTextBox.getText());
}
- private void handleFileNameChange(){
+ private void handleFileNameChange() {
myBean.setOutputFileName(outputFileNameTextBox.getText());
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/util/Constants.java Mon Jul 11 08:49:30 2005
@@ -15,14 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
public class Constants {
- public class UIConstants{
- public static final int LABEL_WIDTH=100;
- public static final int RADIO_BUTTON_WIDTH=200;
- public static final int TEXT_BOX_WIDTH=250;
- public static final int BROWSE_BUTTON_WIDTH=20;
- public static final int GENERAL_BUTTON_WIDTH=80;
+ public class UIConstants {
+ public static final int LABEL_WIDTH = 100;
+ public static final int RADIO_BUTTON_WIDTH = 200;
+ public static final int TEXT_BOX_WIDTH = 250;
+ public static final int BROWSE_BUTTON_WIDTH = 20;
+ public static final int GENERAL_BUTTON_WIDTH = 80;
- public static final int GENERAL_COMP_HEIGHT=20;
+ public static final int GENERAL_COMP_HEIGHT = 20;
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/project.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/project.xml (original)
+++ webservices/axis/trunk/java/modules/wsdl/project.xml Mon Jul 11 08:49:30 2005
@@ -17,54 +17,54 @@
*/
-->
<project>
- <pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
- <id>axis2-wsdl</id>
- <name>wsdl</name>
- <description>WSDL Parts of Axis 2.0. This includes WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</description>
- <dependencies>
- <dependency>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+ <id>axis2-wsdl</id>
+ <name>wsdl</name>
+ <description>WSDL Parts of Axis 2.0. This includes WSDL Object Model built based on the proposed WSDL 2.0 Component Model.</description>
+ <dependencies>
+ <dependency>
<groupId>axis</groupId>
<artifactId>axis2-xml</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
- <!-- external JARs -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.1.1-dev</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- <properties>
- <module>true</module>
- </properties>
- <url>http://dist.codehaus.org/stax/jars/</url>
- </dependency>
- <dependency>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1-dev</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
<version>1.2</version>
@@ -72,16 +72,16 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.0.0-beta1</version>
- <type>jar</type>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- </dependencies>
-
- <reports/>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.0.0-beta1</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+
+ <reports/>
</project>
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java Mon Jul 11 08:49:30 2005
@@ -4,15 +4,15 @@
import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
import org.apache.axis2.wsdl.codegen.CommandLineOptionParser;
- /**
+/**
* Copyright 2004,2005 The Apache Software Foundation.
- *
+ * <p/>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,37 +20,35 @@
* limitations under the License.
*/
public class WSDL2Code {
-
-
- public static void main(String[] args) throws Exception{
- CommandLineOptionParser commandLineOptionParser = new CommandLineOptionParser(args);
- validateCommandLineOptions(commandLineOptionParser);
- new CodeGenerationEngine(commandLineOptionParser).generate();
-
- }
-
- private static void printUsage(){
- System.out.println("Usage WSDL2Code -uri <Location of WSDL> :WSDL file location ");
- System.out.println("-o <output Location> : output file location ");
- System.out.println("-a : Generate async style code only. Default if off");
- System.out.println("-s : Generate sync style code only. Default if off. takes precedence over -a");
- System.out.println("-p <package name> : set custom package name");
- System.out.println("-l <language> : valid languages are java and csharp. Default is java");
- System.out.println("-t : Generate TestCase to test the generated code");
- System.out.println("-ss : Generate server side code (i.e. skeletons).Default is off");
- System.out.println("-sd : Generate service descriptor (i.e. axis2.xml).Default is off.Valid with -ss ");
- System.exit(0);
- }
-
-
-
- private static void validateCommandLineOptions(CommandLineOptionParser parser){
- if(parser.getInvalidOptions().size()>0)
- printUsage();
- if(null == parser.getAllOptions().get(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION))
- printUsage();
- }
-
-
+
+
+ public static void main(String[] args) throws Exception {
+ CommandLineOptionParser commandLineOptionParser = new CommandLineOptionParser(args);
+ validateCommandLineOptions(commandLineOptionParser);
+ new CodeGenerationEngine(commandLineOptionParser).generate();
+
+ }
+
+ private static void printUsage() {
+ System.out.println("Usage WSDL2Code -uri <Location of WSDL> :WSDL file location ");
+ System.out.println("-o <output Location> : output file location ");
+ System.out.println("-a : Generate async style code only. Default if off");
+ System.out.println("-s : Generate sync style code only. Default if off. takes precedence over -a");
+ System.out.println("-p <package name> : set custom package name");
+ System.out.println("-l <language> : valid languages are java and csharp. Default is java");
+ System.out.println("-t : Generate TestCase to test the generated code");
+ System.out.println("-ss : Generate server side code (i.e. skeletons).Default is off");
+ System.out.println("-sd : Generate service descriptor (i.e. axis2.xml).Default is off.Valid with -ss ");
+ System.exit(0);
+ }
+
+
+ private static void validateCommandLineOptions(CommandLineOptionParser parser) {
+ if (parser.getInvalidOptions().size() > 0)
+ printUsage();
+ if (null == parser.getAllOptions().get(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION))
+ printUsage();
+ }
+
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Java.java Mon Jul 11 08:49:30 2005
@@ -17,8 +17,9 @@
*
*
*/
+
public class WSDL2Java {
- public static void main(String[] args) throws Exception{
+ public static void main(String[] args) throws Exception {
WSDL2Code.main(args);
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java Mon Jul 11 08:49:30 2005
@@ -22,38 +22,38 @@
/**
* @author chathura@opensource.lk
- *
*/
public class WSDLVersionWrapper {
-
- private Definition definition;
-
- private WSDLDescription description;
-
-
-
- /**
- *
- * @param description WSDL 2.0 WOM description
- * @param definition WSDL 1.1 WSDL4J based <code>Definition</code>
- */
- public WSDLVersionWrapper(WSDLDescription description, Definition definition) {
- this.definition = definition;
- this.description = description;
- }
-
- /**
- * Returns the WSDL 1.1 Definition
- * @return <code>DEfinition</code>
- */
- public Definition getDefinition() {
- return definition;
- }
- /**
- * Returns a WOM description
- * @return <code>WSDLDescription</code>
- */
- public WSDLDescription getDescription() {
- return description;
- }
+
+ private Definition definition;
+
+ private WSDLDescription description;
+
+
+ /**
+ * @param description WSDL 2.0 WOM description
+ * @param definition WSDL 1.1 WSDL4J based <code>Definition</code>
+ */
+ public WSDLVersionWrapper(WSDLDescription description, Definition definition) {
+ this.definition = definition;
+ this.description = description;
+ }
+
+ /**
+ * Returns the WSDL 1.1 Definition
+ *
+ * @return <code>DEfinition</code>
+ */
+ public Definition getDefinition() {
+ return definition;
+ }
+
+ /**
+ * Returns a WOM description
+ *
+ * @return <code>WSDLDescription</code>
+ */
+ public WSDLDescription getDescription() {
+ return description;
+ }
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java Mon Jul 11 08:49:30 2005
@@ -26,6 +26,6 @@
public interface WOMBuilder {
public WSDLVersionWrapper build(InputStream in) throws WSDLException;
-
- public WSDLVersionWrapper build (InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
+
+ public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java Mon Jul 11 08:49:30 2005
@@ -28,9 +28,9 @@
public WSDLVersionWrapper build(InputStream in) throws WSDLException {
throw new UnsupportedOperationException("Not Implemented");
}
-
- public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponenetFactory)throws WSDLException{
- throw new UnsupportedOperationException("Not Implemented");
-
+
+ public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponenetFactory) throws WSDLException {
+ throw new UnsupportedOperationException("Not Implemented");
+
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java Mon Jul 11 08:49:30 2005
@@ -5,109 +5,102 @@
/**
* @author chathura@opensource.lk
- *
*/
public interface WSDLComponentFactory {
- /**
- * @return A new instance of type <code>WSDLDescription</code>
- */
- public WSDLDescription createDescription();
-
- /**
- * @return A new instance of type <code>WSDLService</code>
- */
- public WSDLService createService();
-
- /**
- * @return A new instance of type <code>WSDLInterface</code>
- */
- public WSDLInterface createInterface();
-
- /**
- * @return A new instance of type <code>WSDLTypes</code>
- */
- public WSDLTypes createTypes();
-
- /**
- * @return A new instance of type <code>WSDLBinding</code>
- */
- public WSDLBinding createBinding();
-
- /**
- * @return A new instance of type <code>WSDLOperation</code>
- */
- public WSDLOperation createOperation();
-
- /**
- * @return A new instance of type <code>WSDLEndpoint</code>
- */
- public WSDLEndpoint createEndpoint();
-
- /**
- * @return A new instance of type <code>WSDLFault</code>
- */
- public WSDLFaultReference createFaultReference();
-
- /**
- * @return A new instance of type <code>WSDLFeature</code>
- */
- public WSDLFeature createFeature();
-
- /**
- * @return A new instance of type <code>WSDLImport</code>
- */
- public WSDLImport createImport();
-
- /**
- * @return A new instance of type <code>WSDLInclude</code>
- */
- public WSDLInclude createInclude();
-
- /**
- * Method createProperty
- *
- * @return A new instance of <code>WSDLProperty</code>
- */
- public WSDLProperty createProperty();
-
- /**
- *
- * @return A new instance of <code>MessageReference</code>
- */
- public MessageReference createMessageReference();
-
- /**
- *
- * @return A new instance of <code>WSDLBindingMessageReference</code>
- */
- public WSDLBindingMessageReference createWSDLBindingMessageReference();
-
- /**
- *
- * @return A new instance of <code>WSDLBindingOperation</code>
- */
- public WSDLBindingOperation createWSDLBindingOperation();
-
-
- /**
- *
- * @return A new instance of <code>WSDLExtensibilityAttribute</code>
- */
- public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute();
-
- /**
- *
- * @return A new instance of <code>WSDLBindingFault</code>
- */
- public WSDLBindingFault createBindingFault();
-
- /**
- *
- * @return A new Instance of <code>ExtensionFactory</code> that
- * is capable of creating the correct <code>ExtensibilityElement</code>
- * given a <code>QName</code>.
- */
- public ExtensionFactory createExtensionFactory();
+ /**
+ * @return A new instance of type <code>WSDLDescription</code>
+ */
+ public WSDLDescription createDescription();
+
+ /**
+ * @return A new instance of type <code>WSDLService</code>
+ */
+ public WSDLService createService();
+
+ /**
+ * @return A new instance of type <code>WSDLInterface</code>
+ */
+ public WSDLInterface createInterface();
+
+ /**
+ * @return A new instance of type <code>WSDLTypes</code>
+ */
+ public WSDLTypes createTypes();
+
+ /**
+ * @return A new instance of type <code>WSDLBinding</code>
+ */
+ public WSDLBinding createBinding();
+
+ /**
+ * @return A new instance of type <code>WSDLOperation</code>
+ */
+ public WSDLOperation createOperation();
+
+ /**
+ * @return A new instance of type <code>WSDLEndpoint</code>
+ */
+ public WSDLEndpoint createEndpoint();
+
+ /**
+ * @return A new instance of type <code>WSDLFault</code>
+ */
+ public WSDLFaultReference createFaultReference();
+
+ /**
+ * @return A new instance of type <code>WSDLFeature</code>
+ */
+ public WSDLFeature createFeature();
+
+ /**
+ * @return A new instance of type <code>WSDLImport</code>
+ */
+ public WSDLImport createImport();
+
+ /**
+ * @return A new instance of type <code>WSDLInclude</code>
+ */
+ public WSDLInclude createInclude();
+
+ /**
+ * Method createProperty
+ *
+ * @return A new instance of <code>WSDLProperty</code>
+ */
+ public WSDLProperty createProperty();
+
+ /**
+ * @return A new instance of <code>MessageReference</code>
+ */
+ public MessageReference createMessageReference();
+
+ /**
+ * @return A new instance of <code>WSDLBindingMessageReference</code>
+ */
+ public WSDLBindingMessageReference createWSDLBindingMessageReference();
+
+ /**
+ * @return A new instance of <code>WSDLBindingOperation</code>
+ */
+ public WSDLBindingOperation createWSDLBindingOperation();
+
+
+ /**
+ * @return A new instance of <code>WSDLExtensibilityAttribute</code>
+ */
+ public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute();
+
+ /**
+ * @return A new instance of <code>WSDLBindingFault</code>
+ */
+ public WSDLBindingFault createBindingFault();
+
+ /**
+ * @return A new Instance of <code>ExtensionFactory</code> that
+ * is capable of creating the correct <code>ExtensibilityElement</code>
+ * given a <code>QName</code>.
+ */
+ public ExtensionFactory createExtensionFactory();
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL11MEPFinder.java Mon Jul 11 08:49:30 2005
@@ -23,11 +23,10 @@
/**
* @author chathura@opensource.lk
- *
*/
public class WSDL11MEPFinder {
- public static String getMEP(Operation operation){
+ public static String getMEP(Operation operation) {
// boolean inMessageExist = false, outMessageExist = false;
// if(null != operation.getInput()){
// inMessageExist = true;
@@ -47,9 +46,9 @@
// if(!inMessageExist && outMessageExist){
// return WSDLConstants.MEP_URI_OUT_ONLY;
// }
-//
- OperationType operationType = operation.getStyle();
- if (null != operationType) {
+//
+ OperationType operationType = operation.getStyle();
+ if (null != operationType) {
if (operationType.equals(OperationType.REQUEST_RESPONSE))
return WSDLConstants.MEP_URI_IN_OUT;
@@ -63,7 +62,7 @@
if (operationType.equals(OperationType.SOLICIT_RESPONSE))
return WSDLConstants.MEP_URI_OUT_IN;
}
- throw new WSDLProcessingException("Cannot Determine the MEP");
-
- }
+ throw new WSDLProcessingException("Cannot Determine the MEP");
+
+ }
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java Mon Jul 11 08:49:30 2005
@@ -42,21 +42,21 @@
WSDLDescription wsdlDescription = new WSDLDescriptionImpl();
Definition wsdl1Definition = this.readInTheWSDLFile(in);
- WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
+ WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
pump.pump();
return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
}
-
- public WSDLVersionWrapper build (InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException{
- WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
+
+ public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
+ WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
Definition wsdl1Definition = this.readInTheWSDLFile(in);
- WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition, wsdlComponentFactory);
+ WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition, wsdlComponentFactory);
pump.pump();
return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
-
+
}
private Definition readInTheWSDLFile(InputStream in) throws WSDLException {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java Mon Jul 11 08:49:30 2005
@@ -72,7 +72,7 @@
public void pump() {
if (null != this.wsdl4jParsedDefinition && null != this.womDefinition) {
this.populateDefinition(this.womDefinition,
- this.wsdl4jParsedDefinition);
+ this.wsdl4jParsedDefinition);
} else {
throw new WSDLProcessingException("Properties not set properly");
}
@@ -109,7 +109,7 @@
this.copyExtensibleElements(wsdl4jTypes.getExtensibilityElements(),
- wsdlTypes);
+ wsdlTypes);
this.womDefinition.setTypes(wsdlTypes);
}
@@ -128,7 +128,7 @@
portType = (PortType) portTypeIterator.next();
this.populateInterfaces(wsdlInterface, portType);
this.copyExtensibilityAttribute(portType.getExtensionAttributes(),
- wsdlInterface);
+ wsdlInterface);
wsdlDefinition.addInterface(wsdlInterface);
}
@@ -146,7 +146,7 @@
wsdl4jBinding = (Binding) bindingIterator.next();
this.populateBindings(wsdlBinding, wsdl4jBinding);
this.copyExtensibleElements(wsdl4jBinding.getExtensibilityElements(),
- wsdlBinding);
+ wsdlBinding);
wsdlDefinition.addBinding(wsdlBinding);
}
@@ -162,7 +162,7 @@
wsdl4jService = (Service) serviceIterator.next();
this.populateServices(wsdlService, wsdl4jService);
this.copyExtensibleElements(wsdl4jService.getExtensibilityElements(),
- wsdlService);
+ wsdlService);
wsdlDefinition.addService(wsdlService);
}
@@ -195,8 +195,8 @@
wsdloperation = this.wsdlComponenetFactory.createOperation();
wsdl4jOperation = (Operation) wsdl4JOperationsIterator.next();
this.populateOperations(wsdloperation,
- wsdl4jOperation,
- wsdl4jPortType.getQName().getNamespaceURI());
+ wsdl4jOperation,
+ wsdl4jPortType.getQName().getNamespaceURI());
this.copyExtensibleElements(wsdl4jOperation.getExtensibilityElements(), wsdloperation);
wsdlInterface.setOperation(wsdloperation);
}
@@ -214,9 +214,8 @@
//FIXME Do We need this eventually???
if (null == wsdlInterface)
- throw new WSDLProcessingException(
- "Interface/PortType not found for the Binding :"
- + wsdlBinding.getName());
+ throw new WSDLProcessingException("Interface/PortType not found for the Binding :"
+ + wsdlBinding.getName());
wsdlBinding.setBoundInterface(wsdlInterface);
Iterator bindingoperationsIterator =
wsdl4JBinding.getBindingOperations().iterator();
@@ -226,16 +225,13 @@
wsdlBindingOperation =
this.wsdlComponenetFactory.createWSDLBindingOperation();
wsdl4jBindingOperation =
- (BindingOperation)bindingoperationsIterator.next();
+ (BindingOperation) bindingoperationsIterator.next();
this.populateBindingOperation(wsdlBindingOperation,
- wsdl4jBindingOperation,
- wsdl4JBinding.getQName().getNamespaceURI());
- wsdlBindingOperation.setOperation(
- wsdlInterface.getOperation(wsdl4jBindingOperation.getOperation().getName())
- );
- this.copyExtensibleElements(
- wsdl4jBindingOperation.getExtensibilityElements(),
- wsdlBindingOperation);
+ wsdl4jBindingOperation,
+ wsdl4JBinding.getQName().getNamespaceURI());
+ wsdlBindingOperation.setOperation(wsdlInterface.getOperation(wsdl4jBindingOperation.getOperation().getName()));
+ this.copyExtensibleElements(wsdl4jBindingOperation.getExtensibilityElements(),
+ wsdlBindingOperation);
wsdlBinding.addBindingOperation(wsdlBindingOperation);
}
@@ -252,10 +248,10 @@
wsdlEndpoint = this.wsdlComponenetFactory.createEndpoint();
wsdl4jPort = (Port) wsdl4jportsIterator.next();
this.populatePorts(wsdlEndpoint,
- wsdl4jPort,
- wsdl4jService.getQName().getNamespaceURI());
+ wsdl4jPort,
+ wsdl4jService.getQName().getNamespaceURI());
this.copyExtensibleElements(wsdl4jPort.getExtensibilityElements(),
- wsdlEndpoint);
+ wsdlEndpoint);
wsdlService.setEndpoint(wsdlEndpoint);
}
@@ -267,50 +263,46 @@
Operation wsdl4jOperation, String nameSpaceOfTheOperation) {
//Copy Name Attrebute
wsdlOperation.setName(new QName(nameSpaceOfTheOperation,
- wsdl4jOperation.getName()));
+ wsdl4jOperation.getName()));
//This code make no attempt to make use of the special xs:Token
//defined in the WSDL 2.0. eg like #any, #none
// Create the Input Message and add
Input wsdl4jInputMessage = wsdl4jOperation.getInput();
- if(null != wsdl4jInputMessage){
+ if (null != wsdl4jInputMessage) {
MessageReference wsdlInputMessage = this.wsdlComponenetFactory
.createMessageReference();
wsdlInputMessage.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
wsdlInputMessage.setMessageLabel(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
-
+
Message message = wsdl4jInputMessage.getMessage();
- if(null != message){
- wsdlInputMessage.setElement(this.generateReferenceQname(message));
- this.copyExtensibleElements(
- (message).getExtensibilityElements(),
- wsdlInputMessage
- );
+ if (null != message) {
+ wsdlInputMessage.setElement(this.generateReferenceQname(message));
+ this.copyExtensibleElements((message).getExtensibilityElements(),
+ wsdlInputMessage);
}
this.copyExtensibilityAttribute(wsdl4jInputMessage.getExtensionAttributes(),
- wsdlInputMessage);
+ wsdlInputMessage);
wsdlOperation.setInputMessage(wsdlInputMessage);
}
//Create an output message and add
Output wsdl4jOutputMessage = wsdl4jOperation.getOutput();
- if(null != wsdl4jOutputMessage){
+ if (null != wsdl4jOutputMessage) {
MessageReference wsdlOutputMessage =
this.wsdlComponenetFactory.createMessageReference();
wsdlOutputMessage.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
wsdlOutputMessage.setMessageLabel(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
Message outputMessage = wsdl4jOutputMessage.getMessage();
- if(null != outputMessage){
- wsdlOutputMessage.setElement(this.generateReferenceQname(outputMessage));
- this.copyExtensibleElements(
- (outputMessage).getExtensibilityElements(),
- wsdlOutputMessage
- );
+ if (null != outputMessage) {
+ wsdlOutputMessage.setElement(this.generateReferenceQname(outputMessage));
+ this.copyExtensibleElements((outputMessage).getExtensibilityElements(),
+ wsdlOutputMessage);
}
this.copyExtensibilityAttribute(wsdl4jOutputMessage.getExtensionAttributes(),
- wsdlOutputMessage);
+ wsdlOutputMessage);
wsdlOperation.setOutputMessage(wsdlOutputMessage);
}
@@ -318,14 +310,14 @@
Iterator faultKeyIterator = faults.keySet().iterator();
WSDLFaultReference faultReference = null;
- while(faultKeyIterator.hasNext()){
+ while (faultKeyIterator.hasNext()) {
- Fault fault = (Fault)faults.get(faultKeyIterator.next());
+ Fault fault = (Fault) faults.get(faultKeyIterator.next());
faultReference = wsdlComponenetFactory.createFaultReference();
faultReference.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
Message faultMessage = fault.getMessage();
- if(null != faultMessage){
- faultReference.setRef(this.generateReferenceQname(faultMessage));
+ if (null != faultMessage) {
+ faultReference.setRef(this.generateReferenceQname(faultMessage));
}
wsdlOperation.addOutFault(faultReference);
this.copyExtensibilityAttribute(fault.getExtensionAttributes(), faultReference);
@@ -335,49 +327,50 @@
//Set the MEP
wsdlOperation.setMessageExchangePattern(WSDL11MEPFinder
- .getMEP(wsdl4jOperation));
+ .getMEP(wsdl4jOperation));
}
- private QName generateReferenceQname(Message wsdl4jMessage){
- QName referenceQName = null;
- if (wsdl4jMessage.getParts().size() > 1){
+
+ private QName generateReferenceQname(Message wsdl4jMessage) {
+ QName referenceQName = null;
+ if (wsdl4jMessage.getParts().size() > 1) {
// Multipart Message
// Check whether this message parts have been made to a type
Iterator multipartListIterator = this.resolvedMultipartMessageList.iterator();
boolean multipartAlreadyResolved = false;
- while(multipartListIterator.hasNext() && !multipartAlreadyResolved){
- QName temp = (QName)multipartListIterator.next();
+ while (multipartListIterator.hasNext() && !multipartAlreadyResolved) {
+ QName temp = (QName) multipartListIterator.next();
multipartAlreadyResolved = wsdl4jMessage.getQName().equals(temp);
}
- if(multipartAlreadyResolved){
+ if (multipartAlreadyResolved) {
//This message with multiple parts has resolved and a new type has been
//made out of it earlier.
//FIXME Actual element name should it be xs:, if yes change the qname added to the
//resolvedmessage list too.
referenceQName = wsdl4jMessage.getQName();
- }else{
+ } else {
//Get the list of multiparts of the message and create a new Element
//out of it and add it to the schema.
Map parts = wsdl4jMessage.getParts();
Element element = null;
WSDLTypes types = womDefinition.getTypes();
- if(null == types){
+ if (null == types) {
XmlDocument newDoc = new XmlDocument();
Element schemaElement = newDoc.createElement("schema");//http://www.w3.org/2001/XMLSchema
- types =wsdlComponenetFactory.createTypes();
+ types = wsdlComponenetFactory.createTypes();
ExtensionFactory extensionFactory = wsdlComponenetFactory.createExtensionFactory();
- org.apache.wsdl.extensions.Schema typesElement = (org.apache.wsdl.extensions.Schema)extensionFactory.getExtensionElement(ExtensionConstants.SCHEMA);
+ org.apache.wsdl.extensions.Schema typesElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(ExtensionConstants.SCHEMA);
typesElement.setElelment(schemaElement);
types.addExtensibilityElement(typesElement);
this.womDefinition.setTypes(types);
}
Iterator schemaEIIterator = types.getExtensibilityElements().iterator();
- while(schemaEIIterator.hasNext()){
- WSDLExtensibilityElement temp = (WSDLExtensibilityElement)schemaEIIterator.next();
- if(ExtensionConstants.SCHEMA.equals(temp.getType())){
- element = ((org.apache.wsdl.extensions.Schema)temp).getElelment();
+ while (schemaEIIterator.hasNext()) {
+ WSDLExtensibilityElement temp = (WSDLExtensibilityElement) schemaEIIterator.next();
+ if (ExtensionConstants.SCHEMA.equals(temp.getType())) {
+ element = ((org.apache.wsdl.extensions.Schema) temp).getElelment();
break;
}
}
@@ -390,17 +383,17 @@
Element cmplxContent = doc.createElement("complexContent");
Element child;
Iterator iterator = parts.keySet().iterator();
- while(iterator.hasNext()){
- Part part = (Part)parts.get(iterator.next());
+ while (iterator.hasNext()) {
+ Part part = (Part) parts.get(iterator.next());
QName elementName = part.getElementName();
- if(null == elementName){
+ if (null == elementName) {
elementName = part.getTypeName();
}
child = doc.createElement("element");
- child.setAttribute("name", "var"+elementName.getLocalPart());
- child.setAttribute("type", elementName.getNamespaceURI()+":"+elementName.getLocalPart());
+ child.setAttribute("name", "var" + elementName.getLocalPart());
+ child.setAttribute("type", elementName.getNamespaceURI() + ":" + elementName.getLocalPart());
cmplxContent.appendChild(child);
}
@@ -419,7 +412,7 @@
this.resolvedMultipartMessageList.add(wsdl4jMessage.getQName());
}
- }else{
+ } else {
//Only one part so copy the QName of the referenced type.
Iterator outputIterator =
wsdl4jMessage.getParts().values().iterator();
@@ -436,41 +429,40 @@
return referenceQName;
}
- private void populateBindingOperation(
- WSDLBindingOperation wsdlBindingOperation,
- BindingOperation wsdl4jBindingOperation,
- String nameSpaceOfTheBindingOperation) {
+ private void populateBindingOperation(WSDLBindingOperation wsdlBindingOperation,
+ BindingOperation wsdl4jBindingOperation,
+ String nameSpaceOfTheBindingOperation) {
wsdlBindingOperation.setName(new QName(nameSpaceOfTheBindingOperation,
- wsdl4jBindingOperation.getName()));
+ wsdl4jBindingOperation.getName()));
BindingInput wsdl4jInputBinding =
wsdl4jBindingOperation.getBindingInput();
- if(null != wsdl4jInputBinding){
+ if (null != wsdl4jInputBinding) {
WSDLBindingMessageReference wsdlInputBinding =
this.wsdlComponenetFactory.createWSDLBindingMessageReference();
wsdlInputBinding.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
this.copyExtensibleElements(wsdl4jInputBinding.getExtensibilityElements(),
- wsdlInputBinding);
+ wsdlInputBinding);
wsdlBindingOperation.setInput(wsdlInputBinding);
}
BindingOutput wsdl4jOutputBinding = wsdl4jBindingOperation
.getBindingOutput();
- if(null != wsdl4jOutputBinding){
+ if (null != wsdl4jOutputBinding) {
WSDLBindingMessageReference wsdlOutputBinding = this.wsdlComponenetFactory
.createWSDLBindingMessageReference();
wsdlOutputBinding.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
-
+
this.copyExtensibleElements(wsdl4jOutputBinding.getExtensibilityElements(),
- wsdlOutputBinding);
+ wsdlOutputBinding);
wsdlBindingOperation.setOutput(wsdlOutputBinding);
}
Map bindingFaults = wsdl4jBindingOperation.getBindingFaults();
Iterator keyIterator = bindingFaults.keySet().iterator();
- while(keyIterator.hasNext()){
- BindingFault bindingFault = (BindingFault)bindingFaults.get(keyIterator.next());
+ while (keyIterator.hasNext()) {
+ BindingFault bindingFault = (BindingFault) bindingFaults.get(keyIterator.next());
WSDLBindingFault womBindingFault = this.wsdlComponenetFactory.createBindingFault();
this.copyExtensibleElements(bindingFault.getExtensibilityElements(), womBindingFault);
wsdlBindingOperation.addOutFault(womBindingFault);
@@ -483,7 +475,7 @@
wsdlEndpoint.setName(new QName(targetNamspace, wsdl4jPort.getName()));
wsdlEndpoint.setBinding(this.womDefinition.getBinding(wsdl4jPort
- .getBinding().getQName()));
+ .getBinding().getQName()));
}
@@ -495,7 +487,7 @@
* Porttype exist in the WSDl 1.1 file this will create a dummy Interface
* with the available PortTypes and will return that interface so that it
* will inherit all those interfaces.
- *
+ * <p/>
* Eventuall this will have to be fixed using user input since
*
* @param service
@@ -505,10 +497,9 @@
// Throw an exception if there are no interfaces defined as at yet.
if (0 == this.womDefinition.getWsdlInterfaces().size())
- throw new WSDLProcessingException(
- "There are no "
- + "Interfaces/PortTypes identified in the current partially built"
- + "WOM");
+ throw new WSDLProcessingException("There are no "
+ + "Interfaces/PortTypes identified in the current partially built"
+ + "WOM");
//If there is only one Interface available hten return that because
// normally
@@ -524,8 +515,8 @@
// and return.
WSDLInterface newBoundInterface = this.womDefinition.createInterface();
newBoundInterface.setName(new QName(service.getNamespace(), service
- .getName().getLocalPart()
- + BOUND_INTERFACE_NAME));
+ .getName().getLocalPart()
+ + BOUND_INTERFACE_NAME));
Iterator interfaceIterator = this.womDefinition.getWsdlInterfaces()
.values().iterator();
while (interfaceIterator.hasNext()) {
@@ -567,52 +558,52 @@
org.apache.wsdl.extensions.SOAPAddress extensibilityElement = (org.apache.wsdl.extensions.SOAPAddress) extensionFactory
.getExtensionElement(soapAddress.getElementType());
extensibilityElement.setLocationURI(soapAddress
- .getLocationURI());
+ .getLocationURI());
Boolean required = soapAddress.getRequired();
if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- }else if(wsdl4jElement instanceof Schema) {
- Schema schema = (Schema)wsdl4jElement;
- org.apache.wsdl.extensions.Schema extensibilityElement = (org.apache.wsdl.extensions.Schema)extensionFactory.getExtensionElement(schema.getElementType());
+ } else if (wsdl4jElement instanceof Schema) {
+ Schema schema = (Schema) wsdl4jElement;
+ org.apache.wsdl.extensions.Schema extensibilityElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(schema.getElementType());
extensibilityElement.setElelment(schema.getElement());
Boolean required = schema.getRequired();
- if(null != required){
+ if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- }else if(SOAPConstants.Q_ELEM_SOAP_OPERATION.equals(wsdl4jElement.getElementType())){
- SOAPOperation soapOperation = (SOAPOperation)wsdl4jElement;
- org.apache.wsdl.extensions.SOAPOperation extensibilityElement = (org.apache.wsdl.extensions.SOAPOperation)extensionFactory.getExtensionElement(soapOperation.getElementType());
+ } else if (SOAPConstants.Q_ELEM_SOAP_OPERATION.equals(wsdl4jElement.getElementType())) {
+ SOAPOperation soapOperation = (SOAPOperation) wsdl4jElement;
+ org.apache.wsdl.extensions.SOAPOperation extensibilityElement = (org.apache.wsdl.extensions.SOAPOperation) extensionFactory.getExtensionElement(soapOperation.getElementType());
extensibilityElement.setSoapAction(soapOperation.getSoapActionURI());
extensibilityElement.setStyle(soapOperation.getStyle());
Boolean required = soapOperation.getRequired();
- if(null != required){
+ if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- }else if(SOAPConstants.Q_ELEM_SOAP_BODY.equals(wsdl4jElement.getElementType())){
- SOAPBody soapBody = (SOAPBody)wsdl4jElement;
- org.apache.wsdl.extensions.SOAPBody extensibilityElement = (org.apache.wsdl.extensions.SOAPBody)extensionFactory.getExtensionElement(soapBody.getElementType());
+ } else if (SOAPConstants.Q_ELEM_SOAP_BODY.equals(wsdl4jElement.getElementType())) {
+ SOAPBody soapBody = (SOAPBody) wsdl4jElement;
+ org.apache.wsdl.extensions.SOAPBody extensibilityElement = (org.apache.wsdl.extensions.SOAPBody) extensionFactory.getExtensionElement(soapBody.getElementType());
extensibilityElement.setNamespaceURI(soapBody.getNamespaceURI());
extensibilityElement.setUse(soapBody.getUse());
Boolean required = soapBody.getRequired();
- if(null != required){
+ if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- }else if(SOAPConstants.Q_ELEM_SOAP_BINDING.equals(wsdl4jElement.getElementType())){
- SOAPBinding soapBinding = (SOAPBinding)wsdl4jElement;
- org.apache.wsdl.extensions.SOAPBinding extensibilityElement = (org.apache.wsdl.extensions.SOAPBinding)extensionFactory.getExtensionElement(soapBinding.getElementType());
+ } else if (SOAPConstants.Q_ELEM_SOAP_BINDING.equals(wsdl4jElement.getElementType())) {
+ SOAPBinding soapBinding = (SOAPBinding) wsdl4jElement;
+ org.apache.wsdl.extensions.SOAPBinding extensibilityElement = (org.apache.wsdl.extensions.SOAPBinding) extensionFactory.getExtensionElement(soapBinding.getElementType());
extensibilityElement.setTransportURI(soapBinding.getTransportURI());
extensibilityElement.setStyle(soapBinding.getStyle());
Boolean required = soapBinding.getRequired();
- if(null != required){
+ if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- }else {
+ } else {
// throw new AxisError(
// "An Extensible item "+wsdl4jElement.getElementType()+" went unparsed during WSDL Parsing");
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Mon Jul 11 08:49:30 2005
@@ -24,25 +24,24 @@
/**
* @author chathura@opensource.lk
- *
*/
public class CodeGenConfiguration implements CommandLineOptionConstants {
- private WSDLDescription wom;
- private CommandLineOptionParser parser;
- private File outputLocation;
+ private WSDLDescription wom;
+ private CommandLineOptionParser parser;
+ private File outputLocation;
private int outputLanguage = XSLTConstants.LanguageTypes.JAVA;
private int databindingType = XSLTConstants.DataBindingTypes.XML_BEANS; //default is XML beans
- private boolean advancedCodeGenEnabled=false;
+ private boolean advancedCodeGenEnabled = false;
- private boolean asyncOn=true;
- private boolean syncOn=true;
- private boolean serverSide=false;
- private boolean generateDeployementDescriptor=true;
- private boolean writeTestCase=false;
+ private boolean asyncOn = true;
+ private boolean syncOn = true;
+ private boolean serverSide = false;
+ private boolean generateDeployementDescriptor = true;
+ private boolean writeTestCase = false;
private boolean writeMessageReceiver = true;
- private String packageName=XSLTConstants.DEFAULT_PACKAGE_NAME;
+ private String packageName = XSLTConstants.DEFAULT_PACKAGE_NAME;
private TypeMapper typeMapper;
@@ -63,79 +62,84 @@
this.databindingType = databindingType;
}
- /**
- * @param wom
- * @param parser
- */
- public CodeGenConfiguration(WSDLDescription wom,
- CommandLineOptionParser parser) {
- this(wom,parser.getAllOptions());
- this.parser = parser;
- }
+ /**
+ * @param wom
+ * @param parser
+ */
+ public CodeGenConfiguration(WSDLDescription wom,
+ CommandLineOptionParser parser) {
+ this(wom, parser.getAllOptions());
+ this.parser = parser;
+ }
- public CodeGenConfiguration(WSDLDescription wom,Map optionMap) {
- this.wom = wom;
+ public CodeGenConfiguration(WSDLDescription wom, Map optionMap) {
+ this.wom = wom;
- String outputLocation = ((CommandLineOption)optionMap.get(OUTPUT_LOCATION_OPTION)).getOptionValue();
+ String outputLocation = ((CommandLineOption) optionMap.get(OUTPUT_LOCATION_OPTION)).getOptionValue();
this.outputLocation = new File(outputLocation);
- serverSide = (optionMap.get(SERVER_SIDE_CODE_OPTION)!=null);
- generateDeployementDescriptor = (optionMap.get(GENERATE_SERVICE_DESCRIPTION_OPTION)!=null);
- writeTestCase = (optionMap.get(GENERATE_TEST_CASE_OPTION)!=null);
-
- boolean asyncFlagPresent = (optionMap.get(CODEGEN_ASYNC_ONLY_OPTION)!=null);
- boolean syncFlagPresent = (optionMap.get(CODEGEN_SYNC_ONLY_OPTION)!=null);
- if (asyncFlagPresent) {this.asyncOn=true;this.syncOn=false;}
- if (syncFlagPresent) {this.asyncOn=false;this.syncOn=true;}
+ serverSide = (optionMap.get(SERVER_SIDE_CODE_OPTION) != null);
+ generateDeployementDescriptor = (optionMap.get(GENERATE_SERVICE_DESCRIPTION_OPTION) != null);
+ writeTestCase = (optionMap.get(GENERATE_TEST_CASE_OPTION) != null);
+
+ boolean asyncFlagPresent = (optionMap.get(CODEGEN_ASYNC_ONLY_OPTION) != null);
+ boolean syncFlagPresent = (optionMap.get(CODEGEN_SYNC_ONLY_OPTION) != null);
+ if (asyncFlagPresent) {
+ this.asyncOn = true;
+ this.syncOn = false;
+ }
+ if (syncFlagPresent) {
+ this.asyncOn = false;
+ this.syncOn = true;
+ }
- CommandLineOption packageOption = (CommandLineOption)optionMap.get(PACKAGE_OPTION);
- if(packageOption!=null) {this.packageName = packageOption.getOptionValue();}
+ CommandLineOption packageOption = (CommandLineOption) optionMap.get(PACKAGE_OPTION);
+ if (packageOption != null) {
+ this.packageName = packageOption.getOptionValue();
+ }
- CommandLineOption langOption = (CommandLineOption)optionMap.get(STUB_LANGUAGE_OPTION);
- if (langOption!=null){
+ CommandLineOption langOption = (CommandLineOption) optionMap.get(STUB_LANGUAGE_OPTION);
+ if (langOption != null) {
loadLanguge(langOption.getOptionValue());
}
-
- }
-
-
+ }
private void loadLanguge(String langName) {
- if (LanguageNames.JAVA.equalsIgnoreCase(langName)){
+ if (LanguageNames.JAVA.equalsIgnoreCase(langName)) {
this.outputLanguage = XSLTConstants.LanguageTypes.JAVA;
- }else if (LanguageNames.C_SHARP.equalsIgnoreCase(langName)){
+ } else if (LanguageNames.C_SHARP.equalsIgnoreCase(langName)) {
this.outputLanguage = XSLTConstants.LanguageTypes.C_SHARP;
- }else if (LanguageNames.C_PLUS_PLUS.equalsIgnoreCase(langName)){
+ } else if (LanguageNames.C_PLUS_PLUS.equalsIgnoreCase(langName)) {
this.outputLanguage = XSLTConstants.LanguageTypes.C_PLUS_PLUS;
- }else if (LanguageNames.VB_DOT_NET.equalsIgnoreCase(langName)){
+ } else if (LanguageNames.VB_DOT_NET.equalsIgnoreCase(langName)) {
this.outputLanguage = XSLTConstants.LanguageTypes.VB_DOT_NET;
}
}
/**
- * @return Returns the parser.
- */
- public CommandLineOptionParser getParser() {
- return parser;
- }
-
- /**
- * @return Returns the wom.
- */
- public WSDLDescription getWom() {
- return wom;
- }
-
-
- /**
- * @return Returns the outputLocation.
- */
- public File getOutputLocation() {
- return outputLocation;
- }
+ * @return Returns the parser.
+ */
+ public CommandLineOptionParser getParser() {
+ return parser;
+ }
+
+ /**
+ * @return Returns the wom.
+ */
+ public WSDLDescription getWom() {
+ return wom;
+ }
+
+
+ /**
+ * @return Returns the outputLocation.
+ */
+ public File getOutputLocation() {
+ return outputLocation;
+ }
public int getOutputLanguage() {
return outputLanguage;
@@ -145,20 +149,20 @@
return advancedCodeGenEnabled;
}
-
-
- /**
- * @return Returns the packageName.
- */
- public String getPackageName() {
- return packageName;
- }
- /**
- * @param packageName The packageName to set.
- */
- public void setPackageName(String packageName) {
- this.packageName = packageName;
- }
+
+ /**
+ * @return Returns the packageName.
+ */
+ public String getPackageName() {
+ return packageName;
+ }
+
+ /**
+ * @param packageName The packageName to set.
+ */
+ public void setPackageName(String packageName) {
+ this.packageName = packageName;
+ }
public boolean isAsyncOn() {
@@ -181,12 +185,13 @@
public boolean isWriteTestCase() {
return writeTestCase;
}
-
-
- public boolean isWriteMessageReceiver() {
- return writeMessageReceiver;
- }
- public void setWriteMessageReceiver(boolean writeMessageReceiver) {
- this.writeMessageReceiver = writeMessageReceiver;
- }
+
+
+ public boolean isWriteMessageReceiver() {
+ return writeMessageReceiver;
+ }
+
+ public void setWriteMessageReceiver(boolean writeMessageReceiver) {
+ this.writeMessageReceiver = writeMessageReceiver;
+ }
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Mon Jul 11 08:49:30 2005
@@ -20,15 +20,9 @@
import org.apache.axis2.wsdl.codegen.emitter.CSharpEmitter;
import org.apache.axis2.wsdl.codegen.emitter.Emitter;
import org.apache.axis2.wsdl.codegen.emitter.JavaEmitter;
-import org.apache.axis2.wsdl.codegen.extension.AxisBindingBuilder;
-import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
-import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
-import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
-import org.apache.axis2.wsdl.codegen.extension.XMLBeansExtension;
+import org.apache.axis2.wsdl.codegen.extension.*;
import org.apache.axis2.wsdl.databinding.TypeMapper;
import org.apache.wsdl.WSDLDescription;
-import org.apache.wsdl.extensions.Schema;
-import org.w3c.dom.NamedNodeMap;
import javax.wsdl.WSDLException;
import java.io.File;
@@ -40,24 +34,21 @@
/**
* @author chathura@opensource.lk
- *
*/
public class CodeGenerationEngine {
private List moduleEndpoints = new ArrayList();
private CodeGenConfiguration configuration;
-
- public CodeGenerationEngine(CommandLineOptionParser parser) throws CodeGenerationException{
- WSDLDescription wom ;
+
+ public CodeGenerationEngine(CommandLineOptionParser parser) throws CodeGenerationException {
+ WSDLDescription wom;
try {
- wom = this.getWOM(parser);
- }
- catch (WSDLException e) {
+ wom = this.getWOM(parser);
+ } catch (WSDLException e) {
throw new CodeGenerationException("Error parsing WSDL", e);
- }
- catch(IOException e1){
+ } catch (IOException e1) {
throw new CodeGenerationException("Invalid WSDL Location ", e1);
}
@@ -69,12 +60,11 @@
WSDLValidatorExtension validatorExtension = new WSDLValidatorExtension();
validatorExtension.init(this.configuration);
this.moduleEndpoints.add(validatorExtension);
-
+
PackageFinder packageFinder = new PackageFinder();
packageFinder.init(this.configuration);
this.moduleEndpoints.add(packageFinder);
-
-
+
XMLBeansExtension xmlBeanExtension = new XMLBeansExtension();
xmlBeanExtension.init(this.configuration);
@@ -82,21 +72,21 @@
}
- public void generate()throws CodeGenerationException{
+ public void generate() throws CodeGenerationException {
- for(int i = 0; i< this.moduleEndpoints.size(); i++){
- ((CodeGenExtension)this.moduleEndpoints.get(i)).engage();
+ for (int i = 0; i < this.moduleEndpoints.size(); i++) {
+ ((CodeGenExtension) this.moduleEndpoints.get(i)).engage();
}
Emitter emitter = null;
TypeMapper mapper = configuration.getTypeMapper();
- switch (configuration.getOutputLanguage()){
+ switch (configuration.getOutputLanguage()) {
case XSLTConstants.LanguageTypes.JAVA:
- emitter = new JavaEmitter(this.configuration,mapper);
+ emitter = new JavaEmitter(this.configuration, mapper);
break;
case XSLTConstants.LanguageTypes.C_SHARP:
- emitter = new CSharpEmitter(this.configuration,mapper);
+ emitter = new CSharpEmitter(this.configuration, mapper);
break;
case XSLTConstants.LanguageTypes.C_PLUS_PLUS:
case XSLTConstants.LanguageTypes.VB_DOT_NET:
@@ -119,7 +109,6 @@
InputStream in = new FileInputStream(new File(uri));
return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in).getDescription();
}
-
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationException.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationException.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationException.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationException.java Mon Jul 11 08:49:30 2005
@@ -18,19 +18,18 @@
/**
* @author chathura@opensource.lk
- *
*/
public class CodeGenerationException extends Exception {
- public CodeGenerationException(String message){
- super(message);
- }
-
- public CodeGenerationException(String message, Throwable throwable){
- super(message, throwable);
- }
-
- public CodeGenerationException(Throwable throwable){
- super(throwable);
- }
+ public CodeGenerationException(String message) {
+ super(message);
+ }
+
+ public CodeGenerationException(String message, Throwable throwable) {
+ super(message, throwable);
+ }
+
+ public CodeGenerationException(Throwable throwable) {
+ super(throwable);
+ }
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java Mon Jul 11 08:49:30 2005
@@ -20,7 +20,6 @@
/**
* @author chathura@opensource.lk
- *
*/
public class CommandLineOption implements CommandLineOptionConstants {
@@ -28,17 +27,17 @@
private ArrayList optionValues;
private boolean invalid = false;
- public CommandLineOption(String type, String[] values){
+ public CommandLineOption(String type, String[] values) {
updateType(type);
ArrayList arrayList = new ArrayList(values.length);
- for(int i =0; i< values.length; i++){
+ for (int i = 0; i < values.length; i++) {
arrayList.add(values[i]);
}
this.optionValues = arrayList;
}
private void updateType(String type) {
- if (type.startsWith("-")) type = type.replaceFirst("-","");
+ if (type.startsWith("-")) type = type.replaceFirst("-", "");
type = type.toLowerCase();
this.type = type;
}
@@ -50,14 +49,12 @@
updateType(type);
this.validate(this.type);
- if (null != values) {
- this.optionValues = values ;
+ if (null != values) {
+ this.optionValues = values;
}
}
-
-
/**
* @return Returns the type.
* @see <code>CommandLineOptionConstans</code>
@@ -71,8 +68,8 @@
* @return Returns the optionValues.
*/
public String getOptionValue() {
- if (optionValues!=null)
- return (String)optionValues.get(0);
+ if (optionValues != null)
+ return (String) optionValues.get(0);
else
return null;
}
@@ -92,15 +89,15 @@
return optionValues;
}
- private void validate(String optionType){
- invalid = !((WSDL_LOCATION_URI_OPTION).equalsIgnoreCase(optionType) ||
- (OUTPUT_LOCATION_OPTION).equalsIgnoreCase(optionType) ||
- (SERVER_SIDE_CODE_OPTION).equalsIgnoreCase(optionType) ||
- (CODEGEN_ASYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
- (CODEGEN_SYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
- (PACKAGE_OPTION).equalsIgnoreCase(optionType)||
- (GENERATE_SERVICE_DESCRIPTION_OPTION).equalsIgnoreCase(optionType)||
- (GENERATE_TEST_CASE_OPTION).equalsIgnoreCase(optionType)||
- (STUB_LANGUAGE_OPTION).equalsIgnoreCase(optionType));
+ private void validate(String optionType) {
+ invalid = !((WSDL_LOCATION_URI_OPTION).equalsIgnoreCase(optionType) ||
+ (OUTPUT_LOCATION_OPTION).equalsIgnoreCase(optionType) ||
+ (SERVER_SIDE_CODE_OPTION).equalsIgnoreCase(optionType) ||
+ (CODEGEN_ASYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
+ (CODEGEN_SYNC_ONLY_OPTION).equalsIgnoreCase(optionType) ||
+ (PACKAGE_OPTION).equalsIgnoreCase(optionType) ||
+ (GENERATE_SERVICE_DESCRIPTION_OPTION).equalsIgnoreCase(optionType) ||
+ (GENERATE_TEST_CASE_OPTION).equalsIgnoreCase(optionType) ||
+ (STUB_LANGUAGE_OPTION).equalsIgnoreCase(optionType));
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionConstants.java Mon Jul 11 08:49:30 2005
@@ -18,30 +18,29 @@
/**
* @author chathura@opensource.lk
- *
*/
public interface CommandLineOptionConstants {
-
- public static final String SOLE_INPUT = "SOLE_INPUT";
- public static final String WSDL_LOCATION_URI_OPTION = "uri";
- public static final String OUTPUT_LOCATION_OPTION = "o";
- public static final String SERVER_SIDE_CODE_OPTION = "ss";
- public static final String GENERATE_SERVICE_DESCRIPTION_OPTION = "sd";
- public static final String CODEGEN_ASYNC_ONLY_OPTION = "a";
- public static final String CODEGEN_SYNC_ONLY_OPTION = "s";
- public static final String PACKAGE_OPTION = "p";
- public static final String STUB_LANGUAGE_OPTION = "l";
- public static final String GENERATE_TEST_CASE_OPTION = "t";
+ public static final String SOLE_INPUT = "SOLE_INPUT";
+ public static final String WSDL_LOCATION_URI_OPTION = "uri";
+ public static final String OUTPUT_LOCATION_OPTION = "o";
+ public static final String SERVER_SIDE_CODE_OPTION = "ss";
+ public static final String GENERATE_SERVICE_DESCRIPTION_OPTION = "sd";
+ public static final String CODEGEN_ASYNC_ONLY_OPTION = "a";
+ public static final String CODEGEN_SYNC_ONLY_OPTION = "s";
+ public static final String PACKAGE_OPTION = "p";
+ public static final String STUB_LANGUAGE_OPTION = "l";
+ public static final String GENERATE_TEST_CASE_OPTION = "t";
- public static final String INVALID_OPTION= "INVALID_OPTION";
- public interface LanguageNames{
- public static final String JAVA="java";
- public static final String C_SHARP="cs";
- public static final String VB_DOT_NET="vb";
- public static final String C_PLUS_PLUS="cpp";
+ public static final String INVALID_OPTION = "INVALID_OPTION";
+
+ public interface LanguageNames {
+ public static final String JAVA = "java";
+ public static final String C_SHARP = "cs";
+ public static final String VB_DOT_NET = "vb";
+ public static final String C_PLUS_PLUS = "cpp";
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CommandLineOptionParser.java Mon Jul 11 08:49:30 2005
@@ -20,100 +20,100 @@
/**
* @author chathura@opensource.lk
- *
*/
public class CommandLineOptionParser implements CommandLineOptionConstants {
- private Map commandLineOptions;
+ private Map commandLineOptions;
- public CommandLineOptionParser(Map commandLineOptions){
+ public CommandLineOptionParser(Map commandLineOptions) {
this.commandLineOptions = commandLineOptions;
}
- public CommandLineOptionParser(String[] args) {
- this.commandLineOptions = this.parse(args);
- }
+ public CommandLineOptionParser(String[] args) {
+ this.commandLineOptions = this.parse(args);
- /**
- * Return a list with <code>CommandLineOption</code> objects
- *
- * @param args
- * @return CommandLineOption List
- */
- private Map parse(String[] args){
- Map commandLineOptions = new HashMap();
-
- if(0 == args.length)
- return commandLineOptions;
-
- //State 0 means started
- //State 1 means earlier one was a new -option
- //State 2 means earlier one was a sub param of a -option
-
- int state = 0;
- ArrayList optionBundle = null;
- String optionType = null;
- CommandLineOption commandLineOption ;
-
- for(int i=0; i< args.length ; i++){
-
- if(args[i].substring(0,1).equals("-")){
- if(0 == state){
- // fresh one
- state = 1;
- optionType = args[i];
- }else if(2 == state || 1 == state){
- // new one but old one should be saved
- commandLineOption = new CommandLineOption(optionType, optionBundle);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
- state = 1;
- optionType = args[i];
- optionBundle = null;
-
- }
- }else{
- if(0 == state){
- commandLineOption = new CommandLineOption(CommandLineOptionConstants.SOLE_INPUT, args);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
- return commandLineOptions;
-
- }else if(1 == state){
- optionBundle = new ArrayList();
- optionBundle.add(args[i]);
- state =2;
-
- }else if(2 == state){
- optionBundle.add(args[i]);
- }
-
- }
-
-
- }
-
- commandLineOption = new CommandLineOption(optionType, optionBundle);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
- return commandLineOptions;
-
- }
- public Map getAllOptions() {
- return this.commandLineOptions;
- }
-
- public List getInvalidOptions() {
- List faultList = new ArrayList();
- Iterator iterator = this.commandLineOptions.values().iterator();
- while (iterator.hasNext()) {
- CommandLineOption commandLineOption = ((CommandLineOption) (iterator
- .next()));
- if (commandLineOption.isInvalid()) {
- faultList.add(commandLineOption);
- }
- }
+ }
+
+ /**
+ * Return a list with <code>CommandLineOption</code> objects
+ *
+ * @param args
+ * @return CommandLineOption List
+ */
+ private Map parse(String[] args) {
+ Map commandLineOptions = new HashMap();
+
+ if (0 == args.length)
+ return commandLineOptions;
+
+ //State 0 means started
+ //State 1 means earlier one was a new -option
+ //State 2 means earlier one was a sub param of a -option
+
+ int state = 0;
+ ArrayList optionBundle = null;
+ String optionType = null;
+ CommandLineOption commandLineOption;
+
+ for (int i = 0; i < args.length; i++) {
+
+ if (args[i].substring(0, 1).equals("-")) {
+ if (0 == state) {
+ // fresh one
+ state = 1;
+ optionType = args[i];
+ } else if (2 == state || 1 == state) {
+ // new one but old one should be saved
+ commandLineOption = new CommandLineOption(optionType, optionBundle);
+ commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+ state = 1;
+ optionType = args[i];
+ optionBundle = null;
+
+ }
+ } else {
+ if (0 == state) {
+ commandLineOption = new CommandLineOption(CommandLineOptionConstants.SOLE_INPUT, args);
+ commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+ return commandLineOptions;
+
+ } else if (1 == state) {
+ optionBundle = new ArrayList();
+ optionBundle.add(args[i]);
+ state = 2;
+
+ } else if (2 == state) {
+ optionBundle.add(args[i]);
+ }
+
+ }
+
+
+ }
+
+ commandLineOption = new CommandLineOption(optionType, optionBundle);
+ commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+ return commandLineOptions;
+
+ }
- return faultList;
- }
+ public Map getAllOptions() {
+ return this.commandLineOptions;
+ }
+
+ public List getInvalidOptions() {
+ List faultList = new ArrayList();
+ Iterator iterator = this.commandLineOptions.values().iterator();
+ while (iterator.hasNext()) {
+ CommandLineOption commandLineOption = ((CommandLineOption) (iterator
+ .next()));
+ if (commandLineOption.isInvalid()) {
+ faultList.add(commandLineOption);
+ }
+ }
+
+ return faultList;
+ }
-
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/Constants.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/Constants.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/Constants.java Mon Jul 11 08:49:30 2005
@@ -18,8 +18,7 @@
/**
* @author chathura@opensource.lk
- *
*/
public class Constants {
- public static int TEST_PORT =5555;
+ public static int TEST_PORT = 5555;
}