Attachment #35195 for bug #126259

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 32-41 Link Here

(-)src/org/eclipse/wst/command/internal/env/EnvironmentMessages.java (-4 / +6 lines)
32	public static String MSG_ERROR_IO;	32	public static String MSG_ERROR_IO;
33	public static String MSG_ERROR_FILE_OVERWRITE_DISABLED;	33	public static String MSG_ERROR_FILE_OVERWRITE_DISABLED;
34	public static String MSG_ERROR_UNEXPECTED_ERROR;	34	public static String MSG_ERROR_UNEXPECTED_ERROR;
35	public static String MSG_ERR_ANT_DATA_TRANSFORM;	35	public static String MSG_ERROR_ANT_DATA_TRANSFORM;
36	public static String MSG_ERR_ANT_CALL_SETTER;	36	public static String MSG_ERROR_ANT_CALL_SETTER;
37	public static String MSG_ERR_ANT_CMD_FRAGMENT;	37	public static String MSG_ERROR_ANT_CMD_FRAGMENT;
38	public static String MSG_ERR_ANT_SCENARIO_TYPE;	38	public static String MSG_ERROR_ANT_SCENARIO_TYPE;
		39	public static String MSG_ERROR_ANT_REQUIRED_PROPERTY;
		40	public static String MSG_INFO_ANT__PROPERTY_DEFAULT;
39	public static String LABEL_YES;	41	public static String LABEL_YES;
40	public static String LABEL_YES_TO_ALL;	42	public static String LABEL_YES_TO_ALL;
41	public static String LABEL_CANCEL;	43	public static String LABEL_CANCEL;

Lines 24-33 Link Here

(-)src/org/eclipse/wst/command/internal/env/Environment.properties (-4 / +6 lines)
24	MSG_ERROR_IO=IWAB0006E An input/output error occurred while processing the resource "{0}".	24	MSG_ERROR_IO=IWAB0006E An input/output error occurred while processing the resource "{0}".
25	MSG_ERROR_FILE_OVERWRITE_DISABLED=IWAB0164E Cannot create the file "{1}" relative to the path "{0}" because automatic file overwriting has not been enabled. Do you want to enable it for this file?	25	MSG_ERROR_FILE_OVERWRITE_DISABLED=IWAB0164E Cannot create the file "{1}" relative to the path "{0}" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
26	MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.	26	MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
27	MSG_ERR_ANT_DATA_TRANSFORM=Exception transforming Ant property key {0} using transformation {1}.	27	MSG_ERROR_ANT_DATA_TRANSFORM=Exception transforming Ant property key {0} using transformation {1}.
28	MSG_ERR_ANT_CALL_SETTER=Exception invoking setter method {0} for Ant property.	28	MSG_ERROR_ANT_CALL_SETTER=Exception invoking setter method {0} for Ant property.
29	MSG_ERR_ANT_CMD_FRAGMENT=Exception retrieving Ant command fragment from registry.	29	MSG_ERROR_ANT_CMD_FRAGMENT=Exception retrieving Ant command fragment from registry.
30	MSG_ERR_ANT_SCENARIO_TYPE=Cannot determine scenario type. Please ensure scenarioType Ant property is set.	30	MSG_ERROR_ANT_SCENARIO_TYPE=Cannot determine scenario type. Please ensure ScenarioType Ant property is set.
		31	MSG_ERROR_ANT_REQUIRED_PROPERTY=Required property {0} was not set in the Ant property file.
		32	MSG_INFO_ANT__PROPERTY_DEFAULT=Property {0} was not set in the Ant property file. A default value will be used.
31		33
32	LABEL_YES=Yes	34	LABEL_YES=Yes
33	LABEL_YES_TO_ALL=Yes All	35	LABEL_YES_TO_ALL=Yes All

Lines 69-74 Link Here

(-)schema/antdatamapping.exsd (+7 lines)
69	</documentation>	69	</documentation>
70	</annotation>	70	</annotation>
71	</attribute>	71	</attribute>
		72	<attribute name="required" type="boolean" use="optional" default="false">
		73	<annotation>
		74	<documentation>
		75
		76	</documentation>
		77	</annotation>
		78	</attribute>
72	</complexType>	79	</complexType>
73	</element>	80	</element>
74		81

Lines 65-71 Link Here

