You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [11/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/ core/src/org/apache/axis2/...
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Mon Jul 11 10:48:55 2005
@@ -32,7 +32,11 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMText;
import org.apache.axis2.om.impl.llom.OMTextImpl;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.util.Utils;
@@ -46,9 +50,11 @@
import java.io.InputStream;
public class EchoRawMTOMTest extends TestCase {
- private EndpointReference targetEPR = new EndpointReference(AddressingConstants.WSA_TO, "http://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService/echoOMElement");
+ private EndpointReference targetEPR = new EndpointReference(
+ AddressingConstants.WSA_TO,
+ "http://127.0.0.1:"
+ + (UtilServer.TESTING_PORT)
+ + "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
@@ -57,7 +63,7 @@
private QName operationName = new QName("echoOMElement");
private QName transportName = new QName("http://localhost/my",
- "NullTransport");
+ "NullTransport");
private String imageInFileName = "img/test.jpg";
@@ -84,7 +90,7 @@
protected void setUp() throws Exception {
UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
service = Utils.createSimpleService(serviceName, Echo.class.getName(),
- operationName);
+ operationName);
UtilServer.deployService(service);
serviceContext = UtilServer.getConfigurationContext()
.createServiceContext(service.getName());
@@ -103,11 +109,13 @@
OMElement rpcWrapEle = fac.createOMElement("echoOMElement", omNs);
OMElement data = fac.createOMElement("data", omNs);
Image expectedImage;
- expectedImage = new JDK13IO()
- .loadImage(getResourceAsStream("org/apache/axis2/mtom/test.jpg"));
+ expectedImage =
+ new JDK13IO()
+ .loadImage(
+ getResourceAsStream("org/apache/axis2/mtom/test.jpg"));
ImageDataSource dataSource = new ImageDataSource("test.jpg",
- expectedImage);
+ expectedImage);
expectedDH = new DataHandler(dataSource);
OMTextImpl textData = new OMTextImpl(expectedDH, true);
data.addChild(textData);
@@ -127,10 +135,11 @@
call.setTo(targetEPR);
call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
call.setTransportInfo(Constants.TRANSPORT_HTTP,
- Constants.TRANSPORT_HTTP, false);
+ Constants.TRANSPORT_HTTP, false);
OMElement result = (OMElement) call.invokeBlocking(operationName
- .getLocalPart(), payload);
+ .getLocalPart(),
+ payload);
// result.serializeWithCache(new
// OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
OMElement ele = (OMElement) result.getFirstChild();
@@ -138,7 +147,7 @@
DataHandler actualDH;
actualDH = binaryNode.getDataHandler();
Image actualObject = new JDK13IO().loadImage(actualDH.getDataSource()
- .getInputStream());
+ .getInputStream());
FileOutputStream imageOutStream = new FileOutputStream("testout.jpg");
new JDK13IO().saveImage("image/jpeg", actualObject, imageOutStream);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Mon Jul 11 10:48:55 2005
@@ -31,7 +31,11 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMOutput;
import org.apache.axis2.om.impl.llom.OMTextImpl;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.util.Utils;
@@ -45,13 +49,14 @@
public class EchoRawMTOMToBase64Test extends TestCase {
private EndpointReference targetEPR =
new EndpointReference(AddressingConstants.WSA_TO,
- "http://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService/echoMTOMtoBase64");
+ "http://127.0.0.1:"
+ + (UtilServer.TESTING_PORT)
+ + "/axis/services/EchoXMLService/echoMTOMtoBase64");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoMTOMtoBase64");
- private QName transportName = new QName("http://localhost/my", "NullTransport");
+ private QName transportName = new QName("http://localhost/my",
+ "NullTransport");
private AxisConfiguration engineRegistry;
private MessageContext mc;
@@ -74,11 +79,12 @@
UtilServer.start();
service =
Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
+ Echo.class.getName(),
+ operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(service.getName());
+ UtilServer.getConfigurationContext().createServiceContext(
+ service.getName());
}
protected void tearDown() throws Exception {
@@ -94,7 +100,8 @@
OMElement data = fac.createOMElement("data", omNs);
byte[] byteArray = new byte[]{13, 56, 65, 32, 12, 12, 7, -3, -2, -1,
98};
- DataHandler dataHandler = new DataHandler(new ByteArrayDataSource(byteArray));
+ DataHandler dataHandler = new DataHandler(
+ new ByteArrayDataSource(byteArray));
OMTextImpl textData = new OMTextImpl(dataHandler, true);
data.addChild(textData);
rpcWrapEle.addChild(data);
@@ -111,12 +118,19 @@
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call();
call.setTo(targetEPR);
- call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
- call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+ call.set(Constants.Configuration.ENABLE_MTOM,
+ Constants.VALUE_TRUE);
+ call.setTransportInfo(Constants.TRANSPORT_HTTP,
+ Constants.TRANSPORT_HTTP,
+ false);
OMElement result =
- (OMElement) call.invokeBlocking(operationName.getLocalPart(), payload);
- result.serializeWithCache(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
+ (OMElement) call.invokeBlocking(
+ operationName.getLocalPart(), payload);
+ result.serializeWithCache(
+ new OMOutput(
+ XMLOutputFactory.newInstance()
+ .createXMLStreamWriter(System.out)));
call.close();
System.out.println(i);
}
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/HttpGetRESTBasedTest.java Mon Jul 11 10:48:55 2005
@@ -47,7 +47,9 @@
UtilServer.start();
ServiceDescription service =
- Utils.createSimpleService(serviceName, Echo.class.getName(), operationName);
+ Utils.createSimpleService(serviceName,
+ Echo.class.getName(),
+ operationName);
UtilServer.deployService(service);
}
@@ -60,11 +62,13 @@
public void testEchoXMLSync() throws Exception {
//TODO support the GET with the Simple Axis Server and enable this test case
URL wsdlrequestUrl =
- new URL("http://127.0.0.1:5555/axis2/services/EchoXMLService/echoOMElement?value1=value1,value2=value2");
+ new URL(
+ "http://127.0.0.1:5555/axis2/services/EchoXMLService/echoOMElement?value1=value1,value2=value2");
HttpURLConnection connection = (HttpURLConnection) wsdlrequestUrl.openConnection();
BufferedReader reader =
- new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ new BufferedReader(
+ new InputStreamReader(connection.getInputStream()));
connection.getResponseCode();
String line = reader.readLine();
while (line != null) {
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Mon Jul 11 10:48:55 2005
@@ -31,7 +31,11 @@
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMOutput;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
@@ -44,13 +48,14 @@
public class RESTBasedEchoRawXMLTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference(AddressingConstants.WSA_TO,
- "http://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService/echoOMElement");
+ "http://127.0.0.1:"
+ + (UtilServer.TESTING_PORT)
+ + "/axis/services/EchoXMLService/echoOMElement");
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
- private QName transportName = new QName("http://localhost/my", "NullTransport");
+ private QName transportName = new QName("http://localhost/my",
+ "NullTransport");
private AxisConfiguration engineRegistry;
private MessageContext mc;
@@ -76,15 +81,18 @@
protected void setUp() throws Exception {
UtilServer.start();
- Parameter parameter = new ParameterImpl(Constants.Configuration.ENABLE_REST, "true");
- ((AxisConfigurationImpl) UtilServer.getConfigurationContext().getAxisConfiguration()).addParameter(parameter);
+ Parameter parameter = new ParameterImpl(
+ Constants.Configuration.ENABLE_REST, "true");
+ ((AxisConfigurationImpl) UtilServer.getConfigurationContext()
+ .getAxisConfiguration()).addParameter(parameter);
service =
Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
+ Echo.class.getName(),
+ operationName);
UtilServer.deployService(service);
serviceContext =
- UtilServer.getConfigurationContext().createServiceContext(service.getName());
+ UtilServer.getConfigurationContext().createServiceContext(
+ service.getName());
//
// Runnable runnable = new Runnable() {
// public void run() {
@@ -140,7 +148,8 @@
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement method = fac.createOMElement("echoOMElement", omNs);
OMElement value = fac.createOMElement("myValue", omNs);
- value.addChild(fac.createText(value, "Isaac Assimov, the foundation Sega"));
+ value.addChild(
+ fac.createText(value, "Isaac Assimov, the foundation Sega"));
method.addChild(value);
return method;
@@ -155,11 +164,17 @@
org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call();
call.setTo(targetEPR);
- call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
+ call.setTransportInfo(Constants.TRANSPORT_HTTP,
+ Constants.TRANSPORT_HTTP,
+ false);
call.setDoREST(true);
OMElement result =
- (OMElement) call.invokeBlocking(operationName.getLocalPart(), payload);
- result.serializeWithCache(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
+ (OMElement) call.invokeBlocking(operationName.getLocalPart(),
+ payload);
+ result.serializeWithCache(
+ new OMOutput(
+ XMLOutputFactory.newInstance().createXMLStreamWriter(
+ System.out)));
System.out.println(messageInfo.requestMessage);
call.close();
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Mon Jul 11 10:48:55 2005
@@ -30,7 +30,11 @@
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilsTCPServer;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMOutput;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.Utils;
@@ -42,12 +46,13 @@
public class TCPEchoRawXMLTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference(AddressingConstants.WSA_TO,
- "tcp://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService/echoOMElement");
+ "tcp://127.0.0.1:"
+ + (UtilServer.TESTING_PORT)
+ + "/axis/services/EchoXMLService/echoOMElement");
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
- private QName transportName = new QName("http://localhost/my", "NullTransport");
+ private QName transportName = new QName("http://localhost/my",
+ "NullTransport");
private MessageContext mc;
private SimpleHTTPServer sas;
@@ -71,14 +76,14 @@
//create and deploy the service
service =
Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
+ Echo.class.getName(),
+ operationName);
UtilsTCPServer.deployService(service);
ServiceDescription service =
Utils.createSimpleService(serviceName,
- org.apache.axis2.engine.Echo.class.getName(),
- operationName);
+ org.apache.axis2.engine.Echo.class.getName(),
+ operationName);
serviceContext = UtilServer.createAdressedEnabledClientSide(service);
}
@@ -91,7 +96,8 @@
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement method = fac.createOMElement("echoOMElement", omNs);
OMElement value = fac.createOMElement("myValue", omNs);
- value.addChild(fac.createText(value, "Isaac Assimov, the foundation Sega"));
+ value.addChild(
+ fac.createText(value, "Isaac Assimov, the foundation Sega"));
method.addChild(value);
return method;
@@ -100,16 +106,22 @@
public void testEchoXMLASync() throws Exception {
OMElement payload = createEnvelope();
- org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(serviceContext);
+ org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
+ serviceContext);
call.setTo(targetEPR);
call.engageModule(new QName(Constants.MODULE_ADDRESSING));
- call.setTransportInfo(Constants.TRANSPORT_TCP, Constants.TRANSPORT_TCP, false);
+ call.setTransportInfo(Constants.TRANSPORT_TCP,
+ Constants.TRANSPORT_TCP,
+ false);
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
try {
- result.getResponseEnvelope().serializeWithCache(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
+ result.getResponseEnvelope().serializeWithCache(
+ new OMOutput(
+ XMLOutputFactory.newInstance()
+ .createXMLStreamWriter(System.out)));
} catch (XMLStreamException e) {
reportError(e);
} finally {
@@ -123,13 +135,16 @@
}
};
- call.invokeNonBlocking(operationName.getLocalPart(), payload, callback);
+ call.invokeNonBlocking(operationName.getLocalPart(),
+ payload,
+ callback);
int index = 0;
while (!finish) {
Thread.sleep(1000);
index++;
if (index > 10) {
- throw new AxisFault("Server is shutdown as the Async response take too longs time");
+ throw new AxisFault(
+ "Server is shutdown as the Async response take too longs time");
}
}
call.close();
@@ -140,23 +155,30 @@
OMElement payload = createEnvelope();
- org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(serviceContext);
+ org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
+ serviceContext);
call.setTo(targetEPR);
call.engageModule(new QName(Constants.MODULE_ADDRESSING));
- call.setTransportInfo(Constants.TRANSPORT_TCP, Constants.TRANSPORT_TCP, false);
+ call.setTransportInfo(Constants.TRANSPORT_TCP,
+ Constants.TRANSPORT_TCP,
+ false);
OMElement result =
- (OMElement) call.invokeBlocking(operationName.getLocalPart(), payload);
- result.serializeWithCache(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
+ (OMElement) call.invokeBlocking(operationName.getLocalPart(),
+ payload);
+ result.serializeWithCache(
+ new OMOutput(
+ XMLOutputFactory.newInstance().createXMLStreamWriter(
+ System.out)));
call.close();
}
public void testEchoXMLCompleteSync() throws Exception {
ServiceDescription service =
Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
+ Echo.class.getName(),
+ operationName);
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -166,13 +188,20 @@
value.setText("Isaac Assimov, the foundation Sega");
method.addChild(value);
- org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(serviceContext);
+ org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
+ serviceContext);
call.setTo(targetEPR);
call.engageModule(new QName(Constants.MODULE_ADDRESSING));
- call.setTransportInfo(Constants.TRANSPORT_TCP, Constants.TRANSPORT_TCP, true);
-
- OMElement result = (OMElement) call.invokeBlocking(operationName.getLocalPart(), method);
- result.serializeWithCache(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
+ call.setTransportInfo(Constants.TRANSPORT_TCP,
+ Constants.TRANSPORT_TCP,
+ true);
+
+ OMElement result = (OMElement) call.invokeBlocking(
+ operationName.getLocalPart(), method);
+ result.serializeWithCache(
+ new OMOutput(
+ XMLOutputFactory.newInstance().createXMLStreamWriter(
+ System.out)));
call.close();
}
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Mon Jul 11 10:48:55 2005
@@ -30,7 +30,11 @@
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilsTCPServer;
-import org.apache.axis2.om.*;
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMOutput;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.Utils;
@@ -41,12 +45,13 @@
public class TCPTwoChannelEchoRawXMLTest extends TestCase {
private EndpointReference targetEPR =
new EndpointReference(AddressingConstants.WSA_TO,
- "tcp://127.0.0.1:"
- + (UtilServer.TESTING_PORT)
- + "/axis/services/EchoXMLService/echoOMElement");
+ "tcp://127.0.0.1:"
+ + (UtilServer.TESTING_PORT)
+ + "/axis/services/EchoXMLService/echoOMElement");
private QName serviceName = new QName("EchoXMLService");
private QName operationName = new QName("echoOMElement");
- private QName transportName = new QName("http://localhost/my", "NullTransport");
+ private QName transportName = new QName("http://localhost/my",
+ "NullTransport");
private MessageContext mc;
private SimpleHTTPServer sas;
@@ -70,14 +75,14 @@
//create and deploy the service
service =
Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
+ Echo.class.getName(),
+ operationName);
UtilsTCPServer.deployService(service);
ServiceDescription service =
Utils.createSimpleService(serviceName,
- org.apache.axis2.engine.Echo.class.getName(),
- operationName);
+ org.apache.axis2.engine.Echo.class.getName(),
+ operationName);
serviceContext = UtilServer.createAdressedEnabledClientSide(service);
}
@@ -90,7 +95,8 @@
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement method = fac.createOMElement("echoOMElement", omNs);
OMElement value = fac.createOMElement("myValue", omNs);
- value.addChild(fac.createText(value, "Isaac Assimov, the foundation Sega"));
+ value.addChild(
+ fac.createText(value, "Isaac Assimov, the foundation Sega"));
method.addChild(value);
return method;
@@ -99,8 +105,8 @@
public void testEchoXMLCompleteASync() throws Exception {
ServiceDescription service =
Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
+ Echo.class.getName(),
+ operationName);
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -111,16 +117,22 @@
value.setText("Isaac Assimov, the foundation Sega");
method.addChild(value);
- org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(serviceContext);
+ org.apache.axis2.clientapi.Call call = new org.apache.axis2.clientapi.Call(
+ serviceContext);
call.engageModule(new QName(Constants.MODULE_ADDRESSING));
try {
call.setTo(targetEPR);
- call.setTransportInfo(Constants.TRANSPORT_TCP, Constants.TRANSPORT_TCP, true);
+ call.setTransportInfo(Constants.TRANSPORT_TCP,
+ Constants.TRANSPORT_TCP,
+ true);
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
try {
- result.getResponseEnvelope().serialize(new OMOutput(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out)));
+ result.getResponseEnvelope().serialize(
+ new OMOutput(
+ XMLOutputFactory.newInstance()
+ .createXMLStreamWriter(System.out)));
} catch (XMLStreamException e) {
reportError(e);
} finally {
@@ -134,13 +146,16 @@
}
};
- call.invokeNonBlocking(operationName.getLocalPart(), method, callback);
+ call.invokeNonBlocking(operationName.getLocalPart(),
+ method,
+ callback);
int index = 0;
while (!finish) {
Thread.sleep(1000);
index++;
if (index > 10) {
- throw new AxisFault("Server is shutdown as the Async response take too longs time");
+ throw new AxisFault(
+ "Server is shutdown as the Async response take too longs time");
}
}
} finally {
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/ant/AntCodegenTask.java Mon Jul 11 10:48:55 2005
@@ -57,46 +57,56 @@
Map optionMap = new HashMap();
optionMap.put(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION,
- new CommandLineOption(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION,
- getStringArray(WSDLFileName)));
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION,
+ getStringArray(WSDLFileName)));
if (asyncOnly) {
optionMap
.put(CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION,
- new CommandLineOption(CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION,
- new String[0]));
+ new CommandLineOption(
+ CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION,
+ new String[0]));
}
if (syncOnly) {
optionMap
.put(CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION,
- new CommandLineOption(CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION,
- new String[0]));
+ new CommandLineOption(
+ CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION,
+ new String[0]));
}
optionMap.put(CommandLineOptionConstants.PACKAGE_OPTION,
- new CommandLineOption(CommandLineOptionConstants.PACKAGE_OPTION,
- getStringArray(packageName)));
+ new CommandLineOption(
+ CommandLineOptionConstants.PACKAGE_OPTION,
+ getStringArray(packageName)));
optionMap.put(CommandLineOptionConstants.STUB_LANGUAGE_OPTION,
- new CommandLineOption(CommandLineOptionConstants.STUB_LANGUAGE_OPTION,
- getStringArray(language)));
+ new CommandLineOption(
+ CommandLineOptionConstants.STUB_LANGUAGE_OPTION,
+ getStringArray(language)));
optionMap.put(CommandLineOptionConstants.OUTPUT_LOCATION_OPTION,
- new CommandLineOption(CommandLineOptionConstants.OUTPUT_LOCATION_OPTION,
- getStringArray(output)));
+ new CommandLineOption(
+ CommandLineOptionConstants.OUTPUT_LOCATION_OPTION,
+ getStringArray(output)));
if (serverSide) {
optionMap.put(CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION,
- new CommandLineOption(CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION,
- new String[0]));
+ new CommandLineOption(
+ CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION,
+ new String[0]));
if (generateServerXml) {
- optionMap.put(CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
- new CommandLineOption(CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
- new String[0]));
+ optionMap.put(
+ CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
+ new String[0]));
}
}
if (testcase) {
optionMap
.put(CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION,
- new CommandLineOption(CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION,
- new String[0]));
+ new CommandLineOption(
+ CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION,
+ new String[0]));
}
//System.out.println(page3.getOutputLocation());
return optionMap;
@@ -105,7 +115,9 @@
private WSDLDescription getWOM(String wsdlLocation) throws WSDLException,
IOException {
InputStream in = new FileInputStream(new File(wsdlLocation));
- WSDLVersionWrapper wsdlvWrap = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
+ WSDLVersionWrapper wsdlvWrap = WOMBuilderFactory.getBuilder(
+ WOMBuilderFactory.WSDL11)
+ .build(in);
return wsdlvWrap.getDescription();
}
@@ -119,7 +131,8 @@
public void execute() throws BuildException {
try {
- CommandLineOptionParser parser = new CommandLineOptionParser(this.fillOptionMap());
+ CommandLineOptionParser parser = new CommandLineOptionParser(
+ this.fillOptionMap());
new CodeGenerationEngine(parser).generate();
} catch (Throwable e) {
throw new BuildException(e);
@@ -165,7 +178,8 @@
public static void main(String[] args) {
AntCodegenTask task = new AntCodegenTask();
- task.setWSDLFileName("modules/samples/test-resources/wsdl/compound2.wsdl");
+ task.setWSDLFileName(
+ "modules/samples/test-resources/wsdl/compound2.wsdl");
task.setOutput("temp");
task.execute();
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/Java2WSDLGenerator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/Java2WSDLGenerator.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/Java2WSDLGenerator.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/Java2WSDLGenerator.java Mon Jul 11 10:48:55 2005
@@ -41,7 +41,9 @@
Vector listOfIncludedMethods) throws Throwable {
try {
- ClassUtils.setDefaultClassLoader(ClassUtils.createClassLoader(classPath, this.getClass().getClassLoader()));
+ ClassUtils.setDefaultClassLoader(
+ ClassUtils.createClassLoader(classPath,
+ this.getClass().getClassLoader()));
// Instantiate the emitter
Emitter emitter = new Emitter();
@@ -50,7 +52,8 @@
emitter.setCls(implementationClassName);
//service location
- if (serviceLocationUrl != null && !serviceLocationUrl.trim().equals(""))
+ if (serviceLocationUrl != null &&
+ !serviceLocationUrl.trim().equals(""))
emitter.setLocationUrl(serviceLocationUrl);
//input wsdl
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Mon Jul 11 10:48:55 2005
@@ -67,34 +67,62 @@
String outputLocation) {
Map optionMap = new HashMap();
//WSDL file name
- optionMap.put(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION, new CommandLineOption(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION, getStringArray(WSDLFileName)));
+ optionMap.put(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION,
+ getStringArray(WSDLFileName)));
//Async only
if (isAyncOnly) {
- optionMap.put(CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION, new CommandLineOption(CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION, new String[0]));
+ optionMap.put(CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.CODEGEN_ASYNC_ONLY_OPTION,
+ new String[0]));
}
//sync only
if (isSyncOnly) {
- optionMap.put(CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION, new CommandLineOption(CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION, new String[0]));
+ optionMap.put(CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.CODEGEN_SYNC_ONLY_OPTION,
+ new String[0]));
}
//serverside
if (isServerSide) {
- optionMap.put(CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION, new CommandLineOption(CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION, new String[0]));
+ optionMap.put(CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.SERVER_SIDE_CODE_OPTION,
+ new String[0]));
//server xml
if (isServerXML) {
- optionMap.put(CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION, new CommandLineOption(CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION, new String[0]));
+ optionMap.put(
+ CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
+ new String[0]));
}
}
//test case
if (isTestCase) {
- optionMap.put(CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION, new CommandLineOption(CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION, new String[0]));
+ optionMap.put(CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.GENERATE_TEST_CASE_OPTION,
+ new String[0]));
}
//package name
- optionMap.put(CommandLineOptionConstants.PACKAGE_OPTION, new CommandLineOption(CommandLineOptionConstants.PACKAGE_OPTION, getStringArray(packageName)));
+ optionMap.put(CommandLineOptionConstants.PACKAGE_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.PACKAGE_OPTION,
+ getStringArray(packageName)));
//selected language
- optionMap.put(CommandLineOptionConstants.STUB_LANGUAGE_OPTION, new CommandLineOption(CommandLineOptionConstants.STUB_LANGUAGE_OPTION, getStringArray(mapLanguagesWithCombo(selectedLanguage))));
+ optionMap.put(CommandLineOptionConstants.STUB_LANGUAGE_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.STUB_LANGUAGE_OPTION,
+ getStringArray(mapLanguagesWithCombo(selectedLanguage))));
//output location
- optionMap.put(CommandLineOptionConstants.OUTPUT_LOCATION_OPTION, new CommandLineOption(CommandLineOptionConstants.OUTPUT_LOCATION_OPTION, getStringArray(outputLocation)));
+ optionMap.put(CommandLineOptionConstants.OUTPUT_LOCATION_OPTION,
+ new CommandLineOption(
+ CommandLineOptionConstants.OUTPUT_LOCATION_OPTION,
+ getStringArray(outputLocation)));
// System.out.println(page3.getOutputLocation());
return optionMap;
@@ -108,7 +136,8 @@
* @throws WSDLException when WSDL File is invalid
* @throws IOException on errors reading the WSDL file
*/
- public WSDLDescription getWOM(String wsdlLocation) throws WSDLException, IOException {
+ public WSDLDescription getWOM(String wsdlLocation) throws WSDLException,
+ IOException {
InputStream in = new FileInputStream(new File(wsdlLocation));
return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in);
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Mon Jul 11 10:48:55 2005
@@ -47,7 +47,7 @@
super();
setNeedsProgressMonitor(true);
this.setWindowTitle(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("general.name"));
+ .getResourceString("general.name"));
}
/**
@@ -96,7 +96,8 @@
public IWizardPage getNextPage(IWizardPage page) {
AbstractWizardPage currentPage = (AbstractWizardPage) page;
- AbstractWizardPage pageout = (AbstractWizardPage) super.getNextPage(page);
+ AbstractWizardPage pageout = (AbstractWizardPage) super.getNextPage(
+ page);
while (pageout != null && selectedWizardType != pageout.getPageType()) {
AbstractWizardPage temp = pageout;
@@ -126,11 +127,14 @@
throw new RuntimeException("Invalid state!");
}
} catch (Exception e) {
- MessageDialog.openError(getShell(), CodegenWizardPlugin.getResourceString("general.Error"), e.getMessage());
+ MessageDialog.openError(getShell(),
+ CodegenWizardPlugin.getResourceString("general.Error"),
+ e.getMessage());
return false;
}
- MessageDialog.openInformation(this.getShell(), CodegenWizardPlugin.getResourceString("general.name"),
- CodegenWizardPlugin.getResourceString("wizard.success"));
+ MessageDialog.openInformation(this.getShell(), CodegenWizardPlugin.getResourceString(
+ "general.name"),
+ CodegenWizardPlugin.getResourceString("wizard.success"));
return true;
}
@@ -147,7 +151,10 @@
/*
* "3" is the total amount of steps, see below monitor.worked(amount)
*/
- monitor.beginTask(CodegenWizardPlugin.getResourceString("generator.generating"), 3);
+ monitor.beginTask(
+ CodegenWizardPlugin.getResourceString(
+ "generator.generating"),
+ 3);
try {
/*
@@ -158,23 +165,30 @@
* we will be informed by Axis2 about the progress of code generation.
*/
WSDL2JavaGenerator generator = new WSDL2JavaGenerator();
- monitor.subTask(CodegenWizardPlugin.getResourceString("generator.readingWOM"));
- WSDLDescription wom = generator.getWOM(wsdlSelectionPage.getFileName());
+ monitor.subTask(
+ CodegenWizardPlugin.getResourceString(
+ "generator.readingWOM"));
+ WSDLDescription wom = generator.getWOM(
+ wsdlSelectionPage.getFileName());
monitor.worked(1);
- Map optionsMap = generator.fillOptionMap(optionsPage.isAsyncOnlyOn(),
- optionsPage.isSyncOnlyOn(),
- optionsPage.isServerside(),
- optionsPage.isServerXML(),
- optionsPage.isGenerateTestCase(),
- wsdlSelectionPage.getFileName(),
- optionsPage.getPackageName(),
- optionsPage.getSelectedLanguage(),
- outputPage.getOutputLocation());
- CodeGenConfiguration codegenConfig = new CodeGenConfiguration(wom, optionsMap);
+ Map optionsMap = generator.fillOptionMap(
+ optionsPage.isAsyncOnlyOn(),
+ optionsPage.isSyncOnlyOn(),
+ optionsPage.isServerside(),
+ optionsPage.isServerXML(),
+ optionsPage.isGenerateTestCase(),
+ wsdlSelectionPage.getFileName(),
+ optionsPage.getPackageName(),
+ optionsPage.getSelectedLanguage(),
+ outputPage.getOutputLocation());
+ CodeGenConfiguration codegenConfig = new CodeGenConfiguration(
+ wom, optionsMap);
monitor.worked(1);
- monitor.subTask(CodegenWizardPlugin.getResourceString("generator.generating"));
+ monitor.subTask(
+ CodegenWizardPlugin.getResourceString(
+ "generator.generating"));
new CodeGenerationEngine(codegenConfig).generate();
monitor.worked(1);
} catch (Exception e) {
@@ -211,21 +225,25 @@
/*
* "2" is the total amount of steps, see below monitor.worked(amount)
*/
- monitor.beginTask(CodegenWizardPlugin.getResourceString("generator.generating"), 2);
+ monitor.beginTask(
+ CodegenWizardPlugin.getResourceString(
+ "generator.generating"),
+ 2);
try {
monitor.worked(1);
- new Java2WSDLGenerator().emit(javaSourceSelectionPage.getClassLocation(),
- javaSourceSelectionPage.getClassName(),
- java2wsdlOptionsPage.getLocationURL(),
- java2wsdlOptionsPage.getInputWSDLName(),
- java2wsdlOptionsPage.getBindingName(),
- java2wsdlOptionsPage.getPortypeName(),
- java2wsdlOptionsPage.getStyle(),
- java2wsdlOutputLocationPage.getFullFileName(),
- java2wsdlOptionsPage.getMode(),
- javaSourceSelectionPage.getSelectedMethods());
+ new Java2WSDLGenerator().emit(
+ javaSourceSelectionPage.getClassLocation(),
+ javaSourceSelectionPage.getClassName(),
+ java2wsdlOptionsPage.getLocationURL(),
+ java2wsdlOptionsPage.getInputWSDLName(),
+ java2wsdlOptionsPage.getBindingName(),
+ java2wsdlOptionsPage.getPortypeName(),
+ java2wsdlOptionsPage.getStyle(),
+ java2wsdlOutputLocationPage.getFullFileName(),
+ java2wsdlOptionsPage.getMode(),
+ javaSourceSelectionPage.getSelectedMethods());
monitor.worked(1);
} catch (Throwable e) {
throw new RuntimeException(e);
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/plugin/CodegenWizardPlugin.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/plugin/CodegenWizardPlugin.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/plugin/CodegenWizardPlugin.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/plugin/CodegenWizardPlugin.java Mon Jul 11 10:48:55 2005
@@ -24,7 +24,9 @@
super();
plugin = this;
try {
- resourceBundle = ResourceBundle.getBundle("org.apache.axis.tool.codegen.resource.Codegen");
+ resourceBundle =
+ ResourceBundle.getBundle(
+ "org.apache.axis.tool.codegen.resource.Codegen");
} catch (MissingResourceException x) {
resourceBundle = null;
}
@@ -56,7 +58,8 @@
* or 'key' if not found.
*/
public static String getResourceString(String key) {
- ResourceBundle bundle = CodegenWizardPlugin.getDefault().getResourceBundle();
+ ResourceBundle bundle = CodegenWizardPlugin.getDefault()
+ .getResourceBundle();
try {
return (bundle != null) ? bundle.getString(key) : key;
} catch (MissingResourceException e) {
@@ -73,7 +76,9 @@
public static ImageDescriptor getWizardImageDescriptor() {
if (wizardImageDescriptor == null) {
- wizardImageDescriptor = CodegenWizardPlugin.imageDescriptorFromPlugin("Axis2_Codegen_Wizard", "icons/asf-feather.gif");
+ wizardImageDescriptor =
+ CodegenWizardPlugin.imageDescriptorFromPlugin(
+ "Axis2_Codegen_Wizard", "icons/asf-feather.gif");
}
return wizardImageDescriptor;
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/AbstractWizardPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/AbstractWizardPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/AbstractWizardPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/AbstractWizardPage.java Mon Jul 11 10:48:55 2005
@@ -32,7 +32,8 @@
protected void init(String pageName) {
setTitle(CodegenWizardPlugin.getResourceString(pageName + ".title"));
- setDescription(CodegenWizardPlugin.getResourceString(pageName + ".desc"));
+ setDescription(
+ CodegenWizardPlugin.getResourceString(pageName + ".desc"));
setImageDescriptor(CodegenWizardPlugin.getWizardImageDescriptor());
/*
@@ -42,7 +43,7 @@
IDialogSettings rootSettings = CodegenWizardPlugin.getDefault()
.getDialogSettings();
IDialogSettings section = rootSettings.getSection(this.getClass()
- .getName());
+ .getName());
if (section == null) {
settings = rootSettings.addNewSection(this.getClass().getName());
restoredFromPreviousSettings = false;
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaSourceSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaSourceSelectionPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaSourceSelectionPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaSourceSelectionPage.java Mon Jul 11 10:48:55 2005
@@ -74,11 +74,12 @@
Label label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page4.javafilelocation.label"));
+ .getResourceString("page4.javafilelocation.label"));
javaClassFileLocationBox = new Text(container, SWT.BORDER);
javaClassFileLocationBox.setLayoutData(gd);
- javaClassFileLocationBox.setText(settings.get(JAVA_CLASS_LOCATION_NAME));
+ javaClassFileLocationBox.setText(
+ settings.get(JAVA_CLASS_LOCATION_NAME));
javaClassFileLocationBox.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
handleLocationTextChange();
@@ -88,7 +89,7 @@
Button browseButton = new Button(container, SWT.PUSH);
browseButton.setText(CodegenWizardPlugin
- .getResourceString("general.browse"));
+ .getResourceString("general.browse"));
browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
handleDirectoryBrowse();
@@ -97,7 +98,7 @@
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page4.classname.label"));
+ .getResourceString("page4.classname.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
javaClassNameBox = new Text(container, SWT.BORDER);
@@ -111,7 +112,7 @@
Button searchButton = new Button(container, SWT.PUSH);
searchButton.setText(CodegenWizardPlugin
- .getResourceString("general.search"));
+ .getResourceString("general.search"));
searchButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateTable();
@@ -136,7 +137,9 @@
gd = new GridData(GridData.FILL_BOTH);
gd.horizontalSpan = 3;
gd.verticalSpan = 5;
- table = new Table(container, SWT.SINGLE | SWT.FULL_SELECTION | SWT.CHECK);
+ table =
+ new Table(container,
+ SWT.SINGLE | SWT.FULL_SELECTION | SWT.CHECK);
table.setLinesVisible(true);
table.setHeaderVisible(true);
table.setLayoutData(gd);
@@ -241,7 +244,8 @@
items[i] = new TableItem(table, SWT.NONE);
items[i].setText(1, methods[i].getName());
items[i].setText(2, methods[i].getReturnType().getName());
- items[i].setText(3, methods[i].getParameterTypes().length + "");
+ items[i].setText(3,
+ methods[i].getParameterTypes().length + "");
items[i].setChecked(true);//check them all by default
}
table.setVisible(true);
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java Mon Jul 11 10:48:55 2005
@@ -127,21 +127,22 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
Label label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page5.inputwsdl.label"));
+ .getResourceString("page5.inputwsdl.label"));
inputWSDLNameTextBox = new Text(container, SWT.BORDER | SWT.SINGLE);
inputWSDLNameTextBox.setLayoutData(gd);
inputWSDLNameTextBox.setText(settings.get(PREF_JAVA_INPUT_WSDL_NAME));
inputWSDLNameTextBox.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- settings.put(PREF_JAVA_INPUT_WSDL_NAME, inputWSDLNameTextBox.getText());
+ settings.put(PREF_JAVA_INPUT_WSDL_NAME,
+ inputWSDLNameTextBox.getText());
//dialogChanged();
}
});
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page5.servicelocation.label"));
+ .getResourceString("page5.servicelocation.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
serviceLocationURLTextBox = new Text(container, SWT.BORDER);
@@ -149,14 +150,15 @@
serviceLocationURLTextBox.setText(settings.get(PREF_JAVA_LOCATION));
serviceLocationURLTextBox.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- settings.put(PREF_JAVA_LOCATION, serviceLocationURLTextBox.getText());
+ settings.put(PREF_JAVA_LOCATION,
+ serviceLocationURLTextBox.getText());
//dialogChanged();
}
});
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page5.binding.label"));
+ .getResourceString("page5.binding.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
bindingTextBox = new Text(container, SWT.BORDER);
@@ -171,7 +173,7 @@
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page5.porttype.label"));
+ .getResourceString("page5.porttype.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
portTypeNameTextBox = new Text(container, SWT.BORDER);
@@ -179,7 +181,8 @@
portTypeNameTextBox.setText(settings.get(PREF_JAVA_PORTYPE_NAME));
portTypeNameTextBox.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- settings.put(PREF_JAVA_PORTYPE_NAME, portTypeNameTextBox.getText());
+ settings.put(PREF_JAVA_PORTYPE_NAME,
+ portTypeNameTextBox.getText());
//dialogChanged();
}
});
@@ -188,16 +191,19 @@
label = new Label(container, SWT.NULL);
label
.setText(CodegenWizardPlugin
- .getResourceString("page5.mode.label"));
+ .getResourceString("page5.mode.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
- modeSelectionCombo = new Combo(container, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+ modeSelectionCombo =
+ new Combo(container,
+ SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
modeSelectionCombo.setLayoutData(gd);
// modeSelectionCombo.
populateModeCombo();
modeSelectionCombo.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_JAVA_MODE_INDEX, modeSelectionCombo.getSelectionIndex());
+ settings.put(PREF_JAVA_MODE_INDEX,
+ modeSelectionCombo.getSelectionIndex());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -208,15 +214,18 @@
label = new Label(container, SWT.NULL);
label
.setText(CodegenWizardPlugin
- .getResourceString("page5.style.label"));
+ .getResourceString("page5.style.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
- styleSelectionCombo = new Combo(container, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+ styleSelectionCombo =
+ new Combo(container,
+ SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
styleSelectionCombo.setLayoutData(gd);
populateStyleCombo();
styleSelectionCombo.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_JAVA_STYLE_INDEX, styleSelectionCombo.getSelectionIndex());
+ settings.put(PREF_JAVA_STYLE_INDEX,
+ styleSelectionCombo.getSelectionIndex());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -245,7 +254,8 @@
}
public int getMode() {
- String selectedOption = modeSelectionCombo.getItem(modeSelectionCombo.getSelectionIndex());
+ String selectedOption = modeSelectionCombo.getItem(
+ modeSelectionCombo.getSelectionIndex());
if (WSDL_ALL.equals(selectedOption)) {
return Emitter.MODE_ALL;
} else if (WSDL_INTERFACE_ONLY.equals(selectedOption)) {
@@ -259,7 +269,9 @@
public String getStyle() {
- return this.styleSelectionCombo.getItem(styleSelectionCombo.getSelectionIndex()).toUpperCase();
+ return this.styleSelectionCombo.getItem(
+ styleSelectionCombo.getSelectionIndex())
+ .toUpperCase();
}
public String getLocationURL() {
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOutputLocationPage.java Mon Jul 11 10:48:55 2005
@@ -49,7 +49,8 @@
* @see org.apache.axis.tool.codegen.eclipse.ui.AbstractWizardPage#initializeDefaultSettings()
*/
protected void initializeDefaultSettings() {
- settings.put(PREF_JAVA_OUTPUT_WSDL_LOCATION, System.getProperty("user.dir"));
+ settings.put(PREF_JAVA_OUTPUT_WSDL_LOCATION,
+ System.getProperty("user.dir"));
settings.put(JAVA_OUTPUT_WSDL_NAME, "service.wsdl");
}
@@ -74,11 +75,12 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
Label label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page6.output.label"));
+ .getResourceString("page6.output.label"));
outputFolderTextBox = new Text(container, SWT.BORDER);
outputFolderTextBox.setLayoutData(gd);
- outputFolderTextBox.setText(settings.get(PREF_JAVA_OUTPUT_WSDL_LOCATION));
+ outputFolderTextBox.setText(
+ settings.get(PREF_JAVA_OUTPUT_WSDL_LOCATION));
outputFolderTextBox.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
handleFolderTextChange();
@@ -87,7 +89,7 @@
Button browseButton = new Button(container, SWT.PUSH);
browseButton.setText(CodegenWizardPlugin
- .getResourceString("general.browse"));
+ .getResourceString("general.browse"));
browseButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
handleBrowse();
@@ -99,7 +101,7 @@
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page6.outputname.label"));
+ .getResourceString("page6.outputname.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
outputFileNameTextBox = new Text(container, SWT.BORDER);
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java Mon Jul 11 10:48:55 2005
@@ -114,16 +114,20 @@
gd.horizontalSpan = 2;
Label label = new Label(container, SWT.NULL);
- label.setText(CodegenWizardPlugin.getResourceString("page2.language.caption"));
+ label.setText(
+ CodegenWizardPlugin.getResourceString("page2.language.caption"));
- languageSelectionComboBox = new Combo(container, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
+ languageSelectionComboBox =
+ new Combo(container,
+ SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
// fill the combo
this.fillLanguageCombo();
languageSelectionComboBox.setLayoutData(gd);
languageSelectionComboBox.select(settings.getInt(PREF_LANGUAGE_INDEX));
languageSelectionComboBox.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_LANGUAGE_INDEX, languageSelectionComboBox.getSelectionIndex());
+ settings.put(PREF_LANGUAGE_INDEX,
+ languageSelectionComboBox.getSelectionIndex());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -131,11 +135,15 @@
});
syncAndAsyncRadioButton = new Button(container, SWT.RADIO);
- syncAndAsyncRadioButton.setText(CodegenWizardPlugin.getResourceString("page2.syncAsync.caption"));
- syncAndAsyncRadioButton.setSelection(settings.getBoolean(PREF_RADIO_SYNC_AND_ASYNC));
+ syncAndAsyncRadioButton.setText(
+ CodegenWizardPlugin.getResourceString(
+ "page2.syncAsync.caption"));
+ syncAndAsyncRadioButton.setSelection(
+ settings.getBoolean(PREF_RADIO_SYNC_AND_ASYNC));
syncAndAsyncRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_RADIO_SYNC_AND_ASYNC, syncAndAsyncRadioButton.getSelection());
+ settings.put(PREF_RADIO_SYNC_AND_ASYNC,
+ syncAndAsyncRadioButton.getSelection());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -143,11 +151,14 @@
});
syncOnlyRadioButton = new Button(container, SWT.RADIO);
- syncOnlyRadioButton.setText(CodegenWizardPlugin.getResourceString("page2.sync.caption"));
- syncOnlyRadioButton.setSelection(settings.getBoolean(PREF_RADIO_SYNC_ONLY));
+ syncOnlyRadioButton.setText(
+ CodegenWizardPlugin.getResourceString("page2.sync.caption"));
+ syncOnlyRadioButton.setSelection(
+ settings.getBoolean(PREF_RADIO_SYNC_ONLY));
syncOnlyRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_RADIO_SYNC_ONLY, syncOnlyRadioButton.getSelection());
+ settings.put(PREF_RADIO_SYNC_ONLY,
+ syncOnlyRadioButton.getSelection());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -156,11 +167,13 @@
asyncOnlyRadioButton = new Button(container, SWT.RADIO);
asyncOnlyRadioButton.setText(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page2.async.caption"));
- asyncOnlyRadioButton.setSelection(settings.getBoolean(PREF_RADIO_ASYNC_ONLY));
+ .getResourceString("page2.async.caption"));
+ asyncOnlyRadioButton.setSelection(
+ settings.getBoolean(PREF_RADIO_ASYNC_ONLY));
asyncOnlyRadioButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_RADIO_ASYNC_ONLY, asyncOnlyRadioButton.getSelection());
+ settings.put(PREF_RADIO_ASYNC_ONLY,
+ asyncOnlyRadioButton.getSelection());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -168,7 +181,8 @@
});
label = new Label(container, SWT.NULL);
- label.setText(CodegenWizardPlugin.getResourceString("page2.package.caption"));
+ label.setText(
+ CodegenWizardPlugin.getResourceString("page2.package.caption"));
packageText = new Text(container, SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -194,12 +208,15 @@
gd.horizontalSpan = 3;
testCaseCheckBoxButton = new Button(container, SWT.CHECK);
testCaseCheckBoxButton.setLayoutData(gd);
- testCaseCheckBoxButton.setText(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page2.testcase.caption"));
- testCaseCheckBoxButton.setSelection(settings.getBoolean(PREF_CHECK_GENERATE_TESTCASE));
+ testCaseCheckBoxButton.setText(
+ org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
+ .getResourceString("page2.testcase.caption"));
+ testCaseCheckBoxButton.setSelection(
+ settings.getBoolean(PREF_CHECK_GENERATE_TESTCASE));
testCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_CHECK_GENERATE_TESTCASE, testCaseCheckBoxButton.getEnabled());
+ settings.put(PREF_CHECK_GENERATE_TESTCASE,
+ testCaseCheckBoxButton.getEnabled());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -207,12 +224,16 @@
});
serverSideCheckBoxButton = new Button(container, SWT.CHECK);
- serverSideCheckBoxButton.setText(CodegenWizardPlugin.getResourceString("page2.serverside.caption"));
- serverSideCheckBoxButton.setSelection(settings.getBoolean(PREF_CHECK_GENERATE_SERVERSIDE));
+ serverSideCheckBoxButton.setText(
+ CodegenWizardPlugin.getResourceString(
+ "page2.serverside.caption"));
+ serverSideCheckBoxButton.setSelection(
+ settings.getBoolean(PREF_CHECK_GENERATE_SERVERSIDE));
serverSideCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
handleServersideSelection();
- settings.put(PREF_CHECK_GENERATE_SERVERSIDE, serverSideCheckBoxButton.getEnabled());
+ settings.put(PREF_CHECK_GENERATE_SERVERSIDE,
+ serverSideCheckBoxButton.getEnabled());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -220,11 +241,15 @@
});
serverXMLCheckBoxButton = new Button(container, SWT.CHECK);
- serverXMLCheckBoxButton.setSelection(settings.getBoolean(PREF_CHECK_GENERATE_SERVERCONFIG));
- serverXMLCheckBoxButton.setText(CodegenWizardPlugin.getResourceString("page2.serviceXML.caption"));
+ serverXMLCheckBoxButton.setSelection(
+ settings.getBoolean(PREF_CHECK_GENERATE_SERVERCONFIG));
+ serverXMLCheckBoxButton.setText(
+ CodegenWizardPlugin.getResourceString(
+ "page2.serviceXML.caption"));
serverXMLCheckBoxButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- settings.put(PREF_CHECK_GENERATE_SERVERCONFIG, serverXMLCheckBoxButton.getEnabled());
+ settings.put(PREF_CHECK_GENERATE_SERVERCONFIG,
+ serverXMLCheckBoxButton.getEnabled());
}
public void widgetDefaultSelected(SelectionEvent e) {
@@ -273,7 +298,8 @@
* @return a string containing the name of the target language
*/
public String getSelectedLanguage() {
- return languageSelectionComboBox.getItem(languageSelectionComboBox.getSelectionIndex());
+ return languageSelectionComboBox.getItem(
+ languageSelectionComboBox.getSelectionIndex());
}
/**
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java Mon Jul 11 10:48:55 2005
@@ -68,7 +68,7 @@
Label label = new Label(container, SWT.NULL);
label
.setText(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page3.output.caption"));
+ .getResourceString("page3.output.caption"));
outputLocation = new Text(container, SWT.BORDER);
outputLocation.setLayoutData(gd);
@@ -83,7 +83,7 @@
browseButton = new Button(container, SWT.PUSH);
browseButton
.setText(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page3.outselection.browse"));
+ .getResourceString("page3.outselection.browse"));
browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
handleBrowse();
@@ -119,7 +119,7 @@
String text = this.outputLocation.getText();
if ((text == null) || (text.trim().equals(""))) {
updateStatus(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page3.error.nolocation"));
+ .getResourceString("page3.error.nolocation"));
return;
}
updateStatus(null);
@@ -139,11 +139,12 @@
outputLocation.setText(returnString);
}
} else {
- ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(),
- ResourcesPlugin.getWorkspace().getRoot(),
- false,
- org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page3.containerbox.title"));
+ ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+ getShell(),
+ ResourcesPlugin.getWorkspace().getRoot(),
+ false,
+ org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
+ .getResourceString("page3.containerbox.title"));
if (dialog.open() == ContainerSelectionDialog.OK) {
Object[] result = dialog.getResult();
if (result.length == 1) {
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/ToolSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/ToolSelectionPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/ToolSelectionPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/ToolSelectionPage.java Mon Jul 11 10:48:55 2005
@@ -64,12 +64,17 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
Label label = new Label(container, SWT.NULL);
- label.setText(CodegenWizardPlugin.getResourceString("page0.options.desc"));
+ label.setText(
+ CodegenWizardPlugin.getResourceString("page0.options.desc"));
wsdl2JavaRadioButton = new Button(container, SWT.RADIO);
- wsdl2JavaRadioButton.setText(CodegenWizardPlugin.getResourceString("page0.wsdl2java.caption"));
- wsdl2JavaRadioButton.setToolTipText(CodegenWizardPlugin.getResourceString("page0.wsdl2java.desc"));
- wsdl2JavaRadioButton.setSelection(settings.getBoolean(PREF_TOOL_SELECTION_WSDL2JAVA));
+ wsdl2JavaRadioButton.setText(
+ CodegenWizardPlugin.getResourceString(
+ "page0.wsdl2java.caption"));
+ wsdl2JavaRadioButton.setToolTipText(
+ CodegenWizardPlugin.getResourceString("page0.wsdl2java.desc"));
+ wsdl2JavaRadioButton.setSelection(
+ settings.getBoolean(PREF_TOOL_SELECTION_WSDL2JAVA));
wsdl2JavaRadioButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
handleCheckboxSelection();
@@ -77,9 +82,13 @@
});
java2WSDLRadioButton = new Button(container, SWT.RADIO);
- java2WSDLRadioButton.setText(CodegenWizardPlugin.getResourceString("page0.java2wsdl.caption"));
- java2WSDLRadioButton.setToolTipText(CodegenWizardPlugin.getResourceString("page0.java2wsdl.desc"));
- java2WSDLRadioButton.setSelection(settings.getBoolean(PREF_TOOL_SELECTION_JAVA2WSDL));
+ java2WSDLRadioButton.setText(
+ CodegenWizardPlugin.getResourceString(
+ "page0.java2wsdl.caption"));
+ java2WSDLRadioButton.setToolTipText(
+ CodegenWizardPlugin.getResourceString("page0.java2wsdl.desc"));
+ java2WSDLRadioButton.setSelection(
+ settings.getBoolean(PREF_TOOL_SELECTION_JAVA2WSDL));
java2WSDLRadioButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
handleCheckboxSelection();
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java Mon Jul 11 10:48:55 2005
@@ -54,7 +54,7 @@
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
Label label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
- .getResourceString("page1.fileselection.label"));
+ .getResourceString("page1.fileselection.label"));
fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
fileText.setLayoutData(gd);
@@ -68,7 +68,7 @@
Button button = new Button(container, SWT.PUSH);
button.setText(CodegenWizardPlugin
- .getResourceString("page1.fileselection.browse"));
+ .getResourceString("page1.fileselection.browse"));
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
handleBrowse();
@@ -96,13 +96,13 @@
if (fileName.length() == 0) {
updateStatus(CodegenWizardPlugin
- .getResourceString("page1.error.filemissingerror"));
+ .getResourceString("page1.error.filemissingerror"));
return;
}
if (!fileName.matches(".*\\.wsdl")) {
updateStatus(org.apache.axis.tool.codegen.eclipse.plugin.CodegenWizardPlugin
- .getResourceString("page1.error.wrongextension"));
+ .getResourceString("page1.error.wrongextension"));
return;
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java Mon Jul 11 10:48:55 2005
@@ -52,7 +52,9 @@
}
- public ArrayList getMethodNamesFromClass(String classFileName, String location) throws IOException, ClassNotFoundException {
+ public ArrayList getMethodNamesFromClass(String classFileName,
+ String location) throws IOException,
+ ClassNotFoundException {
ArrayList returnList = new ArrayList();
File fileEndpoint = new File(location);
if (!fileEndpoint.exists())
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java Mon Jul 11 10:48:55 2005
@@ -33,7 +33,10 @@
this.setOwningTarget(new org.apache.tools.ant.Target());
}
- public void writeJarFile(File outputFolder, String outputFileName, File inputFileFolder) throws IOException, Exception {
+ public void writeJarFile(File outputFolder,
+ String outputFileName,
+ File inputFileFolder) throws IOException,
+ Exception {
if (!outputFolder.exists()) {
outputFolder.mkdir(); //create the output path
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java Mon Jul 11 10:48:55 2005
@@ -21,10 +21,14 @@
*/
public class ServiceFileCreator {
- public File createServiceFile(String providerClassName, String serviceClass, ArrayList methodList) throws Exception {
+ public File createServiceFile(String providerClassName,
+ String serviceClass,
+ ArrayList methodList) throws Exception {
- String content = this.getFileString(providerClassName, serviceClass, methodList);
+ String content = this.getFileString(providerClassName,
+ serviceClass,
+ methodList);
File serviceFile = new File("service.xml");
FileWriter fileWriter = new FileWriter(serviceFile);
@@ -36,7 +40,9 @@
}
- private String getFileString(String providerClassName, String serviceClass, ArrayList methodList) {
+ private String getFileString(String providerClassName,
+ String serviceClass,
+ ArrayList methodList) {
String str = "<service provider=\"" +
providerClassName + "\" >" +
" <java:implementation class=\"" +