diff --git a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
index 7c7eb5a..ffabbea 100644
--- a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
@@ -7,17 +7,18 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %pluginProvider
 Eclipse-BuddyPolicy: registered
-Require-Bundle: org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.core.runtime,
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ui,
- org.eclipse.jdt.apt.core,
- org.eclipse.jdt.ui;bundle-version="3.4.1"
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
 Export-Package: org.eclipse.jst.ws.annotations.core,
  org.eclipse.jst.ws.annotations.core.initialization,
  org.eclipse.jst.ws.annotations.core.processor,
  org.eclipse.jst.ws.annotations.core.utils
 Bundle-Activator: org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
index e054320..d0baf7d 100644
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
+++ b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
@@ -103,12 +103,14 @@
     
     public List<ElementType> getTargets() {
         if (targets == null) {
+        	targets = Collections.emptyList();
+        	
             Class<? extends java.lang.annotation.Annotation> annotation = getAnnotationClass();
-            Target target = annotation.getAnnotation(Target.class);
-            if (target != null) {
-                targets = Arrays.asList(target.value());
-            } else {
-                targets = Collections.emptyList();
+            if (annotation != null) {
+            	Target target = annotation.getAnnotation(Target.class);
+            	if (target != null) {
+            		targets = Arrays.asList(target.value());
+            	} 
             }
         }
         return targets;
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
index 00c1fd6..ac4d3bd 100644
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
@@ -6,18 +6,18 @@
 Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.core.commands
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.ws,
- org.eclipse.core.resources,
- org.eclipse.jst.ws,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jdt.core,
- javax.wsdl,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.ws.jaxws.core
+Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.core.commands;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
+ org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
 Ant-Version: Apache Ant 1.7.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
index 4c77c2c..31ab5ab 100644
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
@@ -75,6 +75,6 @@
 
     public static void log(Throwable exception) {
         CXFConsumptionCorePlugin.log(new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID, 
-            exception.getLocalizedMessage(), exception));
+            exception.toString(), exception));
     }
 }
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
index 2c57a94..f1b1b04 100644
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
@@ -6,25 +6,25 @@
 Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.core.resources,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jdt.ui,
- org.eclipse.wst.ws,
- org.eclipse.jst.ws.cxf.consumption.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jst.ws.cxf.ui,
- javax.wsdl,
- org.eclipse.jst.ws.jaxws.core
+Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.ws.cxf.consumption.core;bundle-version="0.3.4",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
+ org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
+ org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
+ org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
 Ant-Version: Apache Ant 1.7.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
index 1e644bc..4e73b58 100644
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
+++ b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
@@ -75,6 +75,6 @@
     
     public static void log(Throwable exception) {
         CXFConsumptionUIPlugin.log(new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, 
-            exception.getLocalizedMessage(), exception));
+            exception.toString(), exception));
     }
 }
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
index e1ed0e2..fbfc65a 100644
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
@@ -6,38 +6,52 @@
 Bundle-Activator: org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.core,
- org.eclipse.jst.ws.internal.cxf.core.context,
- org.eclipse.jst.ws.internal.cxf.core.model,
- org.eclipse.jst.ws.internal.cxf.core.model.impl,
- org.eclipse.jst.ws.internal.cxf.core.resources,
- org.eclipse.jst.ws.internal.cxf.core.utils
-Require-Bundle: org.eclipse.wst.common.project.facet.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jem,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws,
- org.eclipse.emf.codegen,
- org.eclipse.jdt.core,
- org.eclipse.debug.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.jdt.ui,
- org.jdom,
- javax.wsdl,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ui.console,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.apt.core,
- org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.wst.command.env.core
+Export-Package: org.eclipse.jst.ws.internal.cxf.core;
+  x-friends:="org.eclipse.jst.ws.cxf.ui,
+   org.eclipse.jst.ws.cxf.consumption.ui,
+   org.eclipse.jst.ws.cxf.creation.core,
+   org.eclipse.jst.ws.cxf.creation.ui",
+ org.eclipse.jst.ws.internal.cxf.core.context;x-friends:="org.eclipse.jst.ws.cxf.ui,org.eclipse.jst.ws.cxf.creation.core",
+ org.eclipse.jst.ws.internal.cxf.core.model;
+  x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,
+   org.eclipse.jst.ws.cxf.creation.core,
+   org.eclipse.jst.ws.cxf.ui,
+   org.eclipse.jst.ws.cxf.creation.ui",
+ org.eclipse.jst.ws.internal.cxf.core.model.impl;x-internal:=true,
+ org.eclipse.jst.ws.internal.cxf.core.resources;x-friends:="org.eclipse.jst.ws.cxf.creation.core",
+ org.eclipse.jst.ws.internal.cxf.core.utils;
+  x-friends:="org.eclipse.jst.ws.cxf.ui,
+   org.eclipse.jst.ws.cxf.consumption.ui,
+   org.eclipse.jst.ws.cxf.creation.core,
+   org.eclipse.jst.ws.cxf.creation.ui"
+Require-Bundle: org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.200,1.2.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
+ org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
+ org.eclipse.emf.codegen;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
+ org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
+ org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)"
 Ant-Version: Apache Ant 1.7.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.jws,
  javax.jws.soap,