(-)src/org/eclipse/wst/command/internal/env/ant/AntController.java (-1 / +1 lines)
65	}	65	}
66	else //problem getting the root fragment - scenario type is likely missing	66	else //problem getting the root fragment - scenario type is likely missing
67	{	67	{
68	handler.reportError(new Status(IStatus.ERROR, "ws_ant", 9999, EnvironmentMessages.MSG_ERR_ANT_SCENARIO_TYPE, null));	68	handler.reportError(new Status(IStatus.ERROR, "ws_ant", 9999, EnvironmentMessages.MSG_ERROR_ANT_SCENARIO_TYPE, null));
69	return;	69	return;
70	}	70	}
71		71




import org.eclipse.wst.command.internal.env.core.data.Transformer;
import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
import org.eclipse.wst.common.environment.ILog;
import org.eclipse.wst.common.environment.IStatusHandler;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;

	private Hashtable operationDataRecord_ = new Hashtable();
	private boolean mappingComplete_;
	private ClassEntry classEntry;	
		
	// extensionPoint names and namespace
	private static String MAPPER_EXT_PT = "antDataMapping";  //$NON-NLS-1$
	private static String SCENARIO_EXT_PT = "antScenario";  //$NON-NLS-1$

	private static final String MAPPER_KEY_ATTRIBUTE= "key"; //$NON-NLS-1$
	private static final String MAPPER_PROPERTY_ATTRIBUTE= "property"; //$NON-NLS-1$
	private static final String MAPPER_TRANSFORM_ATTRIBUTE= "transform"; //$NON-NLS-1$
	private static final String MAPPER_REQUIRED_ATTRIBUTE= "required"; //$NON-NLS-1$
		
	// antScenario extension point attributes
	private static final String SCENARIO_TYPE_ATTRIBUTE = "scenarioType"; //$NON-NLS-1$
	private static final String SCENARIO_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$

	// Ant property IDs
	private static final String VERBOSE_PROPERTY = "Verbose"; //$NON-NLS-1$
	private static final String SCENARIO_TYPE_PROPERTY = "ScenarioType"; //$NON-NLS-1$
	
    private AntController controller_;
	
	public AntEnvironment(AntController controller, ResourceContext context, IStatusHandler handler, Hashtable properties)

	   controller_ = controller;	   
	}
	
	public boolean verbose()
	{
	  String verbose=getProperty(VERBOSE_PROPERTY);		
	  
	  if (verbose != null)
	  {
		  verbose = verbose.toLowerCase();
		  if (verbose.equals("true"))
			  return true;
	  }		  
	  return false;
	}
	
	// returns String since the property table built by Ant is property value pairs where the value is a String
	private String getProperty(String key)
	{
		Object property = antProperties_.get(key);
		if (property != null && (!property.toString().equals("")))
			return property.toString().trim();
		return null;
	}

					 catch (CoreException cex) {
					   Status errorStatus = new Status(Status.ERROR, "ws_ant", 5092, cex.getMessage(), cex);
					   getStatusHandler().reportError(errorStatus);
					   getLog().log(ILog.ERROR, "ws_ant", 5092, this, "getMappingExtensions", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_DATA_TRANSFORM, key, transform));
					   throw new CoreException(errorStatus);
					 }
					 

						 holder.value_ = value;
						 dataTable.put(property, holder);
					 }			 
				 }
				 else if(ce.getAttribute(MAPPER_REQUIRED_ATTRIBUTE)!=null && ce.getAttribute(MAPPER_REQUIRED_ATTRIBUTE).equals("true"))
				 {				
					 String msg = EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_REQUIRED_PROPERTY, key.toString());
					 Status statusObj = new Status(IStatus.ERROR, 
								EnvPlugin.ID,
								IStatus.ERROR,
								msg, 
								null);
					 getStatusHandler().reportError(statusObj);
	                 getLog().log(ILog.ERROR, "ws_ant", 9999, this, "getMappingExtensions", msg);					 
				 }
				 else if (verbose())
				 {
					 String msg = EnvironmentMessages.bind(EnvironmentMessages.MSG_INFO_ANT__PROPERTY_DEFAULT, key.toString());
					 Status statusObj = new Status(IStatus.INFO, 
								EnvPlugin.ID,
								IStatus.INFO,
								msg, 
								null);
					 getStatusHandler().reportInfo(statusObj);
					 getLog().log(ILog.INFO, "ws_ant", 9999, this, "getMappingExtensions", msg);					 
				 }
		      }    	 
		  }
		   return dataTable.elements();

				catch (Exception exc)
				{
					getStatusHandler().reportError(new Status(Status.ERROR, "ws_ant", 5093, exc.getMessage(), exc));
                    getLog().log(ILog.ERROR, "ws_ant", 5093, this, "transformAndSet", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_DATA_TRANSFORM, mapping.key_, mapping.transform_));
                    throw new IllegalArgumentException(exc.getMessage());
				}				
			}

			     		 catch(Exception cex){
			     			Status errorStatus = new Status(Status.ERROR, "ws_ant", 5094, cex.getMessage(), cex);
			     			getStatusHandler().reportError(errorStatus);
			     			getLog().log(ILog.ERROR, "ws_ant", 5094, this, "callSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, setterMethodName));
			     			throw new CoreException(errorStatus);
			     		 }
			       }  

				    	catch(Exception e){
				    		Status errorStatus = new Status(Status.ERROR, "ws_ant", 5095, e.getMessage(), e);
				    		getStatusHandler().reportError(errorStatus);
				    		getLog().log(ILog.ERROR, "ws_ant", 5095, this, "callPrimitiveSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, element.getName()));
				    		throw new CoreException(errorStatus);
				    	}
				    }			

					{
						Status errorStatus = new Status(Status.ERROR, "ws_ant", 5096, exc.getMessage(), exc);
						getStatusHandler().reportError(errorStatus);
						getLog().log(ILog.ERROR, "ws_ant", 5096, this, "callSetterConstructor", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, element.getName()));
						throw new CoreException(errorStatus);
					}
				}

       {
    	   
    	   //look up the commandFragment in the scenarioRegistry extension point with an ID corresponding to the scenario property in the propertytable
    	   String scenarioProperty = (String)getProperty(SCENARIO_TYPE_PROPERTY);
    	   IExtensionRegistry reg = Platform.getExtensionRegistry();
		   IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, SCENARIO_EXT_PT);
		   

				 {
					 Status errorStatus = new Status(Status.ERROR, "ws_ant", 5097, exception.getMessage(), exception);
					 getStatusHandler().reportError(errorStatus);
					 getLog().log(ILog.ERROR, "ws_ant", 5097, this, "getRootCommandFragment", EnvironmentMessages.MSG_ERROR_ANT_CMD_FRAGMENT);					 
				 }				 
			  }    	   
           }

