[377668] Provide a way to modify the name of generated beans.xml
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 9b19987..8926f06 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
@@ -70,7 +70,7 @@
IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
- beansFile = webINFFolder.getFile("beans.xml"); //$NON-NLS-1$
+ beansFile = webINFFolder.getFile("cxf-beans.xml"); //$NON-NLS-1$
if (!beansFile.exists()) {
try {
IProgressMonitor progressMonitor = new NullProgressMonitor();
@@ -259,7 +259,7 @@
return ""; //$NON-NLS-1$
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public static void createConfigurationFromWSDL(WSDL2JavaDataModel model) throws IOException {
String targetNamespace = model.getTargetNamespace();
String packageName = model.getIncludedNamespaces().get(targetNamespace);
@@ -286,7 +286,7 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public static void loadSpringConfigInformationFromWSDL(CXFDataModel model) {
IFile wsdlFile = WSDLUtils.getWSDLFolder(model.getProjectName()).getFile(model.getWsdlFileName());
if (wsdlFile.exists()) {
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
index 20cb899..decdc99 100644
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
+++ b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
@@ -32,7 +32,7 @@
* Adds the CXF classpath container to the project.
* <p>
* Also sets up the web projects application deployment descriptor (web.xml file)
- * to use cxf-servlet or the Spring Application context (WEB-INF/beans.xml) for
+ * to use cxf-servlet or the Spring Application context (WEB-INF/cxf-beans.xml) for
* endpoint configuration. Depends on a setting in the CXF preferences.
*
*/
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CreateDeploymentDescriptorCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CreateDeploymentDescriptorCommand.java
index b17740d..c23687a 100644
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CreateDeploymentDescriptorCommand.java
+++ b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CreateDeploymentDescriptorCommand.java
@@ -122,7 +122,7 @@
return status;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
private void addSpringApplicationContextWeb25(IProject webProject,
org.eclipse.jst.javaee.web.WebApp webapp) {
List contextParams = webapp.getContextParams();
@@ -147,7 +147,7 @@
ParamValue configLocationParam = javaeeFactory.createParamValue();
configLocationParam.setParamName("contextConfigLocation"); //$NON-NLS-1$
- configLocationParam.setParamValue("WEB-INF/beans.xml"); //$NON-NLS-1$
+ configLocationParam.setParamValue("WEB-INF/cxf-beans.xml"); //$NON-NLS-1$
webapp.getContextParams().add(configLocationParam);
@@ -157,7 +157,7 @@
webapp.getListeners().add(contextLoaderListener);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
private void addCXFJSTWEB25Servlet(IProject webProject, org.eclipse.jst.javaee.web.WebApp webapp) {
List servlets = webapp.getServlets();
for (int i = 0; i < servlets.size(); i++) {
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
index 603287d..02ec85e 100755
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.jst.ws.cxf.doc.user/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.ws.cxf.doc.user;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Vendor: %pluginProvider
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.3.100,4.0.0)"
diff --git a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
index 1ee9e60..1771aa5 100755
--- a/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
+++ b/docs/org.eclipse.jst.ws.cxf.doc.user/reference/endpoint_config_tab.html
@@ -51,7 +51,7 @@
</td>
<td valign="top">
- <p>Creates a beans.xml file in the Web Projects WEB-INF directory. This is the fastest option as it allows the specification of which CXF modules to load for an endpoint</p>
+ <p>Creates a cxf-beans.xml file in the Web Projects WEB-INF directory. This is the fastest option as it allows the specification of which CXF modules to load for an endpoint</p>
</td>
<td valign="top">
diff --git a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml
index abfc09b..c8220c0 100644
--- a/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws_userdoc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.ws.jaxws_userdoc.feature"
label="%featureName"
- version="1.0.100.qualifier"
+ version="1.0.200.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
