[193593] Axis2: custom package setting on client page is not respected.
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.consumption.core/META-INF/MANIFEST.MF
index 27a5910..f529294 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.core
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.jst.ws.axis2.consumption.core.plugin.WebServiceAxis2ConsumptionCorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
index d82ece1..c5540a0 100644
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
+++ b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
@@ -16,6 +16,7 @@
* 20070507 185398 sandakith@wso2.com - Lahiru Sandakith
* 20070813 196173 sandakith@wso2.com - Lahiru Sandakith, Fix 196173, DWP custom location fix
* 20070814 187840 sandakith@wso2.com - Lahiru Sandakith, Fixing 187840 ITE message
+ * 20070814 193593 sandakith@wso2.com - Lahiru Sandakith, custom package name fix
*******************************************************************************/
package org.eclipse.jst.ws.axis2.consumption.core.command;
@@ -159,11 +160,17 @@
Method getTargetNamespaceMethod = AxisServiceClass.getMethod("getTargetNamespace", null);
Object targetNamespace = getTargetNamespaceMethod.invoke(axisServiceInstance, null);
- Class URLProcessorClass = ClassLoadingUtil
- .loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
- Method makePackageNameMethod = URLProcessorClass
- .getMethod("makePackageName", new Class[]{String.class});
- Object stringReturn = makePackageNameMethod.invoke(null, new Object[]{targetNamespace});
+ Object stringReturn = null;
+ if (model.getPackageText()!=null) {
+ stringReturn = model.getPackageText();
+ } else {
+ Class URLProcessorClass = ClassLoadingUtil
+ .loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
+ Method makePackageNameMethod = URLProcessorClass
+ .getMethod("makePackageName", new Class[]{String.class});
+ stringReturn = makePackageNameMethod.invoke(null, new Object[]{targetNamespace});
+ }
+
model.setPackageText(stringReturn.toString());