Lines 22-27 Link Here

(-)src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java (+5 lines)
22	private static EnvPlugin instance;	22	private static EnvPlugin instance;
23		23
24	/**	24	/**
		25	* The identifier of the descriptor of this plugin in plugin.xml.
		26	*/
		27	public static final String ID = "org.eclipse.wst.command.env";
		28
		29	/**
25	* The constructor.	30	* The constructor.
26	*/	31	*/
27	public EnvPlugin() {	32	public EnvPlugin() {




!--ScenarioType REQUIRED. Differentiates from "service" scenario.  See axisservice.properties.
ScenarioType=client

!--InitialSelection REQUIRED.  Workspace relative URI to the input WSDL or Java.
InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl

!-- Client.RuntimeId, Client.ServerId 
ListRuntimes=true
ListServers=true
!-- Verbose will list informational messages as well as errors if set to true
Verbose=true

 
!--Client.RuntimeId - ID of web service runtime 
Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!--Client.ServerId - ID of target server 
Client.ServerId=org.eclipse.jst.server.tomcat.50

!--ClientProjectName - name of Client project - this property can be used to give the client project a 
!-- different name than the project containing the initial selection
!--ClientProjectName=clientProjectName

!--ClientComponentType- name of Client EAR project - set only if applicable for selected server type
!--ClientEarProjectName=clientEARProjectName

!--ClientComponentType - type of Client project - must be one of: jst.web, jst.java - only jst.web is valid for Axis
!--ClientComponentType=jst.web

!-- CustomizeClientMappings - set to true to supply package-namespace mappings type: boolean
!--CustomizeClientMappings=false  
    
!-- Mappings 
!-- Workspace relative URI to property file containing mappings
!-- Mappings are used to override the default package names of the generated Java classes.
!-- Need not be set if CustomizeClientMappings is false  
!-- The content of the properties file must be of the format package = namespace.
!--Mappings=/testProj/mappings/mappings.txt

!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean 
!-- note for non-interactive mode it is recommended that this be set to true
!-- OverwriteFilesEnabled=true

!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
!-- note for non-interactive mode it is recommended that this be set to true
!-- CreateFoldersEnabled=true

!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
!-- note for non-interactive mode it is recommended that this be set to true
!-- CheckoutFilesEnabled=true




!-- ScenarioType REQUIRED. Differentiates from "client" scenario.  See axisclient.properties.
ScenarioType=service

!-- InitialSelection REQUIRED.  Workspace relative URI to the input WSDL or Java
InitialSelection=/dynamicWebProjectName/WebContent/myService.wsdl

!--Utility property values - use these to list valid values for the following properties:
!-- Service.RuntimeId, Service.ServerId 
ListRuntimes=true
ListServers=true
!-- Verbose will list informational messages as well as errors if set to true
Verbose=true

!--  Service.RuntimeId - ID of web service runtime 
Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
!-- Service.ServerId -  ID of target server 
Service.ServerId=org.eclipse.jst.server.tomcat.50

!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection.  type: String    
!--ServiceProjectName=serviceProjectName
!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection.  type: String
!--ServiceEarProjectName=serviceEarProjectName

!-- Mappings
!-- Top down or bottom up scenario. Workspace relative URI to property file containing mappings.
!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.
!-- The content of the properties file must be of the format namespace=package  
!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.
!-- The content of the properties file must be of the format package = namespace 
!--Mappings=/testProj/mappings/mappings.txt

!-- JavaOutput
!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
!--JavaOutput=/projectName/JavaSource

!-- Methods
!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL.  If no list is provided, all methods are exposed.
!-- Methods=

!-- Style
!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED
!--Style=DOCUMENT

!-- Use
!-- Bottom up - String: one of: LITERAL, ENCODED 
!--Use=LITERAL

!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean 
!-- note for non-interactive mode it is recommended that this be set to true
!--OverwriteFilesEnabled=true

!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
!-- note for non-interactive mode it is recommended that this be set to true
!--CreateFoldersEnabled=true

!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
!-- note for non-interactive mode it is recommended that this be set to true
!--CheckoutFilesEnabled=true

Return to bug 126259

Lines 34-39 Link Here

(-)src/org/eclipse/wst/command/internal/env/ant/AntEnvironment.java (-11 / +52 lines)
34	import org.eclipse.wst.command.internal.env.core.data.Transformer;	34	import org.eclipse.wst.command.internal.env.core.data.Transformer;
35	import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;	35	import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
36	import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;	36	import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
		37	import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
37	import org.eclipse.wst.common.environment.ILog;	38	import org.eclipse.wst.common.environment.ILog;
38	import org.eclipse.wst.common.environment.IStatusHandler;	39	import org.eclipse.wst.common.environment.IStatusHandler;
39	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;	40	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
Lines 53-59 Link Here
53	private Hashtable operationDataRecord_ = new Hashtable();	54	private Hashtable operationDataRecord_ = new Hashtable();
54	private boolean mappingComplete_;	55	private boolean mappingComplete_;
55	private ClassEntry classEntry;	56	private ClassEntry classEntry;
56		57
57	// extensionPoint names and namespace	58	// extensionPoint names and namespace
58	private static String MAPPER_EXT_PT = "antDataMapping"; //$NON-NLS-1$	59	private static String MAPPER_EXT_PT = "antDataMapping"; //$NON-NLS-1$
59	private static String SCENARIO_EXT_PT = "antScenario"; //$NON-NLS-1$	60	private static String SCENARIO_EXT_PT = "antScenario"; //$NON-NLS-1$
Lines 64-74 Link Here
64	private static final String MAPPER_KEY_ATTRIBUTE= "key"; //$NON-NLS-1$	65	private static final String MAPPER_KEY_ATTRIBUTE= "key"; //$NON-NLS-1$
65	private static final String MAPPER_PROPERTY_ATTRIBUTE= "property"; //$NON-NLS-1$	66	private static final String MAPPER_PROPERTY_ATTRIBUTE= "property"; //$NON-NLS-1$
66	private static final String MAPPER_TRANSFORM_ATTRIBUTE= "transform"; //$NON-NLS-1$	67	private static final String MAPPER_TRANSFORM_ATTRIBUTE= "transform"; //$NON-NLS-1$
67		68	private static final String MAPPER_REQUIRED_ATTRIBUTE= "required"; //$NON-NLS-1$
		69
68	// antScenario extension point attributes	70	// antScenario extension point attributes
69	private static final String SCENARIO_TYPE_ATTRIBUTE = "scenarioType"; //$NON-NLS-1$	71	private static final String SCENARIO_TYPE_ATTRIBUTE = "scenarioType"; //$NON-NLS-1$
70	private static final String SCENARIO_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$	72	private static final String SCENARIO_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
71		73
		74	// Ant property IDs
		75	private static final String VERBOSE_PROPERTY = "Verbose"; //$NON-NLS-1$
		76	private static final String SCENARIO_TYPE_PROPERTY = "ScenarioType"; //$NON-NLS-1$
		77
72	private AntController controller_;	78	private AntController controller_;
73		79
74	public AntEnvironment(AntController controller, ResourceContext context, IStatusHandler handler, Hashtable properties)	80	public AntEnvironment(AntController controller, ResourceContext context, IStatusHandler handler, Hashtable properties)
Lines 78-88 Link Here
78	controller_ = controller;	84	controller_ = controller;
79	}	85	}
80		86
		87	public boolean verbose()
		88	{
		89	String verbose=getProperty(VERBOSE_PROPERTY);
		90
		91	if (verbose != null)
		92	{
		93	verbose = verbose.toLowerCase();
		94	if (verbose.equals("true"))
		95	return true;
		96	}
		97	return false;
		98	}
		99
