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 pr...@apache.org on 2007/07/28 00:08:13 UTC
svn commit: r560403 [2/3] - in /webservices/axis2/branches/java/jaxws21: ./
modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb/src/org/apache/axis2/databinding/typemapping/
modules/codegen/src/org/apache/axis2/wsdl/ modules/codegen/src/org/ap...
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPSender.java Fri Jul 27 15:08:09 2007
@@ -262,10 +262,12 @@
private void handleResponse(MessageContext msgContext,
HttpMethodBase method) throws IOException {
- if (method.getStatusCode() == HttpStatus.SC_OK) {
+ int statusCode = method.getStatusCode();
+ if (statusCode == HttpStatus.SC_OK) {
processResponse(method, msgContext);
- } else if (method.getStatusCode() == HttpStatus.SC_ACCEPTED) {
- } else if (method.getStatusCode() == HttpStatus.SC_INTERNAL_SERVER_ERROR) {
+ } else if (statusCode == HttpStatus.SC_ACCEPTED) {
+ } else if (statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR ||
+ statusCode == HttpStatus.SC_BAD_REQUEST) {
Header contenttypeHeader =
method.getResponseHeader(HTTPConstants.HEADER_CONTENT_TYPE);
String value = null;
@@ -289,12 +291,12 @@
if (isTransportNonBlocking != null &&
((Boolean) isTransportNonBlocking).booleanValue()) {
throw new AxisFault(Messages.getMessage("transportError",
- String.valueOf(method.getStatusCode()),
+ String.valueOf(statusCode),
method.getStatusText()));
}
} else {
throw new AxisFault(Messages.getMessage("transportError",
- String.valueOf(method.getStatusCode()),
+ String.valueOf(statusCode),
method.getStatusText()));
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Fri Jul 27 15:08:09 2007
@@ -117,7 +117,7 @@
* @return true if SwA needs to be enabled
*/
public static boolean doWriteMTOM(MessageContext msgContext) {
- boolean enableMTOM = false;
+ boolean enableMTOM;
Object enableMTOMObject = null;
// First check the whether MTOM is enabled by the configuration
// (Eg:Axis2.xml, services.xml)
@@ -157,7 +157,7 @@
* @return true if SwA needs to be enabled
*/
public static boolean doWriteSwA(MessageContext msgContext) {
- boolean enableSwA = false;
+ boolean enableSwA;
Object enableSwAObject = null;
// First check the whether SwA is enabled by the configuration
// (Eg:Axis2.xml, services.xml)
@@ -246,8 +246,7 @@
} else {
msgContext.setDoingREST(true);
msgContext.setEnvelope(envelope);
- AxisEngine engine = new AxisEngine(configurationContext);
- engine.receive(msgContext);
+ AxisEngine.receive(msgContext);
return true;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/HTTPWorker.java Fri Jul 27 15:08:09 2007
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.URI;
import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Fri Jul 27 15:08:09 2007
@@ -38,8 +38,11 @@
import org.apache.http.params.HttpParamsLinker;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpProcessor;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAP11Constants;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -284,11 +287,26 @@
"basic realm=\"" + realm + "\"");
}
} else {
- response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Internal server error");
+ if (e instanceof AxisFault) {
+ response.sendError(getStatusFromAxisFault((AxisFault)e), e.getMessage());
+ } else {
+ response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR,
+ "Internal server error");
+ }
}
}
AxisEngine.sendFault(faultContext);
}
+ }
+
+ public int getStatusFromAxisFault(AxisFault fault) {
+ QName faultCode = fault.getFaultCode();
+ if (SOAP12Constants.QNAME_SENDER_FAULTCODE.equals(faultCode) ||
+ SOAP11Constants.QNAME_SENDER_FAULTCODE.equals(faultCode)) {
+ return HttpServletResponse.SC_BAD_REQUEST;
+ }
+
+ return HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
}
class SimpleHTTPRequestResponseTransport implements RequestResponseTransport {
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java Fri Jul 27 15:08:09 2007
@@ -22,104 +22,70 @@
public interface CommandLineOptionConstants {
interface WSDL2JavaConstants {
-
- //short option constants
- String WSDL_LOCATION_URI_OPTION = "uri";
- String OUTPUT_LOCATION_OPTION = "o";
- String SERVER_SIDE_CODE_OPTION = "ss";
- String GENERATE_SERVICE_DESCRIPTION_OPTION = "sd";
+ String All_PORTS_OPTION = "ap";
+ String All_PORTS_OPTION_LONG = "all-ports";
+ String BACKWORD_COMPATIBILITY_OPTION = "b";
+ String BACKWORD_COMPATIBILITY_OPTION_LONG = "backword-compatible";
String CODEGEN_ASYNC_ONLY_OPTION = "a";
+ String CODEGEN_ASYNC_ONLY_OPTION_LONG = "async";
String CODEGEN_SYNC_ONLY_OPTION = "s";
- String PACKAGE_OPTION = "p";
- String STUB_LANGUAGE_OPTION = "l";
- String GENERATE_TEST_CASE_OPTION = "t";
+ String CODEGEN_SYNC_ONLY_OPTION_LONG = "sync";
String DATA_BINDING_TYPE_OPTION = "d";
- String UNPACK_CLASSES_OPTION = "u";
+ String DATA_BINDING_TYPE_OPTION_LONG = "databinding-method";
+ String EXTERNAL_MAPPING_OPTION = "em";
+ String EXTERNAL_MAPPING_OPTION_LONG = "external-mapping";
+ String FLATTEN_FILES_OPTION = "f";
+ String FLATTEN_FILES_OPTION_LONG = "flatten-files";
String GENERATE_ALL_OPTION = "g";
+ String GENERATE_ALL_OPTION_LONG = "generate-all";
+ String GENERATE_SERVICE_DESCRIPTION_OPTION = "sd";
+ String GENERATE_SERVICE_DESCRIPTION_OPTION_LONG = "service-description";
+ String GENERATE_TEST_CASE_OPTION = "t";
+ String GENERATE_TEST_CASE_OPTION_LONG = "test-case";
+ String NAME_SPACE_TO_PACKAGE_OPTION = "ns2p";
+ String NAME_SPACE_TO_PACKAGE_OPTION_LONG = "namespace2package";
+ String NO_BUILD_XML_OPTION_LONG = "noBuildXML";
+ String NO_MESSAGE_RECEIVER_OPTION_LONG = "noMessageReceiver";
+ String NO_WSDLS_OPTION_LONG = "noWSDL";
+ String OUTPUT_LOCATION_OPTION = "o";
+ String OUTPUT_LOCATION_OPTION_LONG = "output";
+ String OVERRIDE_OPTION = "or";
+ String OVERRIDE_OPTION_LONG = "over-ride";
+ String PACKAGE_OPTION = "p";
+ String PACKAGE_OPTION_LONG = "package";
String PORT_NAME_OPTION = "pn";
- String SERVICE_NAME_OPTION = "sn";
+ String PORT_NAME_OPTION_LONG = "port-name";
String REPOSITORY_PATH_OPTION = "r";
- String NAME_SPACE_TO_PACKAGE_OPTION = "ns2p";
- String SERVER_SIDE_INTERFACE_OPTION = "ssi";
- String EXTERNAL_MAPPING_OPTION = "em";
- String WSDL_VERSION_OPTION = "wv";
- String FLATTEN_FILES_OPTION = "f";
- String UNWRAP_PARAMETERS = "uw";
- String BACKWORD_COMPATIBILITY_OPTION = "b";
- String SUPPRESS_PREFIXES_OPTION = "sp";
- String SOURCE_FOLDER_NAME_OPTION = "S";
+ String REPOSITORY_PATH_OPTION_LONG = "repository-path";
String RESOURCE_FOLDER_OPTION = "R";
- String XSDCONFIG_OPTION = "xc";
- String All_PORTS_OPTION = "ap";
- String OVERRIDE_OPTION = "or";
-
- //long option constants
- String OUTPUT_LOCATION_OPTION_LONG = "output";
+ String RESOURCE_FOLDER_OPTION_LONG = "resource-folder";
+ String SERVER_SIDE_CODE_OPTION = "ss";
String SERVER_SIDE_CODE_OPTION_LONG = "server-side";
- String GENERATE_SERVICE_DESCRIPTION_OPTION_LONG = "service-description";
- String CODEGEN_ASYNC_ONLY_OPTION_LONG = "async";
- String CODEGEN_SYNC_ONLY_OPTION_LONG = "sync";
- String PACKAGE_OPTION_LONG = "package";
+ String SERVER_SIDE_INTERFACE_OPTION = "ssi";
+ String SERVER_SIDE_INTERFACE_OPTION_LONG = "serverside-interface";
+ String SERVICE_NAME_OPTION = "sn";
+ String SERVICE_NAME_OPTION_LONG = "service-name";
+ String SOURCE_FOLDER_NAME_OPTION = "S";
+ String SOURCE_FOLDER_NAME_OPTION_LONG = "source-folder";
+ String STUB_LANGUAGE_OPTION = "l";
String STUB_LANGUAGE_OPTION_LONG = "language";
- String GENERATE_TEST_CASE_OPTION_LONG = "test-case";
- String DATA_BINDING_TYPE_OPTION_LONG = "databinding-method";
+ String SUPPRESS_PREFIXES_OPTION = "sp";
+ String SUPPRESS_PREFIXES_OPTION_LONG = "suppress-prefixes";
+ String UNPACK_CLASSES_OPTION = "u";
String UNPACK_CLASSES_OPTION_LONG = "unpack-classes";
- String GENERATE_ALL_OPTION_LONG = "generate-all";
- String PORT_NAME_OPTION_LONG = "port-name";
- String SERVICE_NAME_OPTION_LONG = "service-name";
+ String UNWRAP_PARAMETERS = "uw";
+ String UNWRAP_PARAMETERS_LONG = "unwrap-params";
+ String WSDL_LOCATION_URI_OPTION = "uri";
+ String WSDL_VERSION_OPTION = "wv";
+ String WSDL_VERSION_OPTION_LONG = "wsdl-version";
+
String INVALID_OPTION = "INVALID_OPTION";
String EXTRA_OPTIONTYPE_PREFIX = "E";
- String REPOSITORY_PATH_OPTION_LONG = "repository-path";
- String NAME_SPACE_TO_PACKAGE_OPTION_LONG = "namespace2package";
- String SERVER_SIDE_INTERFACE_OPTION_LONG = "serverside-interface";
- String EXTERNAL_MAPPING_OPTION_LONG = "external-mapping";
- String WSDL_VERSION_OPTION_LONG = "wsdl-version";
- String FLATTEN_FILES_OPTION_LONG = "flatten-files";
- String UNWRAP_PARAMETERS_LONG = "unwrap-params";
- String BACKWORD_COMPATIBILITY_OPTION_LONG = "backword-compatible";
- String SUPPRESS_PREFIXES_OPTION_LONG = "suppress-prefixes";
- String SOURCE_FOLDER_NAME_OPTION_LONG = "source-folder";
- String RESOURCE_FOLDER_OPTION_LONG = "resource-folder";
- String XSDCONFIG_OPTION_LONG = "xsdconfig";
- String All_PORTS_OPTION_LONG = "all-ports";
- String OVERRIDE_OPTION_LONG = "over-ride";
String WSDL_VERSION_2 = "2.0";
String WSDL_VERSION_2_OPTIONAL = "2";
String WSDL_VERSION_1 = "1.1";
-
-
- String NO_MESSAGE_RECEIVER_OPTION_LONG = "noMessageReceiver";
- String NO_WSDLS_OPTION_LONG = "noWSDL";
- String NO_BUILD_XML_OPTION_LONG = "noBuildXML";
- }
-
- interface Java2WSDLConstants {
- String OUTPUT_LOCATION_OPTION = "o";
- String OUTPUT_FILENAME_OPTION = "of";
- String CLASSNAME_OPTION = "cn";
- String CLASSPATH_OPTION = "cp";
- String TARGET_NAMESPACE_OPTION = "tn";
- String TARGET_NAMESPACE_PREFIX_OPTION = "tp";
- String SCHEMA_TARGET_NAMESPACE_OPTION = "stn";
- String SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION = "stp";
- String SERVICE_NAME_OPTION = "sn";
-
- //long option constants
- String OUTPUT_LOCATION_OPTION_LONG = "output";
- String TARGET_NAMESPACE_OPTION_LONG = "targetNamespace";
- String TARGET_NAMESPACE_PREFIX_OPTION_LONG = "targetNamespacePrefix";
- String SERVICE_NAME_OPTION_LONG = "serviceName";
- String CLASSNAME_OPTION_LONG = "className";
- String CLASSPATH_OPTION_LONG = "classPath";
- String OUTPUT_FILENAME_OPTION_LONG = "outputFilename";
- String SCHEMA_TARGET_NAMESPACE_OPTION_LONG = "schemaTargetnamespace";
- String SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION_LONG = "schemaTargetnamespacePrefix";
-
-
}
public static final String SOLE_INPUT = "SOLE_INPUT";
-
-
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java Fri Jul 27 15:08:09 2007
@@ -485,10 +485,11 @@
}
}
- // defaulting to fault code Sender, if no message is available
+ // defaulting to fault code Receiver, if no message is available
if (faultCode == null && context.getEnvelope() != null) {
soapFaultCode = ("".equals(soapFaultCode) || (soapFaultCode == null))
- ? getSenderFaultCode(context.getEnvelope().getNamespace())
+ ? SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX + ":" +
+ context.getEnvelope().getVersion().getReceiverFaultCode().getLocalPart()
: soapFaultCode;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/XMLPrettyPrinter.java Fri Jul 27 15:08:09 2007
@@ -27,6 +27,8 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.stream.StreamResult;
import java.io.File;
@@ -49,7 +51,7 @@
*
* @param file
*/
- public static void prettify(File file) {
+ public static void prettify(final File file) {
try {
InputStream inputStream = new ByteArrayInputStream(IOUtils.getStreamAsByteArray(new FileInputStream(file)));
@@ -61,6 +63,19 @@
TransformerFactory tf = TransformerFactory.newInstance();
Templates templates = tf.newTemplates(stylesheetSource);
Transformer transformer = templates.newTransformer();
+ transformer.setErrorListener(new ErrorListener(){
+ public void warning(TransformerException exception) throws TransformerException {
+ log.warn("Exception occurred while trying to pretty print file " + file, exception);
+ }
+
+ public void error(TransformerException exception) throws TransformerException {
+ log.error("Exception occurred while trying to pretty print file " + file, exception);
+ }
+
+ public void fatalError(TransformerException exception) throws TransformerException {
+ log.error("Exception occurred while trying to pretty print file " + file, exception);
+ }
+ });
transformer.transform(xmlSource, new StreamResult(outputStream));
inputStream.close();
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java Fri Jul 27 15:08:09 2007
@@ -101,7 +101,10 @@
log.debug(" creating new ServiceDescriptionImpl");
}
- serviceDesc = new ServiceDescriptionImpl(wsdlURL, serviceQName, serviceClass);
+ ServiceDescriptionImpl serviceDescImpl = new ServiceDescriptionImpl(wsdlURL, serviceQName, serviceClass);
+ serviceDescImpl.setAxisConfigContext(configContext);
+
+ serviceDesc = serviceDescImpl;
if (log.isDebugEnabled()) {
log.debug("ServiceDescription created with WSDL URL: " + wsdlURL + "; QName: " +
serviceQName + "; Class: " + serviceClass);
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java Fri Jul 27 15:08:09 2007
@@ -49,7 +49,9 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
//import org.apache.log4j.BasicConfigurator;
+import java.util.Map;
/** @see ../EndpointInterfaceDescription */
class EndpointInterfaceDescriptionImpl
@@ -58,6 +60,7 @@
private EndpointDescriptionImpl parentEndpointDescription;
private ArrayList<OperationDescription> operationDescriptions =
new ArrayList<OperationDescription>();
+ private Map<QName, List<OperationDescription>> dispatchableOperations = new HashMap<QName, List<OperationDescription>>();
// This may be an actual Service Endpoint Interface -OR- it may be a service implementation class that did not
// specify an @WebService.endpointInterface.
private Class seiClass;
@@ -95,6 +98,15 @@
void addOperation(OperationDescription operation) {
operationDescriptions.add(operation);
+
+ if (!operation.isJAXWSAsyncClientMethod()) {
+ List<OperationDescription> operations = dispatchableOperations.get(operation.getName());
+ if(operations==null) {
+ operations = new ArrayList<OperationDescription>();
+ dispatchableOperations.put(operation.getName(), operations);
+ }
+ operations.add(operation);
+ }
}
EndpointInterfaceDescriptionImpl(Class sei, EndpointDescriptionImpl parent) {
@@ -474,22 +486,14 @@
* @see org.apache.axis2.jaxws.description.EndpointInterfaceDescription#getDispatchableOperation(QName operationQName)
*/
public OperationDescription[] getDispatchableOperation(QName operationQName) {
- OperationDescription[] returnOperations = null;
- OperationDescription[] allMatchingOperations = getOperation(operationQName);
- if (allMatchingOperations != null && allMatchingOperations.length > 0) {
- ArrayList<OperationDescription> dispatchableOperations =
- new ArrayList<OperationDescription>();
- for (OperationDescription operation : allMatchingOperations) {
- if (!operation.isJAXWSAsyncClientMethod()) {
- dispatchableOperations.add(operation);
- }
- }
-
- if (dispatchableOperations.size() > 0) {
- returnOperations = dispatchableOperations.toArray(new OperationDescription[0]);
- }
- }
- return returnOperations;
+ //FIXME:OperationDescriptionImpl creates operation qname with empty namespace. Thus using localname
+ //to read dispachable operation.
+ QName key = new QName("",operationQName.getLocalPart());
+ List<OperationDescription> operations = dispatchableOperations.get(key);
+ if(operations!=null){
+ return operations.toArray(new OperationDescription[operations.size()]);
+ }
+ return new OperationDescription[0];
}
/* (non-Javadoc)
* @see org.apache.axis2.jaxws.description.EndpointInterfaceDescription#getDispatchableOperations()
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java Fri Jul 27 15:08:09 2007
@@ -556,6 +556,10 @@
return this.generatedWsdlWrapper;
}
+ void setAxisConfigContext(ConfigurationContext config) {
+ this.configContext = config;
+ }
+
/* (non-Javadoc)
* @see org.apache.axis2.jaxws.description.ServiceDescription#getAxisConfigContext()
*/
Modified: webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml Fri Jul 27 15:08:09 2007
@@ -80,10 +80,10 @@
as the maven-release-plugin will not update this value.
-->
<version>SNAPSHOT</version>
- <addressing.mar.version>1.3</addressing.mar.version>
- <soapmonitor.mar.version>1.3</soapmonitor.mar.version>
- <mex.mar.version>1.3</mex.mar.version>
- <ping.mar.version>1.3</ping.mar.version>
+ <addressing.mar.version>SNAPSHOT</addressing.mar.version>
+ <soapmonitor.mar.version>SNAPSHOT</soapmonitor.mar.version>
+ <mex.mar.version>SNAPSHOT</mex.mar.version>
+ <ping.mar.version>SNAPSHOT</ping.mar.version>
<annogen.version>0.1.0</annogen.version>
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.4</antlr.version>
@@ -114,6 +114,7 @@
<jettison.version>1.0-RC1</jettison.version>
<jibx.version>1.1.5</jibx.version>
<junit.version>4.3.1</junit.version>
+ <junit.version-jdk1.4>3.8.2</junit.version-jdk1.4>
<log4j.version>1.2.14</log4j.version>
<maven.archiver.version>2.2</maven.archiver.version>
<maven.artifact.version>2.0.4</maven.artifact.version>
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/AntCodegenTask.java Fri Jul 27 15:08:09 2007
@@ -30,9 +30,12 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
+import org.apache.tools.ant.types.Parameter;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
+import java.util.Iterator;
public class AntCodegenTask extends Task {
@@ -53,6 +56,16 @@
private boolean unpackClasses = false;
private boolean serverSideInterface = false;
+ private boolean allPorts = false;
+ private boolean backwardCompatible = false;
+ private boolean flattenFiles = false;
+ private boolean skipMessageReceiver = false;
+ private boolean skipBuildXML = false;
+ private boolean skipWSDL = false;
+ private boolean overWrite = false;
+ private boolean suppressPrefixes = false;
+ private Properties props = new Properties();
+
private String repositoryPath = null;
private String externalMapping = null;
private String wsdlVersion = null;
@@ -272,6 +285,82 @@
CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION,
new String[0]));
}
+
+ if (allPorts) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.All_PORTS_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.All_PORTS_OPTION,
+ new String[0]));
+ }
+
+ if (backwardCompatible) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION,
+ new String[0]));
+ }
+
+ if (flattenFiles) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.FLATTEN_FILES_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.FLATTEN_FILES_OPTION,
+ new String[0]));
+ }
+
+ if (skipMessageReceiver) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.NO_MESSAGE_RECEIVER_OPTION_LONG,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.NO_MESSAGE_RECEIVER_OPTION_LONG,
+ new String[0]));
+ }
+
+ if (skipBuildXML) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.NO_BUILD_XML_OPTION_LONG,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.NO_BUILD_XML_OPTION_LONG,
+ new String[0]));
+ }
+
+ if (skipWSDL) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.NO_WSDLS_OPTION_LONG,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.NO_WSDLS_OPTION_LONG,
+ new String[0]));
+ }
+
+ if (overWrite) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.OVERRIDE_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.OVERRIDE_OPTION,
+ new String[0]));
+ }
+
+ if (suppressPrefixes) {
+ optionMap.put(
+ CommandLineOptionConstants.WSDL2JavaConstants.SUPPRESS_PREFIXES_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.SUPPRESS_PREFIXES_OPTION,
+ new String[0]));
+ }
+
+ Iterator iterator = props.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ String key = CommandLineOptionConstants.WSDL2JavaConstants.EXTRA_OPTIONTYPE_PREFIX + entry.getKey();
+ optionMap.put(
+ key,
+ new CommandLineOption(
+ key,
+ new String[]{(String) entry.getValue()}));
+ }
+
optionMap.put(
CommandLineOptionConstants.WSDL2JavaConstants.SERVICE_NAME_OPTION,
new CommandLineOption(
@@ -431,5 +520,41 @@
public void setNamespaceToPackages(String namespaceToPackages) {
this.namespaceToPackages = namespaceToPackages;
+ }
+
+ public void addConfiguredParameter(Parameter prop) {
+ props.setProperty(prop.getName(), prop.getValue());
+ }
+
+ public void setSuppressPrefixes(boolean suppressPrefixes) {
+ this.suppressPrefixes = suppressPrefixes;
+ }
+
+ public void setOverWrite(boolean overWrite) {
+ this.overWrite = overWrite;
+ }
+
+ public void setSkipWSDL(boolean skipWSDL) {
+ this.skipWSDL = skipWSDL;
+ }
+
+ public void setSkipBuildXML(boolean skipBuildXML) {
+ this.skipBuildXML = skipBuildXML;
+ }
+
+ public void setSkipMessageReceiver(boolean skipMessageReceiver) {
+ this.skipMessageReceiver = skipMessageReceiver;
+ }
+
+ public void setFlattenFiles(boolean flattenFiles) {
+ this.flattenFiles = flattenFiles;
+ }
+
+ public void setBackwardCompatible(boolean backwardCompatible) {
+ this.backwardCompatible = backwardCompatible;
+ }
+
+ public void setAllPorts(boolean allPorts) {
+ this.allPorts = allPorts;
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Fri Jul 27 15:08:09 2007
@@ -32,6 +32,7 @@
import javax.wsdl.Definition;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.tool.codegen.WSDL2JavaGenerator;
import org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin;
import org.apache.axis2.tool.codegen.eclipse.ui.AbstractWizardPage;
@@ -70,7 +71,7 @@
* The main wizard for the codegen wizard
*/
-public class CodeGenWizard extends Wizard implements INewWizard,CommandLineOptionConstants.Java2WSDLConstants {
+public class CodeGenWizard extends Wizard implements INewWizard, Java2WSDLConstants {
private ToolSelectionPage toolSelectionPage;
private WSDLFileSelectionPage wsdlSelectionPage;
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/SrcCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/SrcCompiler.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/SrcCompiler.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/SrcCompiler.java Fri Jul 27 15:08:09 2007
@@ -44,27 +44,28 @@
public void compileSource(String tempPath) {
- Path path;
- File destDir = new File(tempPath + File.separator + "classes");
- destDir.mkdir();
+ Path path;
+ File destDir = new File(tempPath + File.separator + "classes");
+ destDir.mkdir();
- Path srcPath = new Path(project, tempPath + File.separator + "src");
- this.setSrcdir(srcPath);
- this.setDestdir(destDir);
- this.setIncludes("**" + File.separator + "*.java, *.java");
- URL url = getClass().getResource("/icons");
- File lib = new File(url.getPath() + File.separator + ".." + File.separator + ".." + File.separator + "lib");
- File[] files;
- files = lib.listFiles();
+ Path srcPath = new Path(project, tempPath + File.separator + "src");
+ this.setSrcdir(srcPath);
+ this.setDestdir(destDir);
+ this.setIncludes("**" + File.separator + "*.java, *.java");
+ URL url = getClass().getResource("/icons");
+ File lib = new File(url.getPath() + File.separator + ".." + File.separator + ".." + File.separator + "lib");
+ File[] files;
+ files = lib.listFiles();
- Path classpath = new Path(project);
- for (int count = 0; count < files.length; count++) {
- path = new Path(project, files[count].getAbsolutePath());
- classpath.add(path);
- }
- this.setClasspath(classpath);
- this.setFork(true);
- this.perform();
+ Path classpath = new Path(project);
+ for (int count = 0; count < files.length; count++) {
+ path = new Path(project, files[count].getAbsolutePath());
+ classpath.add(path);
+ }
+ this.setClasspath(classpath);
+ this.setFork(true);
+ this.perform();
+
+ }
- }
}
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/WsdlgenBean.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/WsdlgenBean.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/WsdlgenBean.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/WsdlgenBean.java Fri Jul 27 15:08:09 2007
@@ -19,6 +19,7 @@
package org.apache.axis2.tools.bean;
import org.apache.axis2.util.CommandLineOptionConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
import org.apache.ws.java2wsdl.Java2WSDLCodegenEngine;
import java.util.HashMap;
@@ -120,48 +121,48 @@
Map optionMap = new HashMap();
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .CLASSNAME_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants.Java2WSDLConstants.CLASSNAME_OPTION ,
+ optionMap.put(Java2WSDLConstants .CLASSNAME_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants.CLASSNAME_OPTION ,
new String[]{getClassName() })
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .CLASSPATH_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .CLASSPATH_OPTION ,
+ optionMap.put(Java2WSDLConstants.CLASSPATH_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .CLASSPATH_OPTION ,
getClassPathList())
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .TARGET_NAMESPACE_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .TARGET_NAMESPACE_OPTION ,
+ optionMap.put(Java2WSDLConstants .TARGET_NAMESPACE_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .TARGET_NAMESPACE_OPTION ,
new String[]{getTargetNamespace() })
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .TARGET_NAMESPACE_PREFIX_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .TARGET_NAMESPACE_PREFIX_OPTION ,
+ optionMap.put(Java2WSDLConstants .TARGET_NAMESPACE_PREFIX_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .TARGET_NAMESPACE_PREFIX_OPTION ,
new String[]{getTargetNamespacePrefix()})
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_OPTION ,
+ optionMap.put(Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_OPTION ,
new String[]{getSchemaTargetNamespace() })
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .SERVICE_NAME_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .SERVICE_NAME_OPTION ,
+ optionMap.put(Java2WSDLConstants .SERVICE_NAME_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .SERVICE_NAME_OPTION ,
new String[]{getServiceName() })
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION ,
+ optionMap.put(Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .SCHEMA_TARGET_NAMESPACE_PREFIX_OPTION ,
new String[]{getSchemaTargetNamespacePrefix() })
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .OUTPUT_LOCATION_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .OUTPUT_LOCATION_OPTION ,
+ optionMap.put(Java2WSDLConstants .OUTPUT_LOCATION_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .OUTPUT_LOCATION_OPTION ,
new String[]{getOutputLocation()})
);
- optionMap.put(CommandLineOptionConstants.Java2WSDLConstants .OUTPUT_FILENAME_OPTION ,
- new Java2WSDLCommandLineOption(CommandLineOptionConstants .Java2WSDLConstants .OUTPUT_FILENAME_OPTION ,
+ optionMap.put(Java2WSDLConstants .OUTPUT_FILENAME_OPTION ,
+ new Java2WSDLCommandLineOption(Java2WSDLConstants .OUTPUT_FILENAME_OPTION ,
new String[]{getOutputWSDLName()})
);
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/component/WizardPanel.java Fri Jul 27 15:08:09 2007
@@ -32,11 +32,13 @@
private ImageIcon panelImage;
private String panelBottomTitle;
private String error;
+ private String frametitle;
private boolean flag;
private boolean progressFlag;
public static final int WSDL_2_JAVA_TYPE = 1;
public static final int JAVA_2_WSDL_TYPE = 2;
- public static final int UNSPECIFIED_TYPE = 3;
+ public static final int SERVICE_ARCHIVE_TYPE=3;
+ public static final int UNSPECIFIED_TYPE = 4;
private boolean isPageComplete = false;
public WizardPanel(WizardComponents wizardComponents) {
@@ -45,7 +47,7 @@
public WizardPanel(WizardComponents wizardComponents, String title) {
this.wizardComponents = wizardComponents;
- this.panelTopTitle = title;
+ this.frametitle = title;
java.net.URL resource = WizardPanel.class.getResource("/icons/asf-feather.png");
setPanelImage(new ImageIcon(resource));
}
@@ -111,6 +113,13 @@
return progressFlag;
}
+ public String getFrameTitle(){
+ return this.frametitle;
+ }
+
+ public void setFrameTitle(String title){
+ this.frametitle=title;
+ }
// next
protected boolean goNext() {
if (wizardComponents.getWizardPanelList().size() > wizardComponents.getCurrentIndex()+1 ) {
@@ -132,7 +141,7 @@
}
}
- protected void switchPanel(int panelIndex) {
+ public void switchPanel(int panelIndex) {
getWizardComponents().setCurrentIndex(panelIndex);
getWizardComponents().updateComponents();
}
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ChooserPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ChooserPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ChooserPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ChooserPanel.java Fri Jul 27 15:08:09 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.axis2.tools.idea;
import org.apache.axis2.tools.component.WizardPanel;
@@ -29,8 +47,9 @@
private boolean flag=false;
private JRadioButton optionJ2WRadioButton;
private JRadioButton optionW2JRadioButton;
+ private JRadioButton optionServiceArchiverRadioButton;
private ButtonGroup bg;
- private char selectedOption = 'A'; // 'N' is no option selected 'A', 'B' & 'F' stands for options
+ private char selectedOption = 'A'; // 'N' is no option selected 'A', 'B','C' & 'F' stands for options
final private String hint="You can generate java code from a WSDL or WSDL from a java source file.";
/**
* construct method for chooserPanel
@@ -39,7 +58,7 @@
public ChooserPanel(WizardComponents wizardComponents){
- super(wizardComponents, "ChooserPanel");
+ super(wizardComponents, "Axis2 Idea Plugin Wizards");
setPanelTopTitle("Select the wizard");
setPanelBottomTitle("Welcome to the Axis2 code generator wizard");
init();
@@ -56,9 +75,11 @@
optionW2JRadioButton = new JRadioButton("Generate java sorce code from a WSDl file.",true);
optionJ2WRadioButton = new JRadioButton("Generate a WSDl from a java source file",false);
+ optionServiceArchiverRadioButton = new JRadioButton("Create Service Archiver",false);
ButtonGroup bg = new ButtonGroup();
bg.add(optionJ2WRadioButton);
bg.add(optionW2JRadioButton);
+ bg.add(optionServiceArchiverRadioButton);
this.setLayout(new GridBagLayout() );
@@ -97,11 +118,26 @@
}
}
});
+ // option button for service Archive
+
+ this.add(optionServiceArchiverRadioButton
+ , new GridBagConstraints(0, 3, 1, 1, 1.0, 0.0
+ , GridBagConstraints.NORTHWEST , GridBagConstraints.NONE
+ , new Insets(10, 20, 0,0), 0, 0));
+ optionServiceArchiverRadioButton .addItemListener(new ItemListener() {
+ public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ selectedOption = 'C';
+ update();
+ }
+ }
+ });
+
// hint button
this.add(btnHint,
- new GridBagConstraints(0,3, 1, 1, 1.0,0.0
+ new GridBagConstraints(0,4, 1, 1, 1.0,0.0
, GridBagConstraints.NORTHWEST , GridBagConstraints.NONE
, new Insets(10, 20, 0,0), 0, 0));
btnHint.addActionListener(new ActionListener() {
@@ -122,7 +158,7 @@
// hint lable
this.add(lblHint,
- new GridBagConstraints(0, 4, 1, 1, 1.0, 1.0
+ new GridBagConstraints(0, 5, 1, 1, 1.0, 1.0
, GridBagConstraints.NORTHWEST , GridBagConstraints.NONE
, new Insets(10, 20, 0,0), 0, 0));
@@ -136,10 +172,10 @@
*/
public void update() {
- setNextButtonEnabled((selectedOption == 'A') || (selectedOption == 'B') );
+ setNextButtonEnabled((selectedOption == 'A') || (selectedOption == 'B') ||(selectedOption == 'C'));
setBackButtonEnabled(false); // there is no way back
setProgressPanelVisible(false);
- setPageComplete(true);
+ setPageComplete(true);
}
/**
@@ -151,8 +187,11 @@
} else if (selectedOption == 'B') {
switchPanel(CodegenFrame.PANEL_FIRST_B );
- setNextButtonEnabled(false);
}
+ else if (selectedOption == 'C') {
+ switchPanel(CodegenFrame.PANEL_FIRST_C );
+ }
+ setNextButtonEnabled(false);
}
/**
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/FirstPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/FirstPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/FirstPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/FirstPanel.java Fri Jul 27 15:08:09 2007
@@ -52,7 +52,7 @@
private CodegenBean codegenBean;
public FirstPanel(WizardComponents wizardComponents,CodegenBean codegenBean) {
- super(wizardComponents, "Option was choosed");
+ super(wizardComponents, "Axis2 Idea Plugin WSDL2Java Wizards");
this.codegenBean=codegenBean;
setPanelTopTitle("WSDL selection page");
setPanelBottomTitle("please Select the WSDl file location");
@@ -157,7 +157,6 @@
setPageComplete(false);
}
setBackButtonEnabled(true);
-
}
public int getPageType() {
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/ProgressBarPanel.java Fri Jul 27 15:08:09 2007
@@ -22,10 +22,9 @@
import java.awt.*;
import java.lang.reflect.InvocationTargetException;
-public class
- ProgressBarPanel extends JPanel {
+public class ProgressBarPanel extends JPanel {
private volatile boolean stop = false;
- private static int DELAY = 100;
+ private static int DELAY = 500;
public volatile String val=null;
private JLabel progressDescription;
private JProgressBar progressSent;
@@ -65,7 +64,7 @@
public void aboutToDisplayPanel() {
setProgressValue(0);
- setProgressText("Connecting to Server...");
+ // setProgressText("Connecting to Server...");
}
public void displayingPanel() {
@@ -84,7 +83,7 @@
int value = progressSent .getValue();
progressSent .setValue(value+4);
setProgressValue(value+4);
- progressDescription .setText("Genarate Code. Please wait.....");
+ // progressDescription .setText("Genarate Code. Please wait.....");
} else if(!stop){
progressSent .setIndeterminate(true);
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/SecondPanel.java Fri Jul 27 15:08:09 2007
@@ -58,7 +58,7 @@
private CodegenBean codegenBean;
public SecondPanel(WizardComponents wizardComponents,CodegenBean codegenBean) {
- super(wizardComponents, "Option was choosed");
+ super(wizardComponents, "Axis2 Idea Plugin WSDL2Java Wizards");
this.codegenBean=codegenBean;
setPanelTopTitle("Options");
setPanelBottomTitle("Set the options for the code generator. If you wish to edit the codegen options, Select custom");
@@ -374,15 +374,15 @@
serviceXML.setEnabled(false);
serverSideInterface.setEnabled(false);
}
- if(!rdasync.isSelected()){
+ if(rdasync.isSelected()){
rdasync.setEnabled(true);
- rdasync.setSelected(true);
+ rdasync.setSelected(false);
}else{
rdasync.setEnabled(true);
}
- if(rdBoth.isSelected()){
+ if(!rdBoth.isSelected()){
rdBoth.setEnabled(true);
- rdBoth.setSelected(false);
+ rdBoth.setSelected(true);
}else{
rdBoth.setEnabled(true);
}
@@ -492,7 +492,6 @@
//setComboBoxEnable(false);
// load the ports
loadPortNames();
- //Todo error message null
} else {
// service name list being empty means we are switching to
// the interface mode
@@ -501,7 +500,6 @@
// disable the combo's
// setComboBoxEnable(false);
//this is not an error
- //Todo error message null
}
@@ -513,12 +511,10 @@
} catch (WSDLException e) {
// disable the combo's
setComboBoxEnable(false);
- //Todo error message "Specified WSDL is invalid!, Please select a validated *.wsdl/*.xml file on previous page."
}
catch (Exception e) {
// disable the combo's
setComboBoxEnable(false);
- //Todo error message "Specified WSDL is not found!, Please Check whether you have entered the correct path to a *.wsdl on previous page."
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDL2JavaOutputPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDL2JavaOutputPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDL2JavaOutputPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDL2JavaOutputPanel.java Fri Jul 27 15:08:09 2007
@@ -83,10 +83,10 @@
public WSDL2JavaOutputPanel(WizardComponents wizardComponents,CodegenBean codegenBean, Project project) {
- super(wizardComponents, "Output");
+ super(wizardComponents, "Axis2 Idea Plugin WSDL2Java Wizards");
this.codegenBean=codegenBean;
this.project=project;
- setPanelTopTitle("output");
+ setPanelTopTitle("Output");
setPanelBottomTitle("set the out location for the generated code");
init();
}
@@ -128,9 +128,8 @@
chbAddAxisCodegenJar =new JCheckBox("Add the Axis2 Codegen jars to the codegen resulted project");
chbAddAxisLib =new JCheckBox(" Add Axis2 libraries to the codegen result project ");
chbCreateJar=new JCheckBox(" Create a jar file of codegen result project and add to resulted project lib folder(Default :CodegenResults.jar)");
- chbAddAxisLib.setEnabled(false);//Todo after writing include axis2 jar file it must remove
- radCurrentProject =new JRadioButton("Browse and select a project on current idea workspace");
- radCustomLocation =new JRadioButton("Browse and select location on local file system");
+ radCurrentProject =new JRadioButton("Browse and select a project on current idea workspace",false);
+ radCustomLocation =new JRadioButton("Browse and select location on local file system",true);
ButtonGroup buttonGroup= new ButtonGroup();
buttonGroup.add(radCurrentProject );
buttonGroup.add(radCustomLocation);
@@ -341,7 +340,7 @@
new GridBagConstraints(0, 16, GridBagConstraints.REMAINDER, 1, 0.1, 1.0
, GridBagConstraints.NORTHWEST , GridBagConstraints.BOTH
, new Insets(10, 20, 0,0), 0, 0));
-
+ update();
}
public void back() {
switchPanel(CodegenFrame.PANEL_OPTION_A );
@@ -352,8 +351,7 @@
public void update(){
setNextButtonEnabled(false);
checkPageComlete();
- setEnabledForAddAxisLib();
-
+ setEnabledForAddAxisLib();
}
public void loadCmbCurrentProject() {
Module modules[] = codegenBean .getModules();
@@ -571,26 +569,26 @@
private void handleModifyEvent() {
String text = this.txtoutput.getText();
if ((text == null) || (text.trim().equals(""))) {
- //Todo error message "output location needs to be specified"
+ // error message "output location needs to be specified"
return;
}
- //Todo error message null
+ // error message null
}
private void handleAxisHomeModifyEvent() {
String text = this.txtaxisHome.getText();
if ((text == null) || (text.trim().equals(""))) {
- //Todo error message "output location needs to be specified"
+ // error message "output location needs to be specified"
return;
}
- //Todo error message null
+ // error message null
}
private void handleJarNameModifyEvent() {
String text = this.txtjarFileName.getText();
if ((text == null) || (text.trim().equals(""))) {
- //Todo error message "output location needs to be specified"
+ // error message "output location needs to be specified"
return;
}
- //Todo error message null
+ // error message null
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDLFileFilter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDLFileFilter.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDLFileFilter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/WSDLFileFilter.java Fri Jul 27 15:08:09 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
+ *
+ * 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.axis2.tools.idea;
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/MiddlePanel.java Fri Jul 27 15:08:09 2007
@@ -69,7 +69,7 @@
* @param wsdlgenBean
*/
public MiddlePanel(WizardComponents wizardComponents ,WsdlgenBean wsdlgenBean) {
- super(wizardComponents, "Java source / classpath selection");
+ super(wizardComponents, "Axis2 Idea Plugin Java2WSDL Wizards");
setPanelTopTitle("Java source / classpath selection");
setPanelBottomTitle("Select the classes and the libraries");
this.wsdlgenBean=wsdlgenBean;
@@ -245,8 +245,10 @@
public void next() {
if(txtClass.getText()!=null && isPageComplete()){
switchPanel(CodegenFrame.PANEL_OPTION_B );
- } else
+ } else{
switchPanel(CodegenFrame.PANEL_FIRST_B );
+ setNextButtonEnabled(false);
+ }
}
//back
public void back() {
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OptionPanel.java Fri Jul 27 15:08:09 2007
@@ -30,8 +30,7 @@
/**
* this is the first panel of java2wsdl wizard
*/
-public class
- OptionPanel extends WizardPanel{
+public class OptionPanel extends WizardPanel{
/**
* variable
*/
@@ -48,7 +47,7 @@
* @param wsdlgenBean
*/
public OptionPanel(WizardComponents wizardComponents,WsdlgenBean wsdlgenBean){
- super(wizardComponents, "Option was choosed");
+ super(wizardComponents, "Axis2 Idea Plugin Java2WSDL Wizards");
setPanelTopTitle("Java to WSDL Options");
setPanelBottomTitle("Set the Option for the generation");
this.wsdlgenBean=wsdlgenBean;
@@ -143,6 +142,8 @@
txtSchemaTargetNspPrefix.setText(wsdlgenBean.getSchemaTargetNamespacePrefix());
if(wsdlgenBean.getServiceName()!=null )
txtService.setText(wsdlgenBean.getServiceName());
+ ((OutputPanel)getWizardComponents().getWizardPanel(CodegenFrame.PANEL_LAST_B)).loadCmbCurrentProject();
+ ((OutputPanel)getWizardComponents().getWizardPanel(CodegenFrame.PANEL_LAST_B)).loadcmbModuleSrcProject();
setBackButtonEnabled(true);
setNextButtonEnabled(true);
setFinishButtonEnabled(false);
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/java2wsdl/OutputPanel.java Fri Jul 27 15:08:09 2007
@@ -41,10 +41,14 @@
private JComboBox cmbModuleSrc;
private JTextField txtLocation;
private JTextField txtFileName;
+ private JLabel lblModule;
+ private JLabel lblDirect;
+ private JLabel lblOutput;
private JButton btnBrowes;
final JFileChooser DirChooser=new JFileChooser();
private Project project;
private WsdlgenBean wsdlgenBean;
+ private boolean flag = true;
/**
* Constructor
@@ -53,7 +57,7 @@
* @param project
*/
public OutputPanel(WizardComponents wizardComponents,WsdlgenBean wsdlgenBean, Project project){
- super(wizardComponents, "Option was choosed");
+ super(wizardComponents, "Axis2 Idea Plugin Java2WSDL Wizards");
setPanelTopTitle("WSDl file output location");
setPanelBottomTitle("Select the location for the generated WSDL");
this.wsdlgenBean=wsdlgenBean;
@@ -62,57 +66,75 @@
}
private void init(){
- rbtnAdd =new JRadioButton("Browes and Add the WSDL to a project on current Idea workspace",false);
+ rbtnAdd =new JRadioButton("Browes and Add the WSDL to a project on current Idea workspace",true);
- rbtnSave =new JRadioButton("Browes and Save the WSDL file on local file system",true);
+ rbtnSave =new JRadioButton("Browes and Save the WSDL file on local file system",false);
cmbCurrentProject =new JComboBox();
- cmbCurrentProject.setEnabled(false);
+ cmbCurrentProject.setEnabled(true);
cmbModuleSrc=new JComboBox();
- cmbModuleSrc.setEnabled(false);
+ cmbModuleSrc.setEnabled(true);
ButtonGroup buttonGroup= new ButtonGroup();
buttonGroup.add(rbtnAdd );
buttonGroup.add(rbtnSave );
- txtFileName =new JTextField();
+ txtFileName =new JTextField("service.wsdl");
txtLocation=new JTextField();
btnBrowes=new JButton("Browse..");
+ lblOutput=new JLabel("OutPut Location");
+ lblModule=new JLabel("Select the Module");
+ lblModule.setEnabled(false);
+ lblDirect=new JLabel("Select the Directory");
+ lblDirect.setEnabled(false);
setBackButtonEnabled(true);
setNextButtonEnabled(false);
setFinishButtonEnabled(false);
this.setLayout(new GridBagLayout());
+ this.add(new JLabel("OutPut File Name")
+ , new GridBagConstraints(0, 0, 1, 1, 0.1, 0.0
+ , GridBagConstraints.WEST , GridBagConstraints.NONE
+ , new Insets(5, 10, 0, 0), 0, 0));
+
+ this.add(txtFileName
+ , new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0
+ , GridBagConstraints.WEST , GridBagConstraints.HORIZONTAL
+ , new Insets(5, 10, 0, 0), 0, 0));
+
+
this.add(new JLabel("Select the location where to put the output")
- , new GridBagConstraints(0, 0, GridBagConstraints.REMAINDER, 1, 0.0, 0.0
+ , new GridBagConstraints(0, 1, GridBagConstraints.REMAINDER, 1, 0.0, 0.0
, GridBagConstraints.WEST , GridBagConstraints.NONE
, new Insets(5, 10, 0, 10), 0, 0));
this.add(rbtnAdd
- , new GridBagConstraints(0, 1, GridBagConstraints.REMAINDER, 1, 0.0, 0.0
+ , new GridBagConstraints(0, 2, GridBagConstraints.REMAINDER, 1, 0.0, 0.0
, GridBagConstraints.WEST , GridBagConstraints.NONE
, new Insets(5, 10, 0,10), 0, 0));
rbtnAdd.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- loadCmbCurrentProject();
cmbCurrentProject.setEnabled(true);
cmbModuleSrc.setEnabled(true);
- txtLocation.setEnabled(false);
+ lblModule.setEnabled(true);
+ txtLocation .setEnabled(false);
btnBrowes.setEnabled(false);
- setFinishButtonEnabled(true);
+ loadCmbCurrentProject();
+ loadcmbModuleSrcProject();
+ setFinishButtonEnabled(true);
update();
}
});
- this.add(new JLabel("Select the Module")
- , new GridBagConstraints(0, 2, 1, 1, 0.1, 0.0
+ this.add(lblModule
+ , new GridBagConstraints(0, 3, 1, 1, 0.1, 0.0
, GridBagConstraints.WEST , GridBagConstraints.NONE
, new Insets(5, 10, 0, 0), 0, 0));
this.add(cmbCurrentProject
- , new GridBagConstraints(1, 2, GridBagConstraints.RELATIVE, 1, 1.0, 0.0
+ , new GridBagConstraints(1, 3, GridBagConstraints.RELATIVE, 1, 1.0, 0.0
, GridBagConstraints.WEST , GridBagConstraints.HORIZONTAL
, new Insets(5, 10, 0,0), 0, 0));
cmbCurrentProject.addActionListener(new ActionListener() {
@@ -121,47 +143,48 @@
update();
}
});
- this.add(new JLabel("Select the Directory")
- , new GridBagConstraints(0, 3, 1, 1, 0.1, 0.0
+ this.add(lblDirect
+ , new GridBagConstraints(0, 4, 1, 1, 0.1, 0.0
, GridBagConstraints.WEST , GridBagConstraints.NONE
, new Insets(5, 10, 0, 0), 0, 0));
this.add(cmbModuleSrc
- , new GridBagConstraints(1, 3, GridBagConstraints.RELATIVE, 1, 1.0, 0.0
+ , new GridBagConstraints(1, 4, GridBagConstraints.RELATIVE, 1, 1.0, 0.0
, GridBagConstraints.WEST , GridBagConstraints.HORIZONTAL
, new Insets(5, 10, 0,0), 0, 0));
cmbModuleSrc.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(ActionEvent e) {
update();
}
});
this.add(rbtnSave
- , new GridBagConstraints(0, 4, GridBagConstraints.REMAINDER, 1, 0.0, 0.0
+ , new GridBagConstraints(0, 5, GridBagConstraints.REMAINDER, 1, 1.0, 0.0
, GridBagConstraints.WEST , GridBagConstraints.NONE
, new Insets(5, 10, 0,0), 0, 0));
rbtnSave.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
cmbCurrentProject.setEnabled(false);
cmbModuleSrc.setEnabled(false);
- txtLocation.setEnabled(true);
+ txtLocation .setEnabled(true);
btnBrowes.setEnabled(true);
+ setEnabledForCustomProject();
update();
}
});
- this.add(new JLabel("OutPut Location")
- , new GridBagConstraints(0, 5, 1, 1, 0.1, 0.0
- , GridBagConstraints.WEST , GridBagConstraints.NONE
+ this.add(lblOutput
+ , new GridBagConstraints(0, 6, 1, 1, 0.1, 1.0
+ , GridBagConstraints.NORTHWEST , GridBagConstraints.NONE
, new Insets(5, 10, 0,0), 0, 0));
this.add(txtLocation
- , new GridBagConstraints(1, 5, 1, 1, 1.0, 0.0
- , GridBagConstraints.WEST , GridBagConstraints.HORIZONTAL
+ , new GridBagConstraints(1, 6, 1, 1, 1.0, 1.0
+ , GridBagConstraints.NORTHWEST , GridBagConstraints.HORIZONTAL
, new Insets(5, 10, 0, 0), 0, 0));
this.add(btnBrowes
- , new GridBagConstraints(2, 5, 1, 1, 0.1, 0.0
- , GridBagConstraints.CENTER , GridBagConstraints.NONE
+ , new GridBagConstraints(2, 6, 1, 1, 0.1, 1.0
+ , GridBagConstraints.NORTHWEST , GridBagConstraints.NONE
, new Insets(5, 10, 0, 10), 0, 0));
btnBrowes.addActionListener(new ActionListener() {
@@ -177,16 +200,6 @@
}
});
- this.add(new JLabel("OutPut File Name")
- , new GridBagConstraints(0, 6, 1, 1, 0.1, 1.0
- , GridBagConstraints.NORTHWEST , GridBagConstraints.NONE
- , new Insets(5, 10, 0, 0), 0, 0));
-
- this.add(txtFileName
- , new GridBagConstraints(1, 6, 1, 1, 1.0, 1.0
- , GridBagConstraints.NORTHWEST , GridBagConstraints.HORIZONTAL
- , new Insets(5, 10, 0, 0), 0, 0));
-
wsdlgenBean.setProject(project);
}
@@ -198,6 +211,7 @@
cmbCurrentProject.addItem(modules[count].getName());
}
}else{
+ rbtnSave.setSelected(true);
rbtnAdd.setEnabled(false);
}
}
@@ -212,14 +226,19 @@
cmbModuleSrc.addItem(src[count]);
}
count = src.length;
- }else{
- rbtnAdd.setEnabled(false);
- cmbCurrentProject.setEnabled(false);
- cmbModuleSrc.setEnabled(false);
}
-
-
+ if (flag)
+ {
+ if (count == 0) {
+ flag =false;
+ setEnabledForCustomProject();
+ }
+ else{
+ setEnabledForCurrentProject();
+ }
+ }
}
+
public void back() {
switchPanel(CodegenFrame.PANEL_OPTION_B );
}
@@ -260,5 +279,33 @@
public int getPageType() {
return WizardPanel.JAVA_2_WSDL_TYPE;
}
+ private void setEnabledForCurrentProject(){
+ rbtnAdd.setSelected(true);
+ rbtnAdd.setEnabled(true);
+ cmbCurrentProject.setEnabled(true);
+ cmbModuleSrc.setEnabled(true);
+ lblDirect.setEnabled(true);
+ lblModule .setEnabled(true);
+ rbtnSave.setSelected(false);
+ txtLocation.setEnabled(false);
+ lblOutput .setEnabled(false);
+ btnBrowes.setEnabled(false);
+ }
+ private void setEnabledForCustomProject(){
+ if(flag){
+ rbtnAdd.setEnabled(false);
+ rbtnAdd.setSelected(false);
+ }else{
+ rbtnSave .setEnabled(true);
+ rbtnSave .setSelected(true);
+ }
+ cmbCurrentProject.setEnabled(false);
+ cmbModuleSrc.setEnabled(false);
+ lblDirect.setEnabled(false);
+ lblModule .setEnabled(false);
+ txtLocation .setEnabled(true);
+ lblOutput .setEnabled(true);
+ btnBrowes .setEnabled(true);
+ }
}
-
\ No newline at end of file
+
Modified: webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java?view=diff&rev=560403&r1=560402&r2=560403
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/wizardframe/CodegenFrame.java Fri Jul 27 15:08:09 2007
@@ -24,11 +24,14 @@
import org.apache.axis2.tools.idea.ChooserPanel;
import org.apache.axis2.tools.idea.SecondPanel;
import org.apache.axis2.tools.idea.WSDL2JavaOutputPanel;
+//import org.apache.axis2.tools.idea.WSDL2JavaOutputPanel;
import org.apache.axis2.tools.component.Utilities;
import org.apache.axis2.tools.component.WizardPanel;
import org.apache.axis2.tools.java2wsdl.MiddlePanel;
import org.apache.axis2.tools.java2wsdl.OptionPanel;
import org.apache.axis2.tools.java2wsdl.OutputPanel;
+import org.apache.ideaplugin.frames.*;
+import org.apache.ideaplugin.bean.ArchiveBean;
import com.intellij.openapi.project.Project;
/**
@@ -46,19 +49,22 @@
public static final int PANEL_OPTION_B = 4;
public static final int PANEL_LAST_A = 5;
public static final int PANEL_LAST_B = 6;
+ public static final int PANEL_FIRST_C=7;
+ public static final int PANEL_SECOND_C=8;
+ public static final int PANEL_THIRD_C=9;
+ public static final int PANEL_FOURTH_C=10;
+ public static final int PANEL_LOAD_C=11;
+ public static final int PANEL_OPTION_C=12;
+ public static final int PANEL_LAST_C=13;
public CodegenFrame() {
init();
}
private void init() {
- this.setTitle("Axis2 Codegen Wizard");
-
+ this.setTitle("Axis2 Codegen Wizard");
WizardPanel panel = null;
- wsdlgenBean= new WsdlgenBean();
- codegenBean = new CodegenBean();
-
panel = new ChooserPanel(getWizardComponents());
getWizardComponents().addWizardPanel(PANEL_CHOOSER , panel);
@@ -75,13 +81,31 @@
getWizardComponents().addWizardPanel(PANEL_OPTION_B , panel);
panel = new WSDL2JavaOutputPanel(getWizardComponents(),codegenBean,project);
- getWizardComponents().addWizardPanel(PANEL_LAST_A , panel);
+ getWizardComponents().addWizardPanel(PANEL_LAST_A , panel);
panel = new OutputPanel(getWizardComponents(),wsdlgenBean,project);
getWizardComponents().addWizardPanel(PANEL_LAST_B , panel);
- setSize(getPreferredSize());
- Utilities.centerComponentOnScreen(this);
+ panel = new ClassFileLocationPage(getWizardComponents(),archiveBean);
+ getWizardComponents().addWizardPanel(PANEL_FIRST_C , panel);
+
+ panel = new WSDLFileSelectionPage(getWizardComponents(),archiveBean);
+ getWizardComponents().addWizardPanel(PANEL_SECOND_C , panel);
+
+ panel = new LibraryAddingPage(getWizardComponents(),archiveBean);
+ getWizardComponents().addWizardPanel(PANEL_THIRD_C , panel);
+
+ panel = new ServiceXMLFileSelectionPage(getWizardComponents(),archiveBean);
+ getWizardComponents().addWizardPanel(PANEL_FOURTH_C , panel);
+
+ panel = new ServiceXMLGenerationPage(getWizardComponents(),archiveBean);
+ getWizardComponents().addWizardPanel(PANEL_LOAD_C , panel);
+
+ panel = new ServiceXMLEditPage(getWizardComponents(),archiveBean) ;
+ getWizardComponents().addWizardPanel(PANEL_OPTION_C , panel);
+
+ panel = new ServiceArchiveOutputLocationPage(getWizardComponents(),archiveBean);
+ getWizardComponents().addWizardPanel(PANEL_LAST_C , panel);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org