diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse')
4 files changed, 46 insertions, 46 deletions
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java index d84134d2c..7f61a13f3 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java @@ -18,8 +18,11 @@ import org.apache.axis.tools.ant.axis.AdminClientTask; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Target; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; +import org.eclipse.wst.command.internal.provisional.env.core.EnvironmentalOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; @@ -28,7 +31,7 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.Status; * Commands are executable, undoable, redoable objects. Every Command has a name and a description. */ -public class AxisDeployCommand extends SimpleCommand +public class AxisDeployCommand extends EnvironmentalOperation { protected static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$ @@ -43,11 +46,11 @@ public class AxisDeployCommand extends SimpleCommand */ public AxisDeployCommand() { - super("org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand"); } - public Status execute(Environment environment) + public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) { + Environment environment = getEnvironment(); if (javaWSDLParam == null) { return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$ @@ -83,11 +86,11 @@ public class AxisDeployCommand extends SimpleCommand { public DeployTask() { - project = new Project(); - project.init(); - taskType = "axis"; //$NON-NLS-1$ - taskName = "axis-admin"; //$NON-NLS-1$ - target = new Target(); + super.setProject(new Project()); + super.getProject().init(); + super.setTaskType("axis"); //$NON-NLS-1$ + super.setTaskName("axis-admin"); //$NON-NLS-1$ + super.setOwningTarget(new Target()); } } diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java index 99e4238e2..13eb5314e 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java @@ -26,12 +26,15 @@ import org.apache.tools.ant.Target; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; +import org.eclipse.wst.command.internal.provisional.env.core.EnvironmentalOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; @@ -42,7 +45,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; * Commands are executable, undoable, redoable objects. Every Command has a name and a description. */ -public class GeronimoAxisDeployCommand extends SimpleCommand +public class GeronimoAxisDeployCommand extends EnvironmentalOperation { private JavaWSDLParameter javaWSDLParam; @@ -63,14 +66,11 @@ public class GeronimoAxisDeployCommand extends SimpleCommand */ public GeronimoAxisDeployCommand(String projectName, String componentName) { - super("org.eclipse.jst.ws.internal.axis.consumption.core.command.GeronimoAxisDeployCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.GeronimoAxisDeployCommand"); - this.projectName_ = projectName; - this.componentName_ = componentName; } - public Status execute(Environment environment) + public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) { - + Environment environment = getEnvironment(); if (javaWSDLParam == null) { return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$ @@ -111,11 +111,11 @@ public class GeronimoAxisDeployCommand extends SimpleCommand { public DeployTask() { - project = new Project(); - project.init(); - taskType = "axis"; //$NON-NLS-1$ - taskName = "axis-admin"; //$NON-NLS-1$ - target = new Target(); + super.setProject(new Project()); + super.getProject().init(); + super.setTaskType("axis"); //$NON-NLS-1$ + super.setTaskName("axis-admin"); //$NON-NLS-1$ + super.setOwningTarget(new Target()); } } diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java index cdf8cf592..c886b64d0 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java @@ -23,43 +23,40 @@ import org.apache.axis.tools.ant.wsdl.NamespaceMapping; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Target; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; +import org.eclipse.wst.command.internal.provisional.env.core.EnvironmentalOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.Log; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; - /** * Commands are executable, undoable, redoable objects. * Every Command has a name and a description. */ -public class Java2WSDLCommand extends SimpleCommand { +public class Java2WSDLCommand extends EnvironmentalOperation +{ private JavaWSDLParameter javaWSDLParam_; private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$ - - private String LABEL = "TASK_LABEL_JAVA_WSDL_COMMAND"; - private String DESCRIPTION = "TASK_DESC_JAVA_WSDL_COMMAND"; public Java2WSDLCommand() { - super(); - setName (getMessage(LABEL)); - setDescription(getMessage(DESCRIPTION)); } /** * Constructor for Java2WSDLCommand. */ public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) { super(); - setName (getMessage(LABEL)); - setDescription(getMessage(DESCRIPTION)); this.javaWSDLParam_ = javaWSDLParam; } - public Status execute(Environment environment) { + public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) + { + Environment environment = getEnvironment(); Status status; if (javaWSDLParam_ == null) { status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$ @@ -85,11 +82,11 @@ public class Java2WSDLCommand extends SimpleCommand { final class Emitter extends Java2WsdlAntTask { public Emitter() { - project = new Project(); - project.init(); - taskType = "axis"; //$NON-NLS-1$ - taskName = "axis-java2wsdl"; //$NON-NLS-1$ - target = new Target(); + super.setProject(new Project()); + super.getProject().init(); + super.setTaskType("axis"); //$NON-NLS-1$ + super.setTaskName("axis-java2wsdl"); //$NON-NLS-1$ + super.setOwningTarget(new Target()); } } diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java index a7b7abdd1..f75659e5d 100644 --- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java +++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java @@ -19,15 +19,18 @@ import java.util.ResourceBundle; import org.apache.axis.wsdl.toJava.Emitter; import org.apache.axis.wsdl.toJava.GeneratedFileInfo; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand; +import org.eclipse.wst.command.internal.provisional.env.core.EnvironmentalOperation; import org.eclipse.wst.command.internal.provisional.env.core.common.Environment; import org.eclipse.wst.command.internal.provisional.env.core.common.Log; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; -public class WSDL2JavaCommand extends SimpleCommand { +public class WSDL2JavaCommand extends EnvironmentalOperation { private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$ private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$ @@ -36,17 +39,14 @@ public class WSDL2JavaCommand extends SimpleCommand { private String httpBasicAuthUsername; private String httpBasicAuthPassword; private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$ - private String LABEL = "TASK_LABEL_WSDL_JAVA_COMMAND"; - private String DESCRIPTION = "TASK_DESC_WSDL_JAVA_COMMAND"; public WSDL2JavaCommand() { - super(); - setName(getMessage(LABEL)); - setDescription(getMessage(DESCRIPTION)); } - public Status execute(Environment environment) { + public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) + { + Environment environment = getEnvironment(); Status status; if (javaWSDLParam == null) { status = new SimpleStatus("WSDL2JavaCommand", //$NON-NLS-1$ |