81	// returns String since the property table built by Ant is property value pairs where the value is a String	100	// returns String since the property table built by Ant is property value pairs where the value is a String
82	private String getProperty(String key)	101	private String getProperty(String key)
83	{	102	{
84	Object property = antProperties_.get(key);	103	Object property = antProperties_.get(key);
85	if (property != null)	104	if (property != null && (!property.toString().equals("")))
86	return property.toString().trim();	105	return property.toString().trim();
87	return null;	106	return null;
88	}	107	}
Lines 209-215 Link Here
209	catch (CoreException cex) {	228	catch (CoreException cex) {
210	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5092, cex.getMessage(), cex);	229	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5092, cex.getMessage(), cex);
211	getStatusHandler().reportError(errorStatus);	230	getStatusHandler().reportError(errorStatus);
212	getLog().log(ILog.ERROR, "ws_ant", 5092, this, "getMappingExtensions", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_DATA_TRANSFORM, key, transform));	231	getLog().log(ILog.ERROR, "ws_ant", 5092, this, "getMappingExtensions", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_DATA_TRANSFORM, key, transform));
213	throw new CoreException(errorStatus);	232	throw new CoreException(errorStatus);
214	}	233	}
215		234
Lines 244-250 Link Here
244	holder.value_ = value;	263	holder.value_ = value;
245	dataTable.put(property, holder);	264	dataTable.put(property, holder);
246	}	265	}
247	}	266	}
		267	else if(ce.getAttribute(MAPPER_REQUIRED_ATTRIBUTE)!=null && ce.getAttribute(MAPPER_REQUIRED_ATTRIBUTE).equals("true"))
		268	{
		269	String msg = EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_REQUIRED_PROPERTY, key.toString());
		270	Status statusObj = new Status(IStatus.ERROR,
		271	EnvPlugin.ID,
		272	IStatus.ERROR,
		273	msg,
		274	null);
		275	getStatusHandler().reportError(statusObj);
		276	getLog().log(ILog.ERROR, "ws_ant", 9999, this, "getMappingExtensions", msg);
		277	}
		278	else if (verbose())
		279	{
		280	String msg = EnvironmentMessages.bind(EnvironmentMessages.MSG_INFO_ANT__PROPERTY_DEFAULT, key.toString());
		281	Status statusObj = new Status(IStatus.INFO,
		282	EnvPlugin.ID,
		283	IStatus.INFO,
		284	msg,
		285	null);
		286	getStatusHandler().reportInfo(statusObj);
		287	getLog().log(ILog.INFO, "ws_ant", 9999, this, "getMappingExtensions", msg);
		288	}
