You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/05/09 05:26:43 UTC
svn commit: r169229 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/deployment/
core/src/org/apache/axis/deployment/listener/
core/src/org/apache/axis/deployment/repository/utill/
core/src/org/apache/axis/deployment/scheduler/
core/src/org/apache/axis/engine/ core/src/org/apache/axis/phaseresolver/
samples/src/encoding/sample1/ samples/src/interop/doclit/
tool/src/org/apache/axis/tool/core/
wsdl/src/org/apache/axis/wsdl/databinding/
wsdl/src/org/apache/axis/wsdl/tojava/
wsdl/src/org/apache/axis/wsdl/tojava/emitter/
Author: chathura
Date: Sun May 8 20:26:41 2005
New Revision: 169229
URL: http://svn.apache.org/viewcvs?rev=169229&view=rev
Log:
Command Line option parser completed with a state machine. Plus did a general Organizing of imports.
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java
webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOption.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionConstants.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionParser.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/emitter/ClientStubWriter.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Sun May 8 20:26:41 2005
@@ -16,6 +16,19 @@
package org.apache.axis.deployment;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axis.deployment.listener.RepositoryListenerImpl;
import org.apache.axis.deployment.repository.utill.ArchiveReader;
import org.apache.axis.deployment.repository.utill.HDFileItem;
@@ -23,7 +36,12 @@
import org.apache.axis.deployment.scheduler.DeploymentIterator;
import org.apache.axis.deployment.scheduler.Scheduler;
import org.apache.axis.deployment.scheduler.SchedulerTask;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.EngineConfigurationImpl;
@@ -31,13 +49,6 @@
import org.apache.axis.modules.Module;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
public class DeploymentEngine implements DeploymentConstants {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Sun May 8 20:26:41 2005
@@ -16,21 +16,32 @@
package org.apache.axis.deployment;
-import org.apache.axis.description.*;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineConfigurationImpl;
-import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.phaseresolver.PhaseMetadata;
-import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.transport.TransportSender;
+import java.io.InputStream;
+import java.util.ArrayList;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import java.io.InputStream;
-import java.util.ArrayList;
+
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.FlowImpl;
+import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.ParameterImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.engine.MessageReceiver;
+import org.apache.axis.phaseresolver.PhaseMetadata;
+import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportSender;
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java Sun May 8 20:26:41 2005
@@ -16,13 +16,13 @@
package org.apache.axis.deployment.listener;
-import org.apache.axis.deployment.DeploymentConstants;
-import org.apache.axis.deployment.DeploymentEngine;
-import org.apache.axis.deployment.repository.utill.WSInfoList;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.axis.deployment.DeploymentConstants;
+import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.deployment.repository.utill.WSInfoList;
public class RepositoryListenerImpl implements RepositoryListener, DeploymentConstants {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java Sun May 8 20:26:41 2005
@@ -16,6 +16,10 @@
package org.apache.axis.deployment.repository.utill;
+import java.io.FileInputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
import org.apache.axis.deployment.DeploymentConstants;
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.DeploymentException;
@@ -24,10 +28,6 @@
import org.apache.axis.description.AxisModule;
import org.apache.axis.description.AxisService;
import org.apache.axis.wsdl.builder.wsdl4j.WSDL1ToWOMBuilder;
-
-import java.io.FileInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
public class ArchiveReader implements DeploymentConstants {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java Sun May 8 20:26:41 2005
@@ -16,12 +16,12 @@
package org.apache.axis.deployment.repository.utill;
-import org.apache.axis.engine.AxisFault;
-
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+
+import org.apache.axis.engine.AxisFault;
/**
* HDFileItem = Hot Deployment File Item , to store infromation of the module or servise
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/WSInfoList.java Sun May 8 20:26:41 2005
@@ -16,13 +16,13 @@
package org.apache.axis.deployment.repository.utill;
-import org.apache.axis.deployment.DeploymentConstants;
-import org.apache.axis.deployment.DeploymentEngine;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.axis.deployment.DeploymentConstants;
+import org.apache.axis.deployment.DeploymentEngine;
public class WSInfoList implements DeploymentConstants {
/**
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/scheduler/SchedulerTask.java Sun May 8 20:26:41 2005
@@ -16,11 +16,11 @@
package org.apache.axis.deployment.scheduler;
+import java.util.TimerTask;
+
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.listener.RepositoryListener;
import org.apache.axis.deployment.listener.RepositoryListenerImpl;
-
-import java.util.TimerTask;
public class SchedulerTask implements Runnable {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java Sun May 8 20:26:41 2005
@@ -17,12 +17,8 @@
import javax.xml.namespace.QName;
-import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.ServiceContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.handlers.AbstractHandler;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java Sun May 8 20:26:41 2005
@@ -15,6 +15,8 @@
*/
package org.apache.axis.phaseresolver;
+import java.util.ArrayList;
+
import org.apache.axis.context.EngineContext;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.PhasesInclude;
@@ -24,8 +26,6 @@
import org.apache.axis.engine.SimplePhase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
/**
* This class hold all the phases found in the service.xml and server.xml
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java Sun May 8 20:26:41 2005
@@ -15,9 +15,9 @@
*/
package org.apache.axis.phaseresolver;
-import org.apache.axis.description.HandlerMetadata;
-
import java.util.ArrayList;
+
+import org.apache.axis.description.HandlerMetadata;
/**
* Class PhaseMetadata
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Sun May 8 20:26:41 2005
@@ -15,15 +15,27 @@
*/
package org.apache.axis.phaseresolver;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.ServiceContext;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.EngineConfigurationImpl;
-
-import javax.xml.namespace.QName;
-import java.util.*;
/**
* Class PhaseResolver
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java Sun May 8 20:26:41 2005
@@ -37,8 +37,6 @@
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
import org.apache.axis.util.Utils;
-import com.sun.corba.se.internal.javax.rmi.CORBA.Util;
-
public class EchoProvider extends SimpleJavaProvider {
public Object[] deserializeParameters(
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java Sun May 8 20:26:41 2005
@@ -24,21 +24,10 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMAbstractFactory;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMNamespace;
import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.SOAPFactory;
-import org.apache.axis.testUtils.Encoder;
-import org.apache.axis.testUtils.ObjectToOMBuilder;
import org.apache.axis.testUtils.SimpleJavaProvider;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
-import org.apache.wsdl.WSDLService;
/**
* Created by IntelliJ IDEA.
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/FileCopier.java Sun May 8 20:26:41 2005
@@ -6,8 +6,6 @@
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
-import sun.rmi.transport.Target;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis/tool/core/JarFileWriter.java Sun May 8 20:26:41 2005
@@ -6,8 +6,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Jar;
-import sun.rmi.transport.Target;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/TypeMappingAdapter.java Sun May 8 20:26:41 2005
@@ -4,8 +4,6 @@
import javax.xml.namespace.QName;
-import org.apache.axis.om.OMElement;
-
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOption.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOption.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOption.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOption.java Sun May 8 20:26:41 2005
@@ -16,6 +16,8 @@
package org.apache.axis.wsdl.tojava;
+import java.util.ArrayList;
+
/**
* @author chathura@opensource.lk
*
@@ -24,15 +26,23 @@
private String type;
- private String optionValue;
+ private ArrayList optionValues;
private boolean invalid = false;
+
+ public CommandLineOption(String type, String[] values){
+ this.type = type;
+ ArrayList arrayList = new ArrayList(values.length);
+ for(int i =0; i< values.length; i++){
+ arrayList.add(values[i]);
+ }
+ }
/**
* @param type
- * @param optionValue
+ * @param optionValues
*/
- public CommandLineOption(String type, String optionValue) {
+ public CommandLineOption(String type, ArrayList values) {
if (("-" + WSDL_LOCATION_URI_OPTION).equalsIgnoreCase(type)) {
this.type = WSDL_LOCATION_URI_OPTION;
@@ -44,10 +54,9 @@
this.invalid = true;
}
- if (optionValue == null) {
- this.invalid = true;
- } else {
- this.optionValue = optionValue;
+ if (null != values) {
+
+ this.optionValues = values ;
}
}
@@ -60,10 +69,10 @@
}
/**
- * @return Returns the optionValue.
+ * @return Returns the optionValues.
*/
public String getOptionValue() {
- return optionValue;
+ return (String)optionValues.get(0);
}
/**
@@ -71,5 +80,13 @@
*/
public boolean isInvalid() {
return invalid;
+ }
+
+
+ /**
+ * @return Returns the optionValues.
+ */
+ public ArrayList getOptionValues() {
+ return optionValues;
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionConstants.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionConstants.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionConstants.java Sun May 8 20:26:41 2005
@@ -21,6 +21,8 @@
*
*/
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";
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionParser.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionParser.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/CommandLineOptionParser.java Sun May 8 20:26:41 2005
@@ -22,53 +22,97 @@
import java.util.List;
import java.util.Map;
-
/**
* @author chathura@opensource.lk
- *
+ *
*/
-public class CommandLineOptionParser implements CommandLineOptionConstants{
-
+public class CommandLineOptionParser implements CommandLineOptionConstants {
private Map commandLineOptions;
-
- public CommandLineOptionParser(String[] 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){
+private Map parse(String[] args){
Map commandLineOptions = new HashMap();
- for(int i=0; i< args.length; i= i+2){
- CommandLineOption commandLineOption = new CommandLineOption(args[i], args[i+1]);
- commandLineOptions.put(commandLineOption.getType(), commandLineOption);
+
+ 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(){
+ public Map getAllOptions() {
return this.commandLineOptions;
}
-
- public List getInvalidOptions(){
+
+ public List getInvalidOptions() {
List faultList = new ArrayList();
Iterator iterator = this.commandLineOptions.values().iterator();
- while (iterator.hasNext()){
- CommandLineOption commandLineOption = ((CommandLineOption)(iterator.next()));
- if(commandLineOption.isInvalid()){
+ while (iterator.hasNext()) {
+ CommandLineOption commandLineOption = ((CommandLineOption) (iterator
+ .next()));
+ if (commandLineOption.isInvalid()) {
faultList.add(commandLineOption);
}
}
-
+
return faultList;
}
-
-
-}
+
+}
\ No newline at end of file
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/emitter/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/emitter/ClientStubWriter.java?rev=169229&r1=169228&r2=169229&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/emitter/ClientStubWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/tojava/emitter/ClientStubWriter.java Sun May 8 20:26:41 2005
@@ -99,7 +99,7 @@
}
printStream.println(INDENDATION_TAB+"}");
///End of Static block
- printStream.println("}");
+ printStream.println(")");
printStream.flush();
printStream.close();