diff --git a/j2ee.dd/build.xml b/j2ee.dd/build.xml
--- a/j2ee.dd/build.xml
+++ b/j2ee.dd/build.xml
@@ -148,6 +148,11 @@
java5="true"/>
@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_1_frag;
+
+ org.netbeans.modules.j2ee.dd.api.web.ServletMapping25
+ org.netbeans.modules.j2ee.dd.api.web.ServletMapping
+
+
public java.lang.String[] getUrlPattern() {
public java.lang.String[] getUrlPatterns() {
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java
@@ -58,13 +58,15 @@
* @return property value
*/
public java.lang.String getServletName();
- /** Getter for url-pattern property.
+ /** Getter for url-pattern property. Use ServletMapping25.setUrlPattern(int, String) instead.
* @return property value
*/
+ @Deprecated
public void setUrlPattern(java.lang.String value);
- /** Getter for url-patern property.
+ /** Getter for url-patern property. Use ServletMapping25.getUrlPattern(int) instead.
* @return property value
*/
+ @Deprecated
public java.lang.String getUrlPattern();
}
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_4.mdd b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_4.mdd
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_4.mdd
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_4.mdd
@@ -167,10 +167,40 @@
http://java.sun.com/xml/ns/j2ee
ServletMapping
- org.netbeans.modules.j2ee.dd.api.web.ServletMapping, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ org.netbeans.modules.j2ee.dd.api.web.ServletMapping25, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
public String getKeyProperty() { return "UrlPattern"; }
+
+ public void setUrlPattern(int index, String value) {
+ setUrlPattern(value);
+ }
+
+ public String getUrlPattern(int index) {
+ return getUrlPattern();
+ }
+
+ public void setUrlPatterns(String[] value) {
+ setUrlPattern(value[0]);
+ }
+
+ public String[] getUrlPatterns() {
+ return new String[]{getUrlPattern()};
+ }
+
+ public int sizeUrlPattern() {
+ return 1;
+ }
+
+ public int addUrlPattern(String value) {
+ setUrlPattern(value);
+ return 0;
+ }
+
+ public int removeUrlPattern(String value) {
+ return -1;
+ }
+
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_5.mdd b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_5.mdd
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_5.mdd
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_2_5.mdd
@@ -175,12 +175,10 @@
public String getKeyProperty() { return "UrlPattern"; }
public void setUrlPattern(String value) {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.setUrlPattern() is only fallback, use ServletMapping25.setUrlPatterns() instead!");
setUrlPatterns(new String[] {value});
}
public String getUrlPattern() {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.getUrlPattern() is only fallback, use ServletMapping25.getUrlPatterns() instead!");
String[] urlPatterns = getUrlPatterns();
if (urlPatterns != null && urlPatterns.length > 0) {
return urlPatterns[0];
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.mdd b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.mdd
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.mdd
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.mdd
@@ -166,12 +166,10 @@
public String getKeyProperty() { return "UrlPattern"; }
public void setUrlPattern(String value) {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.setUrlPattern() is only fallback, use ServletMapping25.setUrlPatterns() instead!");
setUrlPatterns(new String[] {value});
}
public String getUrlPattern() {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.getUrlPattern() is only fallback, use ServletMapping25.getUrlPatterns() instead!");
String[] urlPatterns = getUrlPatterns();
if (urlPatterns != null && urlPatterns.length > 0) {
return urlPatterns[0];
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd
@@ -166,12 +166,10 @@
public String getKeyProperty() { return "UrlPattern"; }
public void setUrlPattern(String value) {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.setUrlPattern() is only fallback, use ServletMapping25.setUrlPatterns() instead!");
setUrlPatterns(new String[] {value});
}
public String getUrlPattern() {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.getUrlPattern() is only fallback, use ServletMapping25.getUrlPatterns() instead!");
String[] urlPatterns = getUrlPatterns();
if (urlPatterns != null && urlPatterns.length > 0) {
return urlPatterns[0];
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.mdd b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.mdd
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.mdd
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.mdd
@@ -197,12 +197,10 @@
public String getKeyProperty() { return "UrlPattern"; }
public void setUrlPattern(String value) {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.setUrlPattern() is only fallback, use ServletMapping25.setUrlPatterns() instead!");
setUrlPatterns(new String[] {value});
}
public String getUrlPattern() {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.getUrlPattern() is only fallback, use ServletMapping25.getUrlPatterns() instead!");
String[] urlPatterns = getUrlPatterns();
if (urlPatterns != null && urlPatterns.length > 0) {
return urlPatterns[0];
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd
@@ -197,12 +197,10 @@
public String getKeyProperty() { return "UrlPattern"; }
public void setUrlPattern(String value) {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.setUrlPattern() is only fallback, use ServletMapping25.setUrlPatterns() instead!");
setUrlPatterns(new String[] {value});
}
public String getUrlPattern() {
- java.util.logging.Logger.getLogger(getClass().getName()).warning("ServletMapping25.getUrlPattern() is only fallback, use ServletMapping25.getUrlPatterns() instead!");
String[] urlPatterns = getUrlPatterns();
if (urlPatterns != null && urlPatterns.length > 0) {
return urlPatterns[0];
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java
--- a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java
+++ b/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java
@@ -43,6 +43,7 @@
package org.netbeans.modules.j2ee.dd.impl.web.metadata;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef;
import org.netbeans.modules.j2ee.dd.api.common.EjbRef;
@@ -57,6 +58,7 @@
import org.netbeans.modules.j2ee.dd.api.web.FilterMapping;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.dd.api.web.WebFragment;
import org.netbeans.modules.j2ee.dd.api.web.model.FilterInfo;
@@ -167,8 +169,8 @@
List mpgs = new ArrayList();
if (mappings != null) {
for (ServletMapping sm : mappings) {
- if (sm.getServletName().equals(servletName) && sm.getUrlPattern() != null)
- mpgs.add(sm.getUrlPattern());
+ if (sm.getServletName().equals(servletName))
+ mpgs.addAll(Arrays.asList(((ServletMapping25)sm).getUrlPatterns()));
}
}
return mpgs;
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java b/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java
--- a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java
+++ b/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java
@@ -61,7 +61,7 @@
private static final String SERVLET_NAME = "FordServlet";
private static final String SERVLET_CLASS = "org.package.mypackage.CarServlet";
private static final String SERVLET_NAME1 = "VolvoServlet";
- private static final String URL_PATTERN = "/ford";
+ private static final String[] URL_PATTERN = new String[]{"/ford"};
private static final String URL_PATTERN1 = "/volvo";
private static final java.math.BigInteger LOAD_ON_STARTUP = java.math.BigInteger.valueOf(10);
private static final java.math.BigInteger LOAD_ON_STARTUP1 = java.math.BigInteger.valueOf(25);
@@ -117,9 +117,9 @@
servlet.setServletClass(SERVLET_CLASS);
servlet.setLoadOnStartup(LOAD_ON_STARTUP);
webApp.addServlet(servlet);
- ServletMapping mapping = (ServletMapping) webApp.createBean("ServletMapping");
+ ServletMapping25 mapping = (ServletMapping25) webApp.createBean("ServletMapping");
mapping.setServletName(SERVLET_NAME);
- mapping.setUrlPattern(URL_PATTERN);
+ mapping.setUrlPatterns(URL_PATTERN);
webApp.addServletMapping(mapping);
webApp.write(fo);
} catch (ClassNotFoundException ex) {
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
--- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
+++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
@@ -351,9 +351,9 @@
newSrvlt.setDisplayName ("Servlet "+clazz); // NOI18N
wappTo.addServlet (newSrvlt);
- ServletMapping newSM = (ServletMapping)webApp.createBean("ServletMapping");
+ ServletMapping25 newSM = (ServletMapping25)webApp.createBean("ServletMapping");
newSM.setServletName (name);
- newSM.setUrlPattern (urlPattern);
+ newSM.setUrlPatterns(new String[]{urlPattern});
wappTo.addServletMapping (newSM);
} catch (ClassNotFoundException ex) {
Logger.getLogger("DDDataObject").log(Level.FINE, "ignored exception", ex);
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java
--- a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java
+++ b/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java
@@ -82,7 +82,7 @@
List maps = new LinkedList();
for (ServletMapping sm : mapping) {
if (servlet.getServletName().equals(sm.getServletName())) {
- maps.addAll(getUrlPatterns(sm));
+ maps.addAll(getUrlPatterns((ServletMapping25)sm));
}
}
String[] urlPatterns = new String[maps.size()];
@@ -124,7 +124,7 @@
public static boolean isServletMapping(WebApp webApp, String urlPattern) {
if (isWebApp25(webApp)) {
for (ServletMapping mapping : webApp.getServletMapping()) {
- if (getUrlPatterns(mapping).contains(urlPattern)) {
+ if (getUrlPatterns((ServletMapping25)mapping).contains(urlPattern)) {
return true;
}
}
@@ -138,7 +138,7 @@
String servletName = servlet.getServletName();
if (servletName != null) {
for (ServletMapping sm : maps) {
- if (!servletName.equals(sm.getServletName()) && getUrlPatterns(sm).contains(urlPattern)) {
+ if (!servletName.equals(sm.getServletName()) && getUrlPatterns((ServletMapping25)sm).contains(urlPattern)) {
return true;
}
}
@@ -161,63 +161,15 @@
public static void addServletMappings(WebApp webApp, Servlet servlet, String[] urlPatterns) {
String servletName = servlet.getServletName();
try {
- if (isWebApp25(webApp)) {
ServletMapping25 mapping = (ServletMapping25) webApp.createBean("ServletMapping"); // NOI18
mapping.setServletName(servletName);
mapping.setUrlPatterns(urlPatterns);
webApp.addServletMapping(mapping);
- } else {
- for (int i=0;i getUrlPatterns(ServletMapping sm) {
+ private static List getUrlPatterns(ServletMapping25 sm) {
assert sm != null;
List urlPatterns = new LinkedList();
- if (sm instanceof ServletMapping25) {
- String[] patterns = ((ServletMapping25) sm).getUrlPatterns();
+ String[] patterns = sm.getUrlPatterns();
if (patterns != null) {
for (String p : patterns) {
if (p != null) {
@@ -530,12 +481,6 @@
}
}
}
- } else {
- String urlPattern = sm.getUrlPattern();
- if (urlPattern != null) {
- urlPatterns.add(urlPattern);
- }
- }
return urlPatterns;
}
diff --git a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenProjectRestSupport.java b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenProjectRestSupport.java
--- a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenProjectRestSupport.java
+++ b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenProjectRestSupport.java
@@ -62,6 +62,7 @@
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.maven.api.NbMavenProject;
import org.netbeans.modules.maven.api.execute.RunConfig;
@@ -121,7 +122,7 @@
servletNames.append(i>0 ? ",":"");
servletNames.append(mapping.getServletName());
urlPatterns.append(i>0 ? ",":"");
- urlPatterns.append(mapping.getUrlPattern());
+ urlPatterns.append(((ServletMapping25)mapping).getUrlPatterns()[0]);
i++;
}
// http://localhost:8084/mavenprojectWeb3/||ServletAdaptor||resources/*
diff --git a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java
--- a/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java
+++ b/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java
@@ -75,6 +75,7 @@
import org.netbeans.modules.j2ee.dd.api.web.Listener;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
@@ -841,7 +842,7 @@
for (ServletMapping servletMapping : webApp.getServletMapping()) {
if (servletName != null && servletName.equals(servletMapping.getServletName())) {
String endpoindPattern = cutEndingWildcard(endpoint.getUrlPattern());
- String servletMappingPattern = cutEndingWildcard(servletMapping.getUrlPattern());
+ String servletMappingPattern = cutEndingWildcard(((ServletMapping25)servletMapping).getUrlPatterns()[0]);
if (endpoindPattern.startsWith(servletMappingPattern)) {
return true;
}
@@ -991,10 +992,10 @@
//remove the servlet mapping
ServletMapping[] mappings = webApp.getServletMapping();
for(int i = 0; i < mappings.length; i++){
- ServletMapping mapping = mappings[i];
+ ServletMapping25 mapping = (ServletMapping25)mappings[i];
if(mapping.getServletName().equals(oldServiceName)){
mapping.setServletName(newServiceName);
- mapping.setUrlPattern("/"+newServiceName);
+ mapping.setUrlPatterns(new String[]{"/"+newServiceName});
break;
}
}
diff --git a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/util/Util.java b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/util/Util.java
--- a/mobility.end2end/src/org/netbeans/modules/mobility/end2end/util/Util.java
+++ b/mobility.end2end/src/org/netbeans/modules/mobility/end2end/util/Util.java
@@ -69,6 +69,7 @@
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
@@ -238,9 +239,9 @@
newServlet.setDisplayName("Javon service for " + servletClassFQN); // NOI18N
webApp.addServlet(newServlet);
- final ServletMapping newServletMapping = (ServletMapping) webApp.createBean("ServletMapping"); // NOI18N
+ final ServletMapping25 newServletMapping = (ServletMapping25) webApp.createBean("ServletMapping"); // NOI18N
newServletMapping.setServletName(servletName);
- newServletMapping.setUrlPattern("/servlet/" + servletClassFQN); // NOI18N
+ newServletMapping.addUrlPattern("/servlet/" + servletClassFQN); // NOI18N
webApp.addServletMapping(newServletMapping);
webApp.write(ddFO);
diff --git a/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java b/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java
--- a/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java
+++ b/spring.webmvc/src/org/netbeans/modules/spring/webmvc/SpringWebModuleExtender.java
@@ -75,6 +75,7 @@
import org.netbeans.modules.j2ee.dd.api.web.Listener;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.dd.api.web.WelcomeFileList;
import org.netbeans.modules.spring.api.SpringUtilities;
@@ -466,9 +467,9 @@
}
protected ServletMapping addServletMapping(WebApp webApp, String name, String pattern) throws IOException {
- ServletMapping mapping = (ServletMapping) createBean(webApp, "ServletMapping"); // NOI18N
+ ServletMapping25 mapping = (ServletMapping25) createBean(webApp, "ServletMapping"); // NOI18N
mapping.setServletName(name);
- mapping.setUrlPattern(pattern);
+ mapping.addUrlPattern(pattern);
webApp.addServletMapping(mapping);
return mapping;
}
diff --git a/web.core/src/org/netbeans/modules/web/wizards/ServletData.java b/web.core/src/org/netbeans/modules/web/wizards/ServletData.java
--- a/web.core/src/org/netbeans/modules/web/wizards/ServletData.java
+++ b/web.core/src/org/netbeans/modules/web/wizards/ServletData.java
@@ -45,7 +45,7 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -61,6 +61,7 @@
import org.netbeans.modules.j2ee.dd.api.web.FilterMapping;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
// PENDING - it would be better to have a FilterData which extends
@@ -151,7 +152,7 @@
ServletMapping[] maps = webApp.getServletMapping();
List l = new ArrayList();
for (int i = 0; i < maps.length; i++) {
- l.add(maps[i].getUrlPattern());
+ l.addAll(Arrays.asList(((ServletMapping25)maps[i]).getUrlPatterns()));
}
return l;
}
@@ -557,20 +558,17 @@
if (webApp == null) {
return;
}
- int numMappings = getUrlMappings().length;
- for (int i = 0; i < numMappings; ++i) {
- ServletMapping m;
+ ServletMapping25 m;
try {
- m = (ServletMapping) webApp.createBean("ServletMapping"); //NOI18N
+ m = (ServletMapping25) webApp.createBean("ServletMapping"); //NOI18N
} catch (ClassNotFoundException cnfe) {
LOG.log(Level.FINE, "error", cnfe);
return;
}
m.setServletName(name);
- m.setUrlPattern(urlMappings[i]);
+ m.setUrlPatterns(urlMappings);
webApp.addServletMapping(m);
}
- }
private void addFilterMappings() {
if (webApp == null) {
diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java b/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java
--- a/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java
+++ b/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java
@@ -482,10 +482,10 @@
servlet.setLoadOnStartup(new BigInteger("1"));//NOI18N
ddRoot.addServlet(servlet);
- ServletMapping mapping = (ServletMapping)ddRoot.createBean("ServletMapping"); //NOI18N
+ ServletMapping25 mapping = (ServletMapping25)ddRoot.createBean("ServletMapping"); //NOI18N
mapping.setServletName(servletName);//NOI18N
// facesMapping = panel == null ? "faces/*" : panel.getURLPattern();
- mapping.setUrlPattern(facesMapping); //NOI18N
+ mapping.setUrlPatterns(new String[]{facesMapping});
ddRoot.addServletMapping(mapping);
}
}
diff --git a/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java b/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
--- a/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
+++ b/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java
@@ -46,25 +46,20 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.WeakHashMap;
import java.util.Map;
import java.lang.ref.WeakReference;
-import org.netbeans.api.project.FileOwnerQuery;
-import org.netbeans.api.project.Project;
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.web.api.webmodule.WebModule;
import org.netbeans.modules.web.jsf.JSFConfigUtilities;
-import org.netbeans.modules.web.jsf.JSFUtils;
-import org.netbeans.modules.web.jsf.api.editor.JSFBeanCache;
import org.netbeans.modules.web.jsf.api.facesmodel.FacesConfig;
import org.netbeans.modules.web.jsf.api.facesmodel.JSFConfigModel;
import org.netbeans.modules.web.jsf.api.facesmodel.JSFConfigModelFactory;
import org.netbeans.modules.web.jsf.api.facesmodel.ManagedBean;
-import org.netbeans.modules.web.jsf.api.metamodel.FacesManagedBean;
import org.netbeans.modules.xml.retriever.catalog.Utilities;
import org.netbeans.modules.xml.xam.ModelSource;
import org.netbeans.modules.xml.xam.locator.CatalogModelException;
@@ -154,7 +149,7 @@
ServletMapping[] mappings = webApp.getServletMapping();
for (int i = 0; i < mappings.length; i++){
if (mappings[i].getServletName().equals(servlet.getServletName()))
- return mappings[i].getUrlPattern();
+ return ((ServletMapping25)mappings[i]).getUrlPatterns()[0];
}
} catch (java.io.IOException e) {
Exceptions.printStackTrace(e);
diff --git a/web.struts/src/org/netbeans/modules/web/struts/StrutsConfigUtilities.java b/web.struts/src/org/netbeans/modules/web/struts/StrutsConfigUtilities.java
--- a/web.struts/src/org/netbeans/modules/web/struts/StrutsConfigUtilities.java
+++ b/web.struts/src/org/netbeans/modules/web/struts/StrutsConfigUtilities.java
@@ -67,6 +67,7 @@
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.web.api.webmodule.WebModule;
import org.netbeans.modules.web.api.webmodule.WebProjectConstants;
import org.netbeans.modules.web.struts.config.model.Action;
@@ -79,7 +80,6 @@
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
-import org.openide.util.Exceptions;
/**
*
@@ -313,7 +313,7 @@
ServletMapping[] mappings = webApp.getServletMapping();
for (int i = 0; i < mappings.length; i++){
if (mappings[i].getServletName().equals(servlet.getServletName()))
- return mappings[i].getUrlPattern();
+ return ((ServletMapping25)mappings[i]).getUrlPatterns()[0];
}
} catch (java.io.IOException e) {
Logger.getLogger("global").log(Level.INFO, null, e);
diff --git a/web.struts/src/org/netbeans/modules/web/struts/StrutsFrameworkProvider.java b/web.struts/src/org/netbeans/modules/web/struts/StrutsFrameworkProvider.java
--- a/web.struts/src/org/netbeans/modules/web/struts/StrutsFrameworkProvider.java
+++ b/web.struts/src/org/netbeans/modules/web/struts/StrutsFrameworkProvider.java
@@ -47,22 +47,18 @@
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.SwingUtilities;
-import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.project.JavaProjectConstants;
-import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.modules.j2ee.dd.api.common.CreateCapability;
@@ -71,7 +67,6 @@
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
import org.netbeans.modules.j2ee.dd.api.web.JspConfig;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
-import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
import org.netbeans.modules.j2ee.dd.api.web.Taglib;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.web.api.webmodule.ExtenderController;
@@ -85,10 +80,9 @@
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
-import org.netbeans.api.project.libraries.Library;
-import org.netbeans.api.project.libraries.LibraryManager;
import org.netbeans.api.queries.FileEncodingQuery;
import org.netbeans.modules.j2ee.common.dd.DDHelper;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WelcomeFileList;
import org.netbeans.modules.web.spi.webmodule.WebFrameworkProvider;
@@ -344,9 +338,9 @@
servlet.addInitParam(param);
servlet.setLoadOnStartup(new BigInteger("2"));//NOI18N
- ServletMapping mapping = (ServletMapping)ddRoot.createBean("ServletMapping"); //NOI18N
+ ServletMapping25 mapping = (ServletMapping25)ddRoot.createBean("ServletMapping"); //NOI18N
mapping.setServletName(panel.getServletName());//NOI18N
- mapping.setUrlPattern(panel.getURLPattern());//NOI18N
+ mapping.addUrlPattern(panel.getURLPattern());//NOI18N
ddRoot.addServletMapping(mapping);
diff --git a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java
--- a/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java
+++ b/websvc.core/src/org/netbeans/modules/websvc/core/jaxws/nodes/JaxWsNode.java
@@ -65,7 +65,6 @@
import java.util.logging.Logger;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
-import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.swing.Action;
@@ -82,6 +81,7 @@
import org.netbeans.modules.j2ee.dd.api.web.DDProvider;
import org.netbeans.modules.j2ee.dd.api.web.Servlet;
import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
@@ -618,7 +618,7 @@
if (servletName != null) {
for (ServletMapping servletMapping : webApp.getServletMapping()) {
if (servletName.equals(servletMapping.getServletName())) {
- String urlPattern = servletMapping.getUrlPattern();
+ String urlPattern = ((ServletMapping25)servletMapping).getUrlPatterns()[0];
return urlPattern.startsWith("/") ? urlPattern.substring(1) : urlPattern; //NOI18N
}
}
diff --git a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/nodes/WebServiceNode.java b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/nodes/WebServiceNode.java
--- a/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/nodes/WebServiceNode.java
+++ b/websvc.jaxrpc/src/org/netbeans/modules/websvc/jaxrpc/nodes/WebServiceNode.java
@@ -107,6 +107,7 @@
import org.apache.tools.ant.module.api.support.ActionUtils;
import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
+import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
import org.netbeans.modules.websvc.core.WebServiceReference;
import org.netbeans.modules.websvc.core.WebServiceTransferable;
import org.netbeans.modules.websvc.core.WsWsdlCookie;
@@ -405,7 +406,7 @@
String servletName = WebServicesConstants.WebServiceServlet_PREFIX+wsName;
for (int i=0;i0) {
- ((ServletMapping25)sm).setUrlPattern(0, resourcesUrl);
+ sm.setUrlPattern(0, resourcesUrl);
} else {
- ((ServletMapping25)sm).addUrlPattern(resourcesUrl);
- }
- } else {
- sm.setUrlPattern(resourcesUrl);
+ sm.addUrlPattern(resourcesUrl);
}
updated = true;
}
@@ -378,7 +363,7 @@
return webApp;
}
- public static ServletMapping getRestServletMapping(WebApp webApp) {
+ public static ServletMapping25 getRestServletMapping(WebApp webApp) {
if (webApp == null) {
return null;
}
@@ -394,7 +379,7 @@
if (servletName != null) {
for (ServletMapping sm : webApp.getServletMapping()) {
if (servletName.equals(sm.getServletName())) {
- return sm;
+ return (ServletMapping25)sm;
}
}
}
diff --git a/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/MiscUtilities.java b/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/MiscUtilities.java
--- a/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/MiscUtilities.java
+++ b/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/MiscUtilities.java
@@ -93,7 +93,6 @@
import org.netbeans.modules.websvc.rest.MiscPrivateUtilities;
import org.netbeans.modules.websvc.rest.WebXmlUpdater;
import static org.netbeans.modules.websvc.rest.WebXmlUpdater.getRestServletAdaptorByName;
-import static org.netbeans.modules.websvc.rest.WebXmlUpdater.getRestServletMapping;
import org.netbeans.modules.websvc.rest.model.api.RestConstants;
import static org.netbeans.modules.websvc.rest.spi.RestSupport.REST_SERVLET_ADAPTOR;
import org.openide.DialogDisplayer;
@@ -357,23 +356,19 @@
}
- public static ServletMapping getRestServletMapping(WebApp webApp) {
+ public static ServletMapping25 getRestServletMapping(WebApp webApp) {
return WebXmlUpdater.getRestServletMapping(webApp);
}
public static String getApplicationPathFromDD(WebApp webApp) {
if (webApp != null) {
- ServletMapping sm = getRestServletMapping(webApp);
+ ServletMapping25 sm = getRestServletMapping(webApp);
if (sm != null) {
String urlPattern = null;
- if (sm instanceof ServletMapping25) {
- String[] urlPatterns = ((ServletMapping25)sm).getUrlPatterns();
+ String[] urlPatterns = sm.getUrlPatterns();
if (urlPatterns.length > 0) {
urlPattern = urlPatterns[0];
}
- } else {
- urlPattern = sm.getUrlPattern();
- }
if (urlPattern != null) {
if (urlPattern.endsWith("*")) { //NOI18N
urlPattern = urlPattern.substring(0, urlPattern.length()-1);