248	}	289	}
249	}	290	}
250	return dataTable.elements();	291	return dataTable.elements();
Lines 279-285 Link Here
279	catch (Exception exc)	320	catch (Exception exc)
280	{	321	{
281	getStatusHandler().reportError(new Status(Status.ERROR, "ws_ant", 5093, exc.getMessage(), exc));	322	getStatusHandler().reportError(new Status(Status.ERROR, "ws_ant", 5093, exc.getMessage(), exc));
282	getLog().log(ILog.ERROR, "ws_ant", 5093, this, "transformAndSet", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_DATA_TRANSFORM, mapping.key_, mapping.transform_));	323	getLog().log(ILog.ERROR, "ws_ant", 5093, this, "transformAndSet", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_DATA_TRANSFORM, mapping.key_, mapping.transform_));
283	throw new IllegalArgumentException(exc.getMessage());	324	throw new IllegalArgumentException(exc.getMessage());
284	}	325	}
285	}	326	}
Lines 372-378 Link Here
372	catch(Exception cex){	413	catch(Exception cex){
373	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5094, cex.getMessage(), cex);	414	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5094, cex.getMessage(), cex);
374	getStatusHandler().reportError(errorStatus);	415	getStatusHandler().reportError(errorStatus);
375	getLog().log(ILog.ERROR, "ws_ant", 5094, this, "callSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_CALL_SETTER, setterMethodName));	416	getLog().log(ILog.ERROR, "ws_ant", 5094, this, "callSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, setterMethodName));
376	throw new CoreException(errorStatus);	417	throw new CoreException(errorStatus);
377	}	418	}
378	}	419	}
Lines 435-441 Link Here
435	catch(Exception e){	476	catch(Exception e){
436	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5095, e.getMessage(), e);	477	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5095, e.getMessage(), e);
437	getStatusHandler().reportError(errorStatus);	478	getStatusHandler().reportError(errorStatus);
438	getLog().log(ILog.ERROR, "ws_ant", 5095, this, "callPrimitiveSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_CALL_SETTER, element.getName()));	479	getLog().log(ILog.ERROR, "ws_ant", 5095, this, "callPrimitiveSetter", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, element.getName()));
439	throw new CoreException(errorStatus);	480	throw new CoreException(errorStatus);
440	}	481	}
441	}	482	}
Lines 464-470 Link Here
464	{	505	{
465	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5096, exc.getMessage(), exc);	506	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5096, exc.getMessage(), exc);
466	getStatusHandler().reportError(errorStatus);	507	getStatusHandler().reportError(errorStatus);
467	getLog().log(ILog.ERROR, "ws_ant", 5096, this, "callSetterConstructor", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERR_ANT_CALL_SETTER, element.getName()));	508	getLog().log(ILog.ERROR, "ws_ant", 5096, this, "callSetterConstructor", EnvironmentMessages.bind(EnvironmentMessages.MSG_ERROR_ANT_CALL_SETTER, element.getName()));
468	throw new CoreException(errorStatus);	509	throw new CoreException(errorStatus);
469	}	510	}
470	}	511	}
Lines 483-489 Link Here
483	{	524	{
484		525
485	//look up the commandFragment in the scenarioRegistry extension point with an ID corresponding to the scenario property in the propertytable	526	//look up the commandFragment in the scenarioRegistry extension point with an ID corresponding to the scenario property in the propertytable
486	String scenarioProperty = (String)getProperty(SCENARIO_TYPE_ATTRIBUTE);	527	String scenarioProperty = (String)getProperty(SCENARIO_TYPE_PROPERTY);
487	IExtensionRegistry reg = Platform.getExtensionRegistry();	528	IExtensionRegistry reg = Platform.getExtensionRegistry();
488	IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, SCENARIO_EXT_PT);	529	IExtensionPoint extPt = reg.getExtensionPoint(EXT_PT_NAMESPACE, SCENARIO_EXT_PT);
489		530
Lines 507-513 Link Here
507	{	548	{
508	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5097, exception.getMessage(), exception);	549	Status errorStatus = new Status(Status.ERROR, "ws_ant", 5097, exception.getMessage(), exception);
509	getStatusHandler().reportError(errorStatus);	550	getStatusHandler().reportError(errorStatus);
510	getLog().log(ILog.ERROR, "ws_ant", 5097, this, "getRootCommandFragment", EnvironmentMessages.MSG_ERR_ANT_CMD_FRAGMENT);	551	getLog().log(ILog.ERROR, "ws_ant", 5097, this, "getRootCommandFragment", EnvironmentMessages.MSG_ERROR_ANT_CMD_FRAGMENT);
511	}	552	}
512	}	553	}
513	}	554	}

