This commit was manufactured by cvs2svn to create tag 'R1_5_3'.
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
index b96c3d2..822c2ed 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
@@ -12,8 +12,8 @@
org.eclipse.jst.ws.internal.axis.consumption.core.context;x-internal:=true,
org.eclipse.jst.ws.internal.axis.consumption.core.plugin;x-internal:=true
Require-Bundle: org.apache.ant;bundle-version="[1.6.5,1.7.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.ws;bundle-version="[1.0.100,1.1.0)",
@@ -21,7 +21,7 @@
org.apache.axis;bundle-version="[1.3.0,1.4.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)"
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
index aebe829..13c6284 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
@@ -16,9 +16,9 @@
org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
@@ -29,7 +29,7 @@
org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.1.0)",
@@ -43,5 +43,5 @@
org.apache.axis;bundle-version="[1.3.0,1.4.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
+ com.ibm.icu;bundle-version="[3.4.4,3.5.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
index ac9e698..73d0e0e 100644
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
@@ -17,8 +17,8 @@
org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
@@ -28,7 +28,7 @@
org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.jst.ws.axis.consumption.ui;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
index fee49af..19c46ac 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 1.0.204.qualifier
+Bundle-Version: 1.0.104.qualifier
Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
@@ -40,16 +40,16 @@
org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.ws;bundle-version="[1.0.100,1.1.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.server.ui;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
@@ -72,7 +72,7 @@
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
+ com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
org.apache.xerces;bundle-version="[2.8.0,2.9.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
+ org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
index 32485ff..1cde516 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
@@ -21,7 +21,6 @@
* 20060803 152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
* 20060825 135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
* 20060831 155883 makandre@ca.ibm.com - Andrew Mak, service impl field doesn't work after switching from BU to TD
- * 20061106 142500 david.schneider@unisys.com - David Schneider, WTP properties pages fonts don't follow Eclipse preferences
* 20061211 161589 makandre@ca.ibm.com - Andrew Mak, NPE in service generation after opening and cancelling from browse dialog
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
@@ -41,7 +40,6 @@
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
@@ -237,7 +235,6 @@
});
setMessageSummary();
- Dialog.applyDialogFont(parent);
return this;
}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
new file mode 100644
index 0000000..e682844
--- /dev/null
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
+
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
+import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
+import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
+import org.eclipse.wst.common.environment.IEnvironment;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.eclipse.wst.server.core.IServer;
+
+public class CreateSampleProjectCommand extends AbstractDataModelOperation
+{
+ private String sampleProject;
+ private String sampleProjectEar;
+ private IServer existingServer;
+ private String serverFactoryId;
+ private boolean needEAR;
+ private String j2eeVersion;
+
+
+ public CreateSampleProjectCommand()
+ {
+ }
+
+ public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
+ {
+ IEnvironment env = getEnvironment();
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists())
+ {
+ //Do the following
+ //1. Create the Web project/component to house the sample JSPs.
+ //2. If needEAR is true then
+ // - create a EAR project and component if it doesn't exist
+ // - add the Web component to the EAR component
+ //3. Add the right component to the server.
+ CreateModuleCommand command = new CreateModuleCommand();
+ command.setProjectName(sampleProject);
+ command.setModuleName(sampleProject);
+ command.setModuleType(CreateModuleCommand.WEB);
+ command.setServerFactoryId(serverFactoryId);
+ command.setServerInstanceId(existingServer.getId());
+ command.setJ2eeLevel(j2eeVersion);
+ command.setEnvironment( env );
+ IStatus status = command.execute( monitor, null ) ;
+ if (status.getSeverity()==Status.ERROR)
+ {
+ env.getStatusHandler().reportError(status);
+ return status;
+ }
+
+ if (needEAR)
+ {
+ CreateModuleCommand commandEAR = new CreateModuleCommand();
+ commandEAR.setProjectName(sampleProjectEar);
+ //TODO The EAR component name is not necessarily the same as the project name
+ //so the component name needs to somehow be piped into this command
+ commandEAR.setModuleName(sampleProjectEar);
+ commandEAR.setModuleType(CreateModuleCommand.EAR);
+ commandEAR.setServerFactoryId(serverFactoryId);
+ commandEAR.setServerInstanceId(existingServer.getId());
+ commandEAR.setJ2eeLevel(j2eeVersion);
+ commandEAR.setEnvironment( env );
+ status = commandEAR.execute( monitor, null );
+ if (status.getSeverity()==Status.ERROR)
+ {
+ env.getStatusHandler().reportError(status);
+ return status;
+ }
+
+
+ //Associate the service module and service EAR
+ AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
+ associateCommand.setProject(sampleProject);
+ associateCommand.setModule(sampleProject);
+ associateCommand.setEARProject(sampleProjectEar);
+ //TODO The EAR component name is not necessarily the same as the project name
+ //so the component name needs to somehow be piped into this command
+ associateCommand.setEar(sampleProjectEar);
+ associateCommand.setEnvironment( env );
+ status = associateCommand.execute( monitor, null );
+ if (status.getSeverity()==Status.ERROR)
+ {
+ env.getStatusHandler().reportError(status);
+ return status;
+ }
+
+ //Add the EAR to the server
+ AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
+ commandInstall.setServerInstanceId(existingServer.getId());
+ commandInstall.setProject(sampleProjectEar);
+ //TODO The EAR component name is not necessarily the same as the project name
+ //so the component name needs to somehow be piped into this command
+ commandInstall.setModule(sampleProjectEar);
+ commandInstall.setEnvironment( env );
+ status = commandInstall.execute( monitor, null ) ;
+ if (status.getSeverity()==Status.ERROR)
+ {
+ env.getStatusHandler().reportError(status);
+ return status;
+ }
+ }
+ else
+ {
+ //Add the Web component to the server
+ AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
+ commandInstall.setServerInstanceId(existingServer.getId());
+ commandInstall.setProject(sampleProject);
+ commandInstall.setModule(sampleProject);
+ commandInstall.setEnvironment( env );
+
+ status = commandInstall.execute( monitor, null ) ;
+ if (status.getSeverity()==Status.ERROR)
+ {
+ env.getStatusHandler().reportError(status);
+ return status;
+ }
+ }
+
+ }
+ return Status.OK_STATUS;
+ }
+
+ public void setSampleProject(String sampleProject)
+ {
+ this.sampleProject = sampleProject;
+ }
+
+ public void setSampleProjectEAR(String sampleProjectEar)
+ {
+ this.sampleProjectEar = sampleProjectEar;
+ }
+
+ public void setExistingServer(IServer existingServer) {
+
+ this.existingServer = existingServer;
+ }
+
+ public void setServerFactoryId(String serverFactoryId)
+ {
+ this.serverFactoryId = serverFactoryId;
+ }
+
+ /**
+ * @param needEAR The needEAR to set.
+ */
+ public void setNeedEAR(boolean needEAR)
+ {
+ this.needEAR = needEAR;
+ }
+
+ /**
+ * @param version The j2eeVersion to set.
+ */
+ public void setJ2eeVersion(String version)
+ {
+ j2eeVersion = version;
+ }
+}
diff --git a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
index b1cba5f..51c11da 100644
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 1.0.203.qualifier
+Bundle-Version: 1.0.103.qualifier
Bundle-ClassPath: wsc.jar,
webserviceutils.jar
Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
@@ -27,12 +27,12 @@
org.eclipse.jst.ws.util
Require-Bundle: org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.xsd;bundle-version="[2.2.0,2.3.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
org.eclipse.jdt.launching;bundle-version="[3.2.0,3.3.0)",
@@ -55,6 +55,6 @@
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
+ com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
new file mode 100644
index 0000000..1d10ea9
--- /dev/null
+++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jst.ws.internal.consumption.command.common;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
+import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
+import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
+import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
+import org.eclipse.wst.common.environment.IEnvironment;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+
+
+public class CreateEARProjectCommand extends AbstractDataModelOperation
+{
+ private String earProjectName_;
+ private String serverFactoryId_;
+ private String j2eeVersion_;
+
+ /**
+ * Constructor
+ */
+ public CreateEARProjectCommand()
+ {
+ }
+
+ public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
+ {
+ IEnvironment env = getEnvironment();
+
+ try
+ {
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_);
+ if (project != null && !project.exists())
+ {
+ IDataModel info = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
+ info.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
+
+ //Set the J2EE version
+ if (j2eeVersion_ != null && j2eeVersion_.length()>0)
+ {
+ info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
+ }
+ else
+ {
+ info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
+ }
+
+ //Set the server target
+ if (serverFactoryId_!=null && serverFactoryId_.length()>0)
+ {
+// TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
+// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EAR_TYPE, finalJ2EEVersion);
+// info.setProperty(EARComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
+// info.setProperty(EARComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
+ }
+
+ //Create the EAR
+ IDataModelOperation operation = info.getDefaultOperation();
+ operation.execute(new NullProgressMonitor(), null);
+ }
+ }
+ catch (ExecutionException ite)
+ {
+ IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_EAR_PROJECT, new String[] {earProjectName_}), ite);
+ env.getStatusHandler().reportError(status);
+ return status;
+ }
+ return Status.OK_STATUS;
+ }
+ /**
+ * @param earProjectName_ The earProjectName_ to set.
+ */
+ public void setEarProjectName(String earProjectName)
+ {
+ this.earProjectName_ = earProjectName;
+ }
+
+ public void setServerFactoryId(String serverFactoryId)
+ {
+ serverFactoryId_ = serverFactoryId;
+ }
+
+ public void setJ2EEVersion(String j2eeVersion)
+ {
+ j2eeVersion_ = j2eeVersion;
+ }
+}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
index 3eee81b..e0cce92 100644
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
+++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@
* -------- -------- -----------------------------------------------------------
* 20060204 124408 rsinha@ca.ibm.com - Rupam Kuehner *
* 20060217 126757 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070201 172244 makandre@ca.ibm.com - Andrew Mak, Remove usage of deprecated (and now removed) classes
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.command.common;
@@ -27,9 +26,12 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
+import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
import org.eclipse.jst.server.core.FacetUtil;
import org.eclipse.jst.ws.internal.common.J2EEUtils;
import org.eclipse.jst.ws.internal.common.ServerUtils;
@@ -38,7 +40,11 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.environment.IEnvironment;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
@@ -71,6 +77,8 @@
private String j2eeLevel;
private String serverFactoryId;
private String serverInstanceId_;
+ private IEnvironment env;
+ private IProgressMonitor monitor_;
private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
@@ -79,6 +87,8 @@
public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
{
+ monitor_ = monitor;
+ this.env = getEnvironment();
IStatus status = Status.OK_STATUS;
// check if data ready
@@ -463,6 +473,50 @@
return status;
}
+ /**
+ * Creates Flexible Java Project structure
+ * This project is required if it doesn't already exist in order to create the component
+ * @return
+ *
+ * Note: This call may not be necessary once J2EE implements creating a flex project automatically
+ * with the creation of components.
+ */
+ public IStatus createFlexibleJavaProject(){
+ IStatus status = Status.OK_STATUS;
+ try
+ {
+ IDataModel projectInfo = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
+ projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.PROJECT_NAME,projectName);
+
+ String runtimeTargetId = null;
+ if( serverInstanceId_ == null )
+ {
+ // We don't have a server instance so we will get the first runtimeTarget from the factory ID.
+ runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId, ServerUtils.getServerTargetModuleType(moduleType), j2eeLevel);
+ }
+ else
+ {
+ // We have a server instance so we will just get it's runtimeTargetId.
+ IServer server = ServerCore.findServer( serverInstanceId_ );
+ runtimeTargetId = server.getRuntime().getId();
+ }
+
+ projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID,runtimeTargetId);
+ projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.ADD_SERVER_TARGET,Boolean.TRUE);
+ IDataModelOperation op = projectInfo.getDefaultOperation();
+ if (env!=null)
+ op.execute( monitor_, null);
+ else
+ op.execute(new NullProgressMonitor(), null);
+
+ }
+ catch (Exception e)
+ {
+ status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_FLEX_PROJET, new String[]{projectName}), e);
+ }
+ return status;
+ }
+
/*
* @return Set Returns the Set of facets to add to the new project,
* choosing the highest level of each facet that works on the selected server.
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
index 0670856..5ddf1d2 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
@@ -29,9 +29,9 @@
org.eclipse.jst.ws.consumption.ui;bundle-version="[1.0.101,1.1.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
@@ -43,6 +43,6 @@
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.ws.ui;bundle-version="[1.0.101,1.1.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
index d9be0ac..e89356f 100644
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@
org.eclipse.jst.ws.internal.uddiregistry.widgets.binding;x-internal:=true,
org.eclipse.jst.ws.internal.uddiregistry.wizard;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
+ com.ibm.icu;bundle-version="[3.4.4,3.5.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
index e160d1b..3c44f8d 100644
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
@@ -21,9 +21,9 @@
org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
diff --git a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
index 47e6254..9f7ebd1 100644
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
@@ -24,11 +24,11 @@
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jem;bundle-version="[1.2.0,1.3.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jem.workbench;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
@@ -37,10 +37,10 @@
org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
+ com.ibm.icu;bundle-version="[3.4.4,3.5.0)",
org.eclipse.wst.ws;bundle-version="[1.0.100,1.1.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
index 5df144d..90a979d 100644
--- a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@
org.eclipse.wst.command.internal.env.core.selection;x-internal:=true,
org.eclipse.wst.command.internal.env.core.uri;x-internal:=true
Require-Bundle: org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
diff --git a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
index abbfe1c..1645b8d 100644
--- a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
@@ -17,9 +17,11 @@
org.eclipse.wst.command.internal.env.ui.widgets.popup;x-internal:=true
Require-Bundle: org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.osgi;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java
index c58301b..f1a55c7 100644
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java
+++ b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleDialog.java
@@ -11,7 +11,6 @@
* -------- -------- -----------------------------------------------------------
* 20060418 136335 joan@ca.ibm.com - Joan Haggarty
* 20060418 136759 joan@ca.ibm.com - Joan Haggarty
- * 20061106 142500 david.schneider@unisys.com - David Schneider
*******************************************************************************/
package org.eclipse.wst.command.internal.env.ui.widgets;
@@ -60,7 +59,7 @@
//Call extenders override of the callSetters method to intialize any data in widget
callSetters();
- Dialog.applyDialogFont(parent);
+ org.eclipse.jface.dialogs.Dialog.applyDialogFont(control);
return control;
}
diff --git a/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch b/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
index db36c7e..e4b79ad 100644
--- a/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
+++ b/bundles/org.eclipse.wst.command.env/.externalToolBuilders/build-anttasks.launch
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.wst.command.env/build-anttasks.xml}"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/ibm-sdk-java5-20060912"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.wst.command.env"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.wst.command.env/build-anttasks.xml"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
</launchConfiguration>
diff --git a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
index 1db6ad2..922d04e 100644
--- a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
@@ -16,10 +16,10 @@
org.eclipse.wst.command.internal.env.plugin;x-internal:=true,
org.eclipse.wst.command.internal.env.preferences;x-internal:=true
Require-Bundle: org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.apache.ant;bundle-version="[1.6.5,1.7.0)",
org.eclipse.ant.core;bundle-version="[3.1.100,3.2.0)"
diff --git a/bundles/org.eclipse.wst.ws.explorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/.cvsignore
index 80aae3b..a8fd994 100644
--- a/bundles/org.eclipse.wst.ws.explorer/.cvsignore
+++ b/bundles/org.eclipse.wst.ws.explorer/.cvsignore
@@ -3,7 +3,7 @@
webapps
temp.folder
build.xml
+*.jar
*.war
explorersrc.zip
javaCompiler.*.args
-*.jar
diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
index ecc4b63..ce761f4 100644
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
@@ -12,13 +12,13 @@
org.eclipse.wst.ws.internal.explorer.favorites;x-internal:=true,
org.eclipse.wst.ws.internal.explorer.plugin;x-internal:=true,
org.eclipse.wst.ws.internal.explorer.popup;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.help.appserver;bundle-version="[3.1.100,3.2.0)",
org.eclipse.ui;bundle-version="[3.2.0,3.4.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.xsd;bundle-version="[2.2.0,2.3.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.1.0)",
@@ -33,5 +33,5 @@
org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
+ com.ibm.icu;bundle-version="[3.4.4,3.5.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.ws.explorer/build-war.xml b/bundles/org.eclipse.wst.ws.explorer/build-war.xml
index 8a24951..78ec8b6 100644
--- a/bundles/org.eclipse.wst.ws.explorer/build-war.xml
+++ b/bundles/org.eclipse.wst.ws.explorer/build-war.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.wst.ws.explorer" default="build.wars" basedir=".">
- <!-- The env.JAVA_5_HOME values set on the
- java/jvm and javac/executable attributes insure
- the WSE servlets are compiled to the Java 5 level -->
+ <!-- the environment variables are important to set here, and
+ to have JAVA_4_HOME set to some Java 1.4 SDK home,
+ since we want this compiled with a 1.4 version, but
+ this overall build itself might be being ran in Java 1.5 -->
<property environment="env" />
<property name="wsexplorerDir" value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/wsexplorer"/>
<target name="jspcompile" unless="wsexplorer.war" description="Pre-compile the JSPs in the org.eclipse.wst.ws.explorer plugin">
- <java classname="org.apache.jasper.JspC" fork="true" jvm="${env.JAVA_5_HOME}/bin/java">
+ <java classname="org.apache.jasper.JspC" fork="true" jvm="${env.JAVA_4_HOME}/bin/java">
<arg line="-webxml ${wsexplorerDir}/WEB-INF/web.xml -d ${wsexplorerDir} -webapp ${wsexplorerDir}"/>
<classpath>
<fileset dir="${baseLocation}/plugins">
@@ -20,7 +21,7 @@
</fileset>
</classpath>
</java>
- <javac destdir="${wsexplorerDir}/WEB-INF/classes" includeAntRuntime="false" failonerror="false" executable="${env.JAVA_5_HOME}/bin/javac" fork="true">
+ <javac destdir="${wsexplorerDir}/WEB-INF/classes" includeAntRuntime="false" failonerror="false" executable="${env.JAVA_4_HOME}/bin/javac" fork="true">
<src path="${wsexplorerDir}"/>
<classpath>
<fileset dir="${buildDirectory}/plugins">
diff --git a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
index a23d969..9fe660e 100644
--- a/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
org.eclipse.wst.ws.parser
Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.0.100,1.1.0)",
org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
org.uddi4j;bundle-version="[2.0.4,2.1.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
diff --git a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
index e2af456..f71097d 100644
--- a/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws.ui/META-INF/MANIFEST.MF
@@ -14,11 +14,11 @@
org.eclipse.wst.ws.internal.ui.wsi.properties;x-internal:=true,
org.eclipse.wst.ws.internal.ui.wsrt;x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.ws;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
index 5bebbd0..551d96a 100644
--- a/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.ws/META-INF/MANIFEST.MF
@@ -31,20 +31,20 @@
org.eclipse.wst.ws.internal.wsfinder;x-internal:=true,
org.eclipse.wst.ws.internal.wsil;x-internal:=true,
org.eclipse.wst.ws.internal.wsrt;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)",
org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,2.4.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.emf.codegen;bundle-version="[2.2.0,2.3.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
index c110d37..7e0f2ed 100644
--- a/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.wsdl.validation; singleton:=true
-Bundle-Version: 1.1.201.qualifier
+Bundle-Version: 1.1.101.qualifier
Bundle-Activator: org.eclipse.wst.wsdl.validation.internal.eclipse.ValidateWSDLPlugin
Bundle-Vendor: %_PROVIDER_NAME
Bundle-Localization: plugin
@@ -20,12 +20,12 @@
org.eclipse.wst.wsdl.validation.internal.wsdl11.soap;x-friends:="org.eclipse.wst.wsdl.validation.tests,org.eclipse.wst.wsi",
org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;x-friends:="org.eclipse.wst.wsdl.validation.tests,org.eclipse.wst.wsi",
org.eclipse.wst.wsdl.validation.internal.xml;x-friends:="org.eclipse.wst.wsdl.validation.tests,org.eclipse.wst.wsi"
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,3.3.0)",
org.apache.ant;bundle-version="[1.6.5,1.7.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
org.wsdl4j;bundle-version="[1.4.0,1.5.0)",
- org.apache.xerces;bundle-version="[2.8.0,2.9.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.apache.xerces;visibility:=reexport;bundle-version="[2.8.0,2.9.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.3.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java
index 1ff6625..622c9c6 100644
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java
+++ b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/URIResolverWrapper.java
@@ -63,7 +63,7 @@
/**
* Resolve platform URLs to standard URLs. This method has the
* practical effect of transforming a URL such as
- * platform:/resource/test/test.wsdl
+ * platform:/test/test.wsdl
* into
* file:/c:/wtp/workspace/test/test.wsdl
*
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/Validator.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/Validator.java
index d2c098e..99fdeea 100644
--- a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/Validator.java
+++ b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/Validator.java
@@ -23,6 +23,14 @@
{
protected HashMap xsdGrammarPools = new HashMap();
protected HashMap xmlGrammarPools = new HashMap();
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator#getValidatorName()
+ */
+ protected String getValidatorName()
+ {
+ return WSDLValidationMessages.Message_WSDL_validation_message_ui;
+ }
/**
* Create and configure the two grammar pools for this WSDL validation context.
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidationMessages.java b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidationMessages.java
new file mode 100644
index 0000000..38ac09b
--- /dev/null
+++ b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidationMessages.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *
+ */
+package org.eclipse.wst.wsdl.validation.internal.eclipse;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by WSDL Validation
+ */
+public class WSDLValidationMessages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.wst.wsdl.validation.internal.eclipse.wsdlvalidation";//$NON-NLS-1$
+
+ public static String Message_WSDL_validation_message_ui;
+
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, WSDLValidationMessages.class);
+ }
+
+ private WSDLValidationMessages() {
+ // cannot create new instance
+ }
+}
diff --git a/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/wsdlvalidation.properties b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/wsdlvalidation.properties
new file mode 100644
index 0000000..3adb534
--- /dev/null
+++ b/bundles/org.eclipse.wst.wsdl.validation/src/org/eclipse/wst/wsdl/validation/internal/eclipse/wsdlvalidation.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2001, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+!-- Constants for strings
+
+# validation strings
+Message_WSDL_validation_message_ui=WSDL Validator validating {0}
diff --git a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
index c50a4f5..989040d 100644
--- a/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.wsi.ui; singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Activator: org.eclipse.wst.wsi.ui.internal.WSIUIPlugin
Bundle-Vendor: %_PROVIDER_NAME
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.wsi.ui/plugin.properties b/bundles/org.eclipse.wst.wsi.ui/plugin.properties
index 1b442fd..6f127ed 100644
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.wsi.ui/plugin.properties
@@ -15,4 +15,4 @@
_UI_WSI_VALIDATOR = WS-I Message Validator
_UI_ACTION_VALIDATE = Validate WS-I Log File
_UI_WIZARD_VALIDATE_LOG_TITLE = Validate WS-I Message Log File
-_UI_LOG_EDITOR = XML Editor
+_UI_LOG_EDITOR = WS-I Message Log Viewer
diff --git a/bundles/org.eclipse.wst.wsi.ui/plugin.xml b/bundles/org.eclipse.wst.wsi.ui/plugin.xml
index 61a9c62..f9b311e 100644
--- a/bundles/org.eclipse.wst.wsi.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.wsi.ui/plugin.xml
@@ -58,6 +58,21 @@
</validator>
</extension>
+<!-- ======================================================= -->
+<!-- Extension point: org.eclipse.ui.editors -->
+<!-- Purpose: Specify editor for file with extension wsimsg. -->
+<!-- ======================================================= -->
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ name="%_UI_LOG_EDITOR"
+ extensions="wsimsg"
+ icon="icons/wsi_logfile_obj.gif"
+ class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
+ id="org.eclipse.wst.wsi.ui.internal.WSILogEditor">
+ </editor>
+ </extension>
+
<!-- ======================================================= -->
<!-- Extension point: org.eclipse.core.runtime.contentTypes -->
<!-- Purpose: Specify file association for wsimsg. -->
diff --git a/features/org.eclipse.wst.ws_core.feature/addPreBuiltComponents.xml b/features/org.eclipse.wst.ws_core.feature/addPreBuiltComponents.xml
deleted file mode 100644
index 787d33e..0000000
--- a/features/org.eclipse.wst.ws_core.feature/addPreBuiltComponents.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Callbacks to use when building this feature -->
-<!-- -->
-<!-- build.properties must have a line that says -->
-<!-- customBuildCallbacks=addPreBuiltComponents.xml -->
-<!-- ===================================================================== -->
-<project name="addPreBuiltComponents" default="noDefault">
- <!--
- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
-
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - the directory plugins will be collected to -->
- <!-- feature.directory - the directory containing the resulting feature -->
- <!-- ===================================================================== -->
- <target name="pre.gather.bin.parts">
- <!-- copy our known, pre-built, usually third party pre-reqs into this feature -->
- <echo message="Current basedir during callback: ${basedir}" />
- <echo message="Current destination.temp.folder during callback: ${destination.temp.folder}" />
- <copy todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/"
- includes="org.apache.commons_logging*/**" />
- </copy>
- <copy todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/"
- includes="org.apache.jakarta_log4j*/**" />
- </copy>
- <copy todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/"
- includes="org.apache.wsil4j*/**" />
- </copy>
- <copy todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/"
- includes="org.uddi4j*/**" />
- </copy>
- <copy todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/"
- includes="org.wsdl4j*/**" />
- </copy>
- <copy todir="${destination.temp.folder}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/prebuilt/eclipse/plugins/"
- includes="org.apache.axis*/**" />
- </copy>
-
-
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - the directory plugins will be collected to -->
- <!-- feature.directory - the directory containing the resulting feature -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- </target>
-
-
-
- <!-- ===================================================================== -->
- <!-- No Default target -->
- <!-- ===================================================================== -->
- <target name="noDefault">
- <echo message="This file must be called with explicit targets" />
- </target>
-
-
-</project>
diff --git a/features/org.eclipse.wst.ws_core.feature/build.properties b/features/org.eclipse.wst.ws_core.feature/build.properties
index d80a54c..7f47694 100644
--- a/features/org.eclipse.wst.ws_core.feature/build.properties
+++ b/features/org.eclipse.wst.ws_core.feature/build.properties
@@ -3,4 +3,3 @@
epl-v10.html,\
license.html,\
feature.properties
-customBuildCallbacks=addPreBuiltComponents.xml
diff --git a/features/org.eclipse.wst.ws_core.feature/feature.xml b/features/org.eclipse.wst.ws_core.feature/feature.xml
index de9690e..813cb7e 100644
--- a/features/org.eclipse.wst.ws_core.feature/feature.xml
+++ b/features/org.eclipse.wst.ws_core.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_core.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -21,6 +21,21 @@
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
+ <requires>
+ <import feature="org.apache.commons_logging.feature" version="1.0.4"/>
+ <import feature="org.apache.jakarta_log4j.feature" version="1.2.8"/>
+ <import feature="org.apache.axis.feature" version="1.2.1" match="greaterOrEqual"/>
+ <import feature="org.apache.wsil4j.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.uddi4j.feature" version="2.0.3" match="greaterOrEqual"/>
+ <import feature="org.wsdl4j.feature" version="1.4.0" match="greaterOrEqual"/>
+ <import feature="org.apache.xerces.feature" version="2.8.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.platform" version="3.2" match="equivalent"/>
+ <import feature="org.eclipse.emf" version="2.2" match="equivalent"/>
+ <import feature="org.eclipse.wst.common_core.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.wst.server_core.feature" version="1.0.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.xsd" version="2.2" match="equivalent"/>
+ </requires>
+
<plugin
id="org.eclipse.wst.ws"
download-size="0"
@@ -56,43 +71,4 @@
version="0.0.0"
unpack="false"/>
- <!-- the following is not built, but depends on the addPreBuiltComponents.xml
- adding it to the plugins directory at the right point. The "pre-built" plugin is
- then added to zips and update jars. -->
-
- <plugin
- id="org.apache.commons_logging"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
- <plugin
- id="org.apache.jakarta_log4j"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.apache.wsil4j"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.uddi4j"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.wsdl4j"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.apache.axis"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
diff --git a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.xml
index 8fbe018..127cc21 100644
--- a/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.ws_core.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_core.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
diff --git a/features/org.eclipse.wst.ws_sdk.feature/feature.xml b/features/org.eclipse.wst.ws_sdk.feature/feature.xml
index 70c1c00..0c7ffd9 100644
--- a/features/org.eclipse.wst.ws_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.ws_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_sdk.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -20,10 +20,6 @@
<url>
<update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
-
- <includes
- id="org.eclipse.wst.ws_ui.feature"
- version="0.0.0"/>
<includes
id="org.eclipse.wst.ws_ui.feature.source"
diff --git a/features/org.eclipse.wst.ws_tests.feature/feature.xml b/features/org.eclipse.wst.ws_tests.feature/feature.xml
index b04a9d1..505bd4a 100644
--- a/features/org.eclipse.wst.ws_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.ws_tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_tests.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
diff --git a/features/org.eclipse.wst.ws_ui.feature/feature.xml b/features/org.eclipse.wst.ws_ui.feature/feature.xml
index ea21b70..2a0faa5 100644
--- a/features/org.eclipse.wst.ws_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.ws_ui.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_ui.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -29,6 +29,11 @@
id="org.eclipse.wst.ws_core.feature"
version="0.0.0"/>
+ <requires>
+ <import feature="org.eclipse.gef" version="3.2" match="equivalent"/>
+ <import feature="org.eclipse.wst.ws_core.feature" version="1.0.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.eclipse.wst.ws.infopop"
download-size="0"
diff --git a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.xml
index b4a6843..1793a99 100644
--- a/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.ws_ui.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_ui.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%featureProvider">
<description>
diff --git a/features/org.eclipse.wst.ws_userdoc.feature/feature.xml b/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
index 6ab8e68..1a823bf 100644
--- a/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.ws_userdoc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.ws_userdoc.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
index c2136cc..3069cd0 100644
--- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
Require-Bundle: org.junit,
diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
index 9ae7d03..54ca3a8 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.100
Bundle-ClassPath: axisPerfmsr.jar
Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin
Bundle-Vendor: %PLUGIN_PROVIDER
diff --git a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
index 44b75f8..db7001e 100644
--- a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.tests
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.100
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
index e129610..4b56ef3 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
@@ -77,7 +77,7 @@
String s = System.getProperty("org.eclipse.jst.server.tomcat.50");
if (s != null && s.length() > 0) {
testSuite.addTest( ServerCreationTests.suite());
- // testSuite.addTest( BUJavaAxisTC50.suite() );
+ //testSuite.addTest( BUJavaAxisTC50.suite() );
testSuite.addTest( TDJavaAxisTC50.suite() );
testSuite.addTest( ClientAxisTC50.suite() );
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
index d5e357d..fd746d0 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/BUJavaAxisTC50.java
@@ -9,7 +9,8 @@
* IBM Corporation - initial API and implementation
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20070104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20070202 172615 sengpl@ca.ibm.com - Seng Phung-Lu
*******************************************************************************/
package org.eclipse.jst.ws.tests.unittest;
@@ -118,6 +119,7 @@
IStatus status = Status.OK_STATUS;
IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
JUnitUtils.disableWSIDialog(webProject);
+ JUnitUtils.setBUScenarioDefaults();
status = JUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
index 936c6c6..f8bbe91 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/TDJavaAxisTC50.java
@@ -9,7 +9,8 @@
* IBM Corporation - initial API and implementation
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20070104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20070202 172615 sengpl@ca.ibm.com - Seng Phung-Lu
*******************************************************************************/
package org.eclipse.jst.ws.tests.unittest;
@@ -106,9 +107,10 @@
public void testTDJavaAxisTC50() throws Exception {
IStatus status = Status.OK_STATUS;
+ JUnitUtils.setTDScenarioDefaults();
status = JUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
-
+
if (status.getSeverity() == Status.OK)
verifyOutput();
else {
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
index 287e6c4..318c5a5 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
@@ -9,7 +9,8 @@
* IBM Corporation - initial API and implementation
* yyyymmdd bug Email and other contact information
* -------- -------- -----------------------------------------------------------
- * 2007104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20070104 114835 sengpl@ca.ibm.com - Seng Phung-Lu
+ * 20070202 172615 sengpl@ca.ibm.com - Seng Phung-Lu
*******************************************************************************/
package org.eclipse.jst.ws.tests.util;
@@ -351,4 +352,24 @@
}
+ public static void setBUScenarioDefaults(){
+ ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
+ context.setGenerateWebService(ScenarioContext.WS_ASSEMBLE);
+
+ context.setGenerateProxy(false);
+ context.setInstallWebService(false);
+ context.setStartWebService(false);
+ context.setTestWebService(false);
+
+ }
+
+ public static void setTDScenarioDefaults(){
+ ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
+ context.setGenerateWebService(ScenarioContext.WS_ASSEMBLE);
+
+ context.setGenerateProxy(false);
+ context.setInstallWebService(false);
+ context.setStartWebService(false);
+ context.setTestWebService(false);
+ }
}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
index 620c2fd..b415c40 100644
--- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.ws.tests
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.100
Bundle-Activator: org.eclipse.wst.ws.tests.plugin.TestsPlugin
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