- javax.xml.ws;version="2.1.0"
+ javax.xml.ws;version="2.1.0",
+ org.jdom;version="1.0.0",
+ org.jdom.input;version="1.0.0",
+ org.jdom.output;version="1.0.0"
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
index cf7607a..2ba6e75 100644
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
+++ b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
@@ -116,6 +116,6 @@
     
     public static void log(Throwable exception) {
         CXFCorePlugin.log(new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 
-                exception.getLocalizedMessage(), exception));
+                exception.toString(), exception));
     }
 }
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
index 61e301e..47a2429 100644
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
+++ b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
@@ -283,13 +283,30 @@
                 PortType portType = port.getBinding().getPortType();
                 QName qName = portType.getQName();
                 String portTypeName = qName.getLocalPart();
-                String fullyQualifiedClassName = packageName + "." + portTypeName + "Impl"; //$NON-NLS-1$ //$NON-NLS-2$
+                String fullyQualifiedClassName = packageName + "." + //$NON-NLS-1$
+                	convertPortTypeName(portTypeName) + "Impl"; //$NON-NLS-1$
                 model.setFullyQualifiedJavaClassName(fullyQualifiedClassName);
                 SpringUtils.createJAXWSEndpoint(model);
              }
          }
     }
 
+    private static String convertPortTypeName(String portTypeName) {
+    	String[] segments = portTypeName.split("[\\-\\.\\:\\_\\u00b7\\u0387\\u06dd\\u06de]");
+    	StringBuilder stringBuilder =  new StringBuilder();
+    	for (String segment : segments) {
+    		if (segment.length() == 0) {
+    			continue;
+    		}
+    		char firstCharacter = segment.charAt(0);
+    		if (!Character.isDigit(firstCharacter) && !Character.isUpperCase(firstCharacter)) {
+    			segment = segment.substring(0, 1).toUpperCase(Locale.getDefault()) + segment.substring(1);
+    		}
+    		stringBuilder.append(segment);
+		}
+    	return stringBuilder.toString();
+    }
+
     public static void createJAXWSEndpoint(CXFDataModel model) throws IOException {
         String projectName = model.getProjectName();
 
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
index 9080a5c..810e82a 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
@@ -7,27 +7,27 @@
 Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.core.commands
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.ws,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jdt.ui,
- javax.wsdl,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.text,
- org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.emf.ecore,
- org.eclipse.jem
+Export-Package: org.eclipse.jst.ws.internal.cxf.creation.core.commands;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
+ org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.100,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jem;bundle-version="[2.0.0,2.1.0)"
 Bundle-ActivationPolicy: lazy
 Ant-Version: Apache Ant 1.7.0
 Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
index 30d8712..7574276 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
@@ -9,7 +9,8 @@
 # IONA Technologies PLC - initial API and implementation
 ###############################################################################
 
-WSDL2JAVA_PROJECT_SELECTION_ERROR=Project configuration Error. Please select the "Service project:{0}" link in the "Configuration:" section and change the Service Project setting from {0} to {1}.
+WSDL2JAVA_PROJECT_SELECTION_ERROR=A possible conflict has been detected between project selections.\n\n The current configuration will result in code being generated into the "{0}" project.\n\nTo change the configuration click Cancel and then select the "Service project:" link in the "Configuration:" section in the Web Service wizard.\n\nClick Ok to continue with the current configuration.
+
 WSDL2JAVA_VALID_PORTTYPE_MESSAGE=The WSDL document must have a valid portType element
 
 JAVA2WS_SERVICE_IMPL_NOT_FOUND=The Service implementation "{0}" cannot be loaded from the "{1}" project. Please check that the project contains the class and that it is visible on the projects "Java Build Path".
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
index 1365ed4..64dab7f 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
@@ -19,6 +19,7 @@
 import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
 import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
 import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
+import org.eclipse.wst.common.environment.StatusException;
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 
 /**
@@ -49,21 +50,29 @@
 		}
 		
 		if (currentProject == null && initialProject != null && !initialProject.equals(serverProject)) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
+			status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
 					CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
 							serverProject.getName(), initialProject.getName()}));
 		} else if (initialProject == null && currentProject != null && !currentProject.equals(serverProject)) { 
-            status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
+            status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
                     CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
                             serverProject.getName(), currentProject.getName()}));
 		} else if (initialProject != null && currentProject != null && !currentProject.equals(serverProject)) {
-            status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
+            status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
                     CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
                             serverProject.getName(), currentProject.getName()}));
 		} else { 
 		    model.setProjectName(serverProject.getProject().getName());
 			status = Status.OK_STATUS;
 		}
+		
+		if (!status.isOK()) {
+			try {
+				getEnvironment().getStatusHandler().report(status);
+			} catch (StatusException e) {
+				return new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 0, "", null);
+			}
+		}
 		return status;
 	}
 	
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
index 189f237..18681a0 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
@@ -7,31 +7,33 @@
 Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.ui,org.eclipse.jst.ws.internal.cxf.creation.ui.widgets,org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.jst.ws.cxf.creation.core,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.command.env.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.jst.ws.cxf.ui,
- org.eclipse.jst.ws.cxf.consumption.ui,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.emf.common,
- javax.wsdl,
- org.eclipse.ui.editors
+Export-Package: org.eclipse.jst.ws.internal.cxf.creation.ui;x-internal:=true,
+ org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;x-internal:=true,
+ org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt;x-internal:=true
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
+ org.eclipse.jst.ws.cxf.creation.core;bundle-version="0.3.5",
+ org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
+ org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
+ org.eclipse.jst.ws.cxf.consumption.ui;bundle-version="0.3.3",
+ org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
+ org.eclipse.jst.ws.creation.ui;bundle-version="[1.0.305,1.1.0)",
+ org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
+ org.eclipse.emf.common;bundle-version="[2.4.0,3.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Ant-Version: Apache Ant 1.7.0
 Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
index f0de6f2..b7cd159 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
@@ -86,6 +86,6 @@
     
     public static void log(Throwable exception) {
         CXFCreationUIPlugin.log(new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-            exception.getLocalizedMessage(), exception));
+            exception.toString(), exception));
     }
 }
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java
index ce1be70..0ee3814 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java
@@ -78,6 +78,7 @@
             commands.add(new Java2WSCommand(java2WSDataModel));
         } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
             WSDL2JavaDataModel wsdl2JavaDataModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
+            wsdl2JavaDataModel.setProjectName(projectName);
             commands.add(new WSDL2JavaProjectSelectionCommand(wsdl2JavaDataModel));
             commands.add(new WSDL2JavaDefaultingCommand(wsdl2JavaDataModel, projectName, 
             		getWebServiceInfo().getWsdlURL()));
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
index 81237eb..f315a44 100644
--- a/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
@@ -6,19 +6,22 @@
 Bundle-Activator: org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.ui,org.eclipse.jst.ws.internal.cxf.ui.dialogs,org.eclipse.jst.ws.internal.cxf.ui.viewers,org.eclipse.jst.ws.internal.cxf.ui.widgets
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.cxf.core,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.jdt.core,
- javax.wsdl,
- org.eclipse.jdt.ui,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.emf.ecore,
- org.eclipse.jst.ws.jaxws.core
+Export-Package: org.eclipse.jst.ws.internal.cxf.ui;x-internal:=true,
+ org.eclipse.jst.ws.internal.cxf.ui.dialogs;x-internal:=true,
+ org.eclipse.jst.ws.internal.cxf.ui.viewers;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui",
+ org.eclipse.jst.ws.internal.cxf.ui.widgets;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui"
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ javax.wsdl;bundle-version="[1.5.0,1.6.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
+ org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
 Ant-Version: Apache Ant 1.7.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
index 6d36e0a..16d38ad 100644
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
+++ b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
@@ -73,6 +73,6 @@
     
     public static void log(Throwable exception) {
         CXFUIPlugin.log(new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, 
-            exception.getLocalizedMessage(), exception));
+            exception.toString(), exception));
     }
 }
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
index 69c07bd..936485a 100644
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
+++ b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
@@ -25,7 +25,6 @@
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
 import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
 import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
 import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
index 5710342..facbf70 100644
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
@@ -3,23 +3,23 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core;singleton:=true
 Bundle-Vendor: %pluginProvider
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.jdt.apt.core,
- org.eclipse.core.filesystem,
- org.eclipse.core.filebuffers,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ui,
- org.eclipse.jst.ws.annotations.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
+ org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0"
 Export-Package: org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization;x-friends:="org.eclipse.jst.ws.annotations.core",
  org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;x-friends:="org.eclipse.jst.ws.annotations.core",
  org.eclipse.jst.ws.jaxws.core.utils
@@ -32,3 +32,4 @@
  javax.xml.ws.soap;version="2.1.0",
  javax.xml.ws.spi;version="2.1.0",
  javax.xml.ws.wsaddressing;version="2.1.0"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
index 2e0e38f..97216a9 100755
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.ui;singleton:=true
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin
 Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.ui.editors,
- org.eclipse.jdt.launching,
- org.eclipse.jst.ws.annotations.core
+Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
+ org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
index 8c7022e..cc61dc9 100755
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
+++ b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
@@ -80,7 +80,7 @@
     }
 
     public static void log(Throwable exception) {
-        JAXWSUIPlugin.log(new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, exception.getLocalizedMessage(),
-                exception));
+        JAXWSUIPlugin.log(new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, 
+        		exception.toString(), exception));
     }
 }
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
index 614b308..f5ad017 100644
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
@@ -6,14 +6,14 @@
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.jaxws.core,
- org.eclipse.jdt.launching,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
+ org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0"
 Import-Package: javax.jws,
  javax.xml.ws;version="2.1.0"