Lines 1-5 Link Here

(-)ant/axisclient.properties (-17 / +21 lines)
1	!--scenarioType REQUIRED. Differentiates from "service" scenario. See axisservice.properties.	1	!--ScenarioType REQUIRED. Differentiates from "service" scenario. See axisservice.properties.
2	scenarioType=client	2	ScenarioType=client
3		3
4	!--InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java.	4	!--InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java.
5	InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl	5	InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
Lines 8-46 Link Here
8	!-- Client.RuntimeId, Client.ServerId	8	!-- Client.RuntimeId, Client.ServerId
9	ListRuntimes=true	9	ListRuntimes=true
10	ListServers=true	10	ListServers=true
		11	!-- Verbose will list informational messages as well as errors if set to true
		12	Verbose=true
		13
11		14
12	!--type:String - ID of web service runtime	15	!--Client.RuntimeId - ID of web service runtime
13	Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT	16	Client.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
14	!--type:String - ID of target server	17	!--Client.ServerId - ID of target server
15	Client.ServerId=org.eclipse.jst.server.tomcat.50	18	Client.ServerId=org.eclipse.jst.server.tomcat.50
16		19
17	!--type:String - name of Client project - this property can be used to give the client project a	20	!--ClientProjectName - name of Client project - this property can be used to give the client project a
18	!-- different name than the project containing the initial selection	21	!-- different name than the project containing the initial selection
19	ClientProjectName=clientProjectName	22	!--ClientProjectName=clientProjectName
20	!--type:String - name of Client EAR project - set only if applicable for selected server type	23
21	ClientEarProjectName=clientEARProjectName	24	!--ClientComponentType- name of Client EAR project - set only if applicable for selected server type
22	!--type:String - type of Client project - must be one of: jst.web, jst.java	25	!--ClientEarProjectName=clientEARProjectName
23	!-- only jst.web is valid for Axis	26
24	ClientComponentType=jst.web	27	!--ClientComponentType - type of Client project - must be one of: jst.web, jst.java - only jst.web is valid for Axis
		28	!--ClientComponentType=jst.web
