diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project')
4 files changed, 12 insertions, 4 deletions
diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java index a46cfb888..ac572ceab 100644 --- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java +++ b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/IJAXRSFacetInstallDataModelProperties.java @@ -12,6 +12,7 @@ * 20091021 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet + * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect *******************************************************************************/ package org.eclipse.jst.ws.jaxrs.core.internal.project.facet; @@ -53,4 +54,6 @@ public interface IJAXRSFacetInstallDataModelProperties extends // Support post-project creation scenario. If WAR is parked in multiple EARs, then we should update all the EARs public static final String EARPROJECTS = "IJAXRSFacetInstallDataModelProperties.EARPROJECTS"; //$NON-NLS-1$ + public static final String UPDATEDD = "IJAXRSFacetInstallDataModelProperties.UPDATEDD"; //$NON-NLS-1$ + } diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java index 7902c649b..265dcd567 100644 --- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java +++ b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDataModelProvider.java @@ -13,6 +13,7 @@ * 20091106 291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet * 20100407 308401 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS facet wizard page - Shared-library option should be disabled + * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect *******************************************************************************/ package org.eclipse.jst.ws.jaxrs.core.internal.project.facet; @@ -67,6 +68,7 @@ public class JAXRSFacetInstallDataModelProvider extends names.add(CONFIGURATION_PRESET); names.add(SERVER_IRUNTIME); names.add(EARPROJECTS); + names.add(UPDATEDD); return names; } @@ -105,6 +107,8 @@ public class JAXRSFacetInstallDataModelProvider extends return false; } else if (propertyName.equals(DEPLOY_IMPLEMENTATION)) { return true; + } else if (propertyName.equals(UPDATEDD)) { + return true; } return super.getDefaultProperty(propertyName); } diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java index 0c9e358b1..18f7e699c 100644 --- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java +++ b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java @@ -14,6 +14,7 @@ * 20100303 291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet * 20100310 304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1 * 20100319 306595 ericdp@ca.ibm.com - Eric D. Peters, several install scenarios fail for both user library & non-user library + * 20100413 307552 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS and Java EE 6 setup is incorrect *******************************************************************************/ package org.eclipse.jst.ws.jaxrs.core.internal.project.facet; @@ -143,9 +144,9 @@ public final class JAXRSFacetInstallDelegate implements IDelegate { createSharedLibraries(project, fv, monitor, config); } - // Update web model - createServletAndModifyWebXML(project, config, monitor); - + // Update web model if necessary + if (config.getBooleanProperty(IJAXRSFacetInstallDataModelProperties.UPDATEDD)) + createServletAndModifyWebXML(project, config, monitor); if (monitor != null) { monitor.worked(1); } diff --git a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java index 01506f9c9..d7bf16a1f 100644 --- a/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java +++ b/bundles/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSUtils.java @@ -33,7 +33,7 @@ public abstract class JAXRSUtils { /** * The default name of the JAX-RS servlet class */ - public static final String JAXRS_SERVLET_CLASS = "com.mycompany.web.rest.RestServlet"; //$NON-NLS-1$ + public static final String JAXRS_SERVLET_CLASS = ""; //$NON-NLS-1$ /** * Default URL mapping to jaxrs servlet |