[177005] Fixed Ant mapping defect.
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
index 022ed2f..f983fda 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCore.properties
@@ -1,12 +1,15 @@
###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
+# Copyright (c) 2004, 2007 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
+# IBM Corporation - initial API and implementation
+# yyyymmdd bug Email and other contact information
+# -------- -------- -----------------------------------------------------------
+# 20070412 177005 pmoogk@ca.ibm.com - Peter Moogk
###############################################################################
#
@@ -35,3 +38,5 @@
# Messages common for all
#
MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
+MSG_ERROR_FOLDER_NOT_FOUND=Output folder: {0} was not found.
+
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
index c43b740..2bda898 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/AxisConsumptionCoreMessages.java
@@ -1,12 +1,15 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 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
+ * IBM Corporation - initial API and implementation
+ * yyyymmdd bug Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20070412 177005 pmoogk@ca.ibm.com - Peter Moogk
*******************************************************************************/
package org.eclipse.jst.ws.internal.axis.consumption.core;
@@ -31,8 +34,9 @@
public static String MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET;
public static String MSG_ERROR_MOVE_RESOURCE;
public static String MSG_ERROR_CREATE_TEMP_DIR;
-
+ public static String MSG_ERROR_FOLDER_NOT_FOUND;
+
static {
NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionCoreMessages.class);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
index 8d1b149..e7beead 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParamModifier.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ * yyyymmdd bug Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20070412 177005 pmoogk@ca.ibm.com - Peter Moogk
+ *******************************************************************************/
package org.eclipse.jst.ws.internal.axis.consumption.core.common;
import java.util.HashMap;
@@ -5,11 +18,13 @@
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.ws.internal.axis.consumption.core.AxisConsumptionCoreMessages;
import org.eclipse.wst.command.internal.env.core.data.BeanModifier;
+import org.eclipse.wst.common.internal.environment.eclipse.FileResourceUtils;
public class JavaWSDLParamModifier implements BeanModifier {
@@ -40,29 +55,74 @@
}
if (propertyMap.containsKey("JavaOutput"))
{
- javaWSDLParam.setJavaOutput((String)propertyMap.get("JavaOutput"));
+ String outputLocation = (String)propertyMap.get("JavaOutput");
+ int index = outputLocation.indexOf( ':' );
+
+ if( index == -1 )
+ {
+ // A colon was not found in the string so we will assume that
+ // it is a workspace relative uri for now.
+ IResource resource = FileResourceUtils.findResource( new Path( outputLocation ) );
+
+ if( resource == null || resource.getLocation() == null )
+ {
+ throw new IllegalArgumentException( AxisConsumptionCoreMessages.bind( AxisConsumptionCoreMessages.MSG_ERROR_FOLDER_NOT_FOUND,
+ outputLocation ) );
+ }
+
+ outputLocation = resource.getLocation().toString();
+ }
+
+ javaWSDLParam.setJavaOutput( outputLocation );
}
if (propertyMap.containsKey("Methods"))
{
- //get Method list from the map
- String methodList = (String)propertyMap.get("Methods");
+ //get Method list from the map
+ String methodList = (String)propertyMap.get("Methods");
- //tokenize the method list
- StringTokenizer tok = new StringTokenizer(methodList, " ");
- Hashtable methods = new Hashtable();
- while (tok.hasMoreTokens())
- {
- methods.put(tok.nextToken(), new Boolean(true));
- }
- javaWSDLParam.setMethods(methods);
+ //tokenize the method list
+ StringTokenizer tok = new StringTokenizer(methodList, " ");
+ Hashtable methods = new Hashtable();
+ while (tok.hasMoreTokens())
+ {
+ String method = (String)tok.nextToken();
+
+ if( method.indexOf( '(' ) == -1 )
+ {
+ method = method + "()";
+ }
+
+ methods.put( method, new Boolean(true));
+ }
+ javaWSDLParam.setMethods(methods);
}
if (propertyMap.containsKey("Mappings"))
{
- //get name of the file that has the mappings in it from the map
- String filename = (String)propertyMap.get("Mappings");
- //get the list of mapping from the file
- HashMap mappings = readMappingsFromFile(filename);
- javaWSDLParam.setMappings(mappings);
+ //get name of the file that has the mappings in it from the map
+ String filename = (String)propertyMap.get("Mappings");
+
+ //get the list of mapping from the file
+ HashMap mappings = readMappingsFromFile(filename);
+
+ javaWSDLParam.setMappings(mappings);
+
+ String beanName = javaWSDLParam.getBeanName();
+
+ if( beanName != null && !beanName.equals("") )
+ {
+ int lastDot = beanName.lastIndexOf( '.' );
+ String packageName = lastDot == -1 ? null : beanName.substring( 0, lastDot );
+
+ if( mappings != null && packageName != null )
+ {
+ String tns = (String)mappings.get( packageName );
+
+ if( tns != null )
+ {
+ javaWSDLParam.setNamespace(tns);
+ }
+ }
+ }
}
}
}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
index 5e211f5..7c50c17 100644
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
@@ -22,22 +22,7 @@
property="CustomizeClientMappings"/>
<map
key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
- property="JavaWSDLParam"
- transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
- <map
- key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand"
+ operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
</extension>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
index 77aef4e..a9e6078 100644
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
@@ -106,53 +106,53 @@
transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
<map
key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Methods"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Style"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Use"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.BUCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="JavaOutput"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Mappings"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Methods"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Style"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
<map
key="Use"
- operation="org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand"
+ operation="org.eclipse.jst.ws.internal.axis.creation.ui.command.TDCodeGenOperation"
property="JavaWSDLParam"
transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
</extension>
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
index 429c18e..c11d8c0 100644
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
+++ b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/EnvironmentCore.properties
@@ -1,18 +1,21 @@
###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
+# Copyright (c) 2001, 2007 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
+# IBM Corporation - initial API and implementation
+# yyyymmdd bug Email and other contact information
+# -------- -------- -----------------------------------------------------------
+# 20070418 177005 pmoogk@ca.ibm.com - Peter Moogk
###############################################################################
#
# Common Messages
#
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
+MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occurred.
TITLE_WARNING=Warning:
TITLE_ERROR=Error:
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
index 413d700..815c255 100644
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
+++ b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/Environment.properties
@@ -1,12 +1,15 @@
###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
+# Copyright (c) 2001, 2007 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
+# IBM Corporation - initial API and implementation
+# yyyymmdd bug Email and other contact information
+# -------- -------- -----------------------------------------------------------
+# 20070418 177005 pmoogk@ca.ibm.com - Peter Moogk
###############################################################################
#
@@ -23,7 +26,7 @@
MSG_ERROR_FOLDER_HAS_CHILDREN=IWAB0012E Cannot create folder: {0} that already has children.
MSG_ERROR_IO=IWAB0006E An input/output error occurred while processing the resource "{0}".
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?
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
+MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occurred.
MSG_ERROR_ANT_DATA_TRANSFORM=Exception transforming Ant property key {0} using transformation {1}.
MSG_ERROR_ANT_CALL_SETTER=Exception invoking setter method {0} for Ant property.
MSG_ERROR_ANT_CMD_FRAGMENT=Exception retrieving Ant command fragment from registry.