25		29
26	!-- CustomizeClientMappings - set to true to supply package-namespace mappings type: boolean	30	!-- CustomizeClientMappings - set to true to supply package-namespace mappings type: boolean
27	CustomizeClientMappings=false	31	!--CustomizeClientMappings=false
28		32
29	!-- type:String	33	!-- Mappings
30	!-- Workspace relative URI to property file containing mappings	34	!-- Workspace relative URI to property file containing mappings
31	!-- Mappings are used to override the default package names of the generated Java classes.	35	!-- Mappings are used to override the default package names of the generated Java classes.
32	!-- Need not be set if CustomizeClientMappings is false	36	!-- Need not be set if CustomizeClientMappings is false
33	!-- The content of the properties file must be of the format package = namespace.	37	!-- The content of the properties file must be of the format package = namespace.
34	Mappings=/testProj/mappings/mappings.txt	38	!--Mappings=/testProj/mappings/mappings.txt
35		39
36	!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean	40	!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
37	!-- note for non-interactive mode it is recommended that this be set to true	41	!-- note for non-interactive mode it is recommended that this be set to true
38	OverwriteFilesEnabled=true	42	!-- OverwriteFilesEnabled=true
39		43
40	!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean	44	!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
41	!-- note for non-interactive mode it is recommended that this be set to true	45	!-- note for non-interactive mode it is recommended that this be set to true
42	CreateFoldersEnabled=true	46	!-- CreateFoldersEnabled=true
43		47
44	!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean	48	!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
45	!-- note for non-interactive mode it is recommended that this be set to true	49	!-- note for non-interactive mode it is recommended that this be set to true
46	CheckoutFilesEnabled=true	50	!-- CheckoutFilesEnabled=true

Lines 1-50 Link Here

