Author: Grid.Qian
Date: 2008-04-24 05:37:56 -0400 (Thu, 24 Apr 2008)
New Revision: 7730
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/InitialCommnad.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java
Log:
change for java2wsdl
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/InitialCommnad.java
===================================================================
---
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/InitialCommnad.java 2008-04-24
09:32:12 UTC (rev 7729)
+++
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/InitialCommnad.java 2008-04-24
09:37:56 UTC (rev 7730)
@@ -21,22 +21,21 @@
import org.jboos.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
import org.jboos.tools.ws.creation.core.utils.WSDLPropertyReader;
-public class InitialCommnad extends AbstractDataModelOperation{
+public class InitialCommnad extends AbstractDataModelOperation {
private ServiceModel model;
private IWebService ws;
private int scenario;
-
- public InitialCommnad(ServiceModel model ,IWebService ws, int scenario){
+
+ public InitialCommnad(ServiceModel model, IWebService ws, int scenario) {
this.model = model;
this.ws = ws;
- this.scenario = scenario;
+ this.scenario = scenario;
}
-
+
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- IStatus status = Status.OK_STATUS;
model.setTarget(JBossWSCreationCoreMessages.getString("VALUE_TARGET_2"));
if (scenario == WebServiceScenario.TOPDOWN) {
@@ -48,15 +47,16 @@
}catch (WSDLException e) {
return StatusUtils.errorStatus(e.getLocalizedMessage(), e);
}
+ }else {
+ model.setServiceClass(ws.getWebServiceInfo().getImplURL());
}
return Status.OK_STATUS;
}
- public ServiceModel getWebServiceDataModel()
- {
-
+ public ServiceModel getWebServiceDataModel() {
+
return model;
}
-
+
}
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java
===================================================================
---
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-04-24
09:32:12 UTC (rev 7729)
+++
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-04-24
09:37:56 UTC (rev 7730)
@@ -37,7 +37,7 @@
command = "cmd wsprovide.bat";
}
String args = getCommandlineArgs();
- command += " -k " + args + " " + model.getWsdlURI();
+ command += " -k " + args + " " + model.getServiceClass();
try {
@@ -73,15 +73,13 @@
String commandLine;
String project = model.getWebProjectName();
String projectRoot = JBossWSCreationUtils.getProjectRoot(project).toOSString();
- commandLine = "-o " + projectRoot + Path.SEPARATOR + "src";
+ commandLine = "-s " + projectRoot + Path.SEPARATOR + "src";
- String customePkg = model.getCustomPackage();
- if(customePkg != null && !"".equals(customePkg)){
- commandLine += " -p " + customePkg;
- }
+ if(model.isGenWSDL()){
+ commandLine += " -w ";
+ }
+ commandLine += " -o " + projectRoot + Path.SEPARATOR +
"WebContext" + Path.SEPARATOR + "wsdl";
-
-
return commandLine;
}
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java
===================================================================
---
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java 2008-04-24
09:32:12 UTC (rev 7729)
+++
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java 2008-04-24
09:37:56 UTC (rev 7730)
@@ -15,6 +15,7 @@
private List<String> bindingFileLocation = new ArrayList<String>();
private String catalog;
private String serviceClass;
+ private boolean isGenWSDL;
private String target;
@@ -70,6 +71,14 @@
public void addBindingFile(String bindingFileLocation){
this.bindingFileLocation.add(bindingFileLocation);
}
+
+ public boolean isGenWSDL() {
+ return isGenWSDL;
+ }
+
+ public void setGenWSDL(boolean isGenWSDL) {
+ this.isGenWSDL = isGenWSDL;
+ }
public String getCatalog(){
return this.catalog;