Author: dennyxu Date: 2008-04-23 21:57:09 -0400 (Wed, 23 Apr 2008) New Revision: 7721 Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 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.ui/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java Log: Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/.project 2008-04-24 01:57:09 UTC (rev 7721) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboos.tools.ws.creation.core</name> + <name>org.jboss.tools.ws.creation.core</name> <comment></comment> <projects> </projects> Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/META-INF/MANIFEST.MF 2008-04-24 01:57:09 UTC (rev 7721) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.jboos.tools.ws.creation.core +Bundle-SymbolicName: org.jboss.tools.ws.creation.core Bundle-Version: 1.0.0 Bundle-Activator: org.jboos.tools.ws.creation.core.JBossWSCreationCore Bundle-Vendor: %PLUGIN_PROVIDER Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSDL2JavaCommnad.java 2008-04-24 01:57:09 UTC (rev 7721) @@ -73,9 +73,9 @@ 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.getPackageText(); + String customePkg = model.getCustomPackage(); if(customePkg != null && !"".equals(customePkg)){ commandLine += " -p " + customePkg; } Added: 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 (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/commands/WSProviderInvokeCommnad.java 2008-04-24 01:57:09 UTC (rev 7721) @@ -0,0 +1,94 @@ +package org.jboos.tools.ws.creation.core.commands; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.LineNumberReader; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; +import org.jboos.tools.ws.creation.core.data.ServiceModel; +import org.jboos.tools.ws.creation.core.utils.JBossWSCreationUtils; +import org.jboss.tools.ws.core.JbossWSCorePlugin; + +public class WSProviderInvokeCommnad extends AbstractDataModelOperation{ + + private ServiceModel model; + + + public WSProviderInvokeCommnad(ServiceModel model){ + this.model = model; + } + + @Override + public IStatus execute(IProgressMonitor monitor, IAdaptable info) + throws ExecutionException { + + String runtimeLocation = JbossWSCorePlugin.getDefault().getPreferenceStore().getString("jbosswsruntimelocation"); + String commandLocation = runtimeLocation + Path.SEPARATOR + "bin"; + String command = "sh wsprovide.sh "; + if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0){ + command += "cmd wsprovide.bat"; + } + String args = getCommandlineArgs(); + command += " -k " + args + " " + model.getWsdlURI(); + + try { + + InputStreamReader ir = new InputStreamReader(Runtime.getRuntime().exec(command, null, new File(commandLocation)).getInputStream()); + LineNumberReader input = new LineNumberReader(ir); + String str = input.readLine(); + while(str != null){ + System.out.println(str); + str = input.readLine(); + } + + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + refreshProject(model.getWebProjectName(), monitor); + + return Status.OK_STATUS; + } + + private void refreshProject(String project, IProgressMonitor monitor){ + try { + JBossWSCreationUtils.getProjectByName(project).refreshLocal(2, monitor); + } catch (CoreException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private String getCommandlineArgs(){ + String commandLine; + String project = model.getWebProjectName(); + String projectRoot = JBossWSCreationUtils.getProjectRoot(project).toOSString(); + commandLine = "-o " + projectRoot + Path.SEPARATOR + "src"; + + String customePkg = model.getCustomPackage(); + if(customePkg != null && !"".equals(customePkg)){ + commandLine += " -p " + customePkg; + } + + String bindingFileLocation = model.getBindingFileLocation(); + if(bindingFileLocation != null && !"".equals(bindingFileLocation)){ + File bindingFile = new File(bindingFileLocation); + if(bindingFile.exists()){ + commandLine += " -b " + bindingFileLocation; + } + } + + 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-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboos/tools/ws/creation/core/data/ServiceModel.java 2008-04-24 01:57:09 UTC (rev 7721) @@ -8,16 +8,25 @@ private String wsdlURI; private String portName; private String serviceName; - private String packageText; + private String customPackage; private String bindingFileLocation; + private String serviceClass; - public String getPackageText() { - return packageText; + public String getServiceClass() { + return serviceClass; } - public void setPackageText(String packageText) { - this.packageText = packageText; + + public void setServiceClass(String serviceClass) { + this.serviceClass = serviceClass; } + + public String getCustomPackage() { + return customPackage; + } + public void setCustomPackage(String packageText) { + this.customPackage = packageText; + } public String getPortName() { return portName; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 2008-04-24 01:57:09 UTC (rev 7721) @@ -19,6 +19,6 @@ org.eclipse.wst.command.env, org.eclipse.jdt.core, org.eclipse.jst.ws.ui, - org.jboos.tools.ws.creation.core, + org.jboss.tools.ws.creation.core, org.jboss.tools.ws.core Eclipse-LazyStart: true Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-04-24 01:57:09 UTC (rev 7721) @@ -23,7 +23,7 @@ id="org.jboss.tools.ws.creation.java" serviceImplementationTypeId="org.eclipse.jst.ws.wsImpl.java" runtimeId="org.jboss.tools.ws.creation.jbossWebServiceRT" - bottomUp="false" + bottomUp="true" topDown="true" class="org.jboss.tools.ws.creation.ui.wsrt.JBossWebServiceRuntime"> Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/CodeGenConfigWidget.java 2008-04-24 01:57:09 UTC (rev 7721) @@ -41,7 +41,7 @@ txtCustomPkgName.addModifyListener(new ModifyListener(){ public void modifyText(ModifyEvent e) { - model.setPackageText(txtCustomPkgName.getText()); + model.setCustomPackage(txtCustomPkgName.getText()); }}); new Label(configCom, SWT.NONE).setText("Binding file:"); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-04-23 22:37:46 UTC (rev 7720) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/wsrt/JBossWebService.java 2008-04-24 01:57:09 UTC (rev 7721) @@ -1,6 +1,5 @@ package org.jboss.tools.ws.creation.ui.wsrt; -import java.awt.image.SampleModel; import java.util.Vector; import org.eclipse.core.resources.ResourcesPlugin; @@ -14,6 +13,7 @@ import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; import org.jboos.tools.ws.creation.core.commands.InitialCommnad; import org.jboos.tools.ws.creation.core.commands.WSDL2JavaCommnad; +import org.jboos.tools.ws.creation.core.commands.WSProviderInvokeCommnad; import org.jboos.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.core.command.JbossWSRuntimeCommand; @@ -37,6 +37,7 @@ return null; } + @SuppressWarnings({ "restriction", "unchecked" }) @Override public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String project, String earProject) { @@ -49,6 +50,11 @@ commands.add(new WSDL2JavaCommnad(model)); commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project))); } + else if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP){ + commands.add(new InitialCommnad(model, this, WebServiceScenario.BOTTOMUP)); + commands.add(new WSProviderInvokeCommnad(model)); + commands.add(new JbossWSRuntimeCommand(ResourcesPlugin.getWorkspace().getRoot().getProject(project))); + } return new SimpleCommandFactory(commands); }