(-)ant/axisservice.properties (-19 / +27 lines)
1	!-- REQUIRED. Differentiates from "client" scenario. See axisclient.properties.	1	!-- ScenarioType REQUIRED. Differentiates from "client" scenario. See axisclient.properties.
2	scenarioType=service	2	ScenarioType=service
3		3
4	!-- REQUIRED. Workspace relative URI to the input WSDL or Java	4	!-- InitialSelection REQUIRED. Workspace relative URI to the input WSDL or Java
5	InitialSelection=/dynamicWebProjectName/WebContent/myService.wsdl	5	InitialSelection=/dynamicWebProjectName/WebContent/myService.wsdl
6		6
7	!--Utility property values - use these to list valid values for the following properties:	7	!--Utility property values - use these to list valid values for the following properties:
8	!-- Service.RuntimeId, Service.ServerId	8	!-- Service.RuntimeId, Service.ServerId
9	ListRuntimes=true	9	ListRuntimes=true
10	ListServers=true	10	ListServers=true
		11	!-- Verbose will list informational messages as well as errors if set to true
		12	Verbose=true
11		13
12	!-- type:String - ID of web service runtime	14	!-- Service.RuntimeId - ID of web service runtime
13	Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT	15	Service.RuntimeId=org.eclipse.jst.ws.axis.creation.axisWebServiceRT
14	!--type:String - ID of target server	16	!-- Service.ServerId - ID of target server
15	Service.ServerId=org.eclipse.jst.server.tomcat.50	17	Service.ServerId=org.eclipse.jst.server.tomcat.50
16		18
17	!--ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String	19	!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
18	ServiceProjectName=serviceProjectName	20	!--ServiceProjectName=serviceProjectName
19	!--ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String	21	!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection. type: String
20	ServiceEarProjectName=serviceEarProjectName	22	!--ServiceEarProjectName=serviceEarProjectName
21		23
22	!-- AXIS SERVICE ----	24	!-- Mappings
23	!-- All scenarios. String: workspace relative URI to property file containing mappings	25	!-- Top down or bottom up scenario. Workspace relative URI to property file containing mappings.
24	!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.	26	!-- Top Down: Mappings are used to override the default package names of the generated Java template classes.
25	!-- The content of the properties file must be of the format namespace=package	27	!-- The content of the properties file must be of the format namespace=package
26	!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.	28	!-- Bottom Up: Mappings are used to override the default namespace names in the generated WSDL.
27	!-- The content of the properties file must be of the format package = namespace	29	!-- The content of the properties file must be of the format package = namespace
28	Mappings=/testProj/mappings/mappings.txt	30	!--Mappings=/testProj/mappings/mappings.txt
29		31
		32	!-- JavaOutput
30	!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder	33	!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
31	JavaOutput=/projectName/JavaSource	34	!--JavaOutput=/projectName/JavaSource
32		35
		36	!-- Methods
33	!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL. If no list is provided, all methods are exposed.	37	!-- Bottom up - space delimited string of method signatures (i.e. method1(parmType1) method2(parmType2)) to be exposed in output WSDL. If no list is provided, all methods are exposed.
34	Methods=	38	!-- Methods=
		39
		40	!-- Style
35	!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED	41	!-- Bottom up - String: one of: RPC, DOCUMENT, WRAPPED
36	Style=DOCUMENT	42	!--Style=DOCUMENT
		43
		44	!-- Use
37	!-- Bottom up - String: one of: LITERAL, ENCODED	45	!-- Bottom up - String: one of: LITERAL, ENCODED
38	Use=LITERAL	46	!--Use=LITERAL
39		47
40	!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean	48	!--OverwriteFilesEnabled - set to true to overwrite files that already exist. type:boolean
41	!-- note for non-interactive mode it is recommended that this be set to true	49	!-- note for non-interactive mode it is recommended that this be set to true
42	OverwriteFilesEnabled=true	50	!--OverwriteFilesEnabled=true
43		51
44	!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean	52	!--CreateFoldersEnabled - set to true create folders necessary during file generation type:boolean
45	!-- note for non-interactive mode it is recommended that this be set to true	53	!-- note for non-interactive mode it is recommended that this be set to true
46	CreateFoldersEnabled=true	54	!--CreateFoldersEnabled=true
47		55
48	!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean	56	!--CheckoutFilesEnabled - set to true to check out files with no warning to the user type:boolean
49	!-- note for non-interactive mode it is recommended that this be set to true	57	!-- note for non-interactive mode it is recommended that this be set to true
50	CheckoutFilesEnabled=true	58	!--CheckoutFilesEnabled=true