Attachment #137827 for bug #233401

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 233401
Collapse All | Expand All

Lines 75-81 Link Here

(-)a/extbrowser/src/org/netbeans/modules/extbrowser/ChromeBrowser.java (-1 / +1 lines)
75	detectedPath = NbDdeBrowserImpl.getBrowserPath("chrome"); // NOI18N	75	detectedPath = NbDdeBrowserImpl.getBrowserPath("chrome"); // NOI18N
76	}	76	}
77	} catch (NbBrowserException e) {	77	} catch (NbBrowserException e) {
78	ExtWebBrowser.getEM().log(Level.INFO, "Cannot detect chrome : " + e); // NOI18N	78	ExtWebBrowser.getEM().log(Level.FINEST, "Cannot detect chrome : " + e); // NOI18N
79	}	79	}
80	if ((detectedPath != null) && (detectedPath.trim().length() > 0)) {	80	if ((detectedPath != null) && (detectedPath.trim().length() > 0)) {
81	return Boolean.FALSE;	81	return Boolean.FALSE;

Lines 77-83 Link Here

(-)a/extbrowser/src/org/netbeans/modules/extbrowser/FirefoxBrowser.java (-1 / +1 lines)
77	try {	77	try {
78	detectedPath = NbDdeBrowserImpl.getBrowserPath(ExtWebBrowser.FIREFOX); // NOI18N	78	detectedPath = NbDdeBrowserImpl.getBrowserPath(ExtWebBrowser.FIREFOX); // NOI18N
79	} catch (NbBrowserException e) {	79	} catch (NbBrowserException e) {
80	ExtWebBrowser.getEM().log(Level.INFO, "Cannot detect Firefox : " + e); // NOI18N	80	ExtWebBrowser.getEM().log(Level.FINEST, "Cannot detect Firefox : " + e); // NOI18N
81	}	81	}
82	if ((detectedPath != null) && (detectedPath.trim().length() > 0)) {	82	if ((detectedPath != null) && (detectedPath.trim().length() > 0)) {
83	return Boolean.FALSE;	83	return Boolean.FALSE;

Lines 77-83 Link Here

(-)a/extbrowser/src/org/netbeans/modules/extbrowser/MozillaBrowser.java (-1 / +1 lines)
77	try {	77	try {
78	detectedPath = NbDdeBrowserImpl.getBrowserPath("MOZILLA"); // NOI18N	78	detectedPath = NbDdeBrowserImpl.getBrowserPath("MOZILLA"); // NOI18N
79	} catch (NbBrowserException e) {	79	} catch (NbBrowserException e) {
80	ExtWebBrowser.getEM().log(Level.INFO, "Cannot detect Mozilla : " + e); // NOI18N	80	ExtWebBrowser.getEM().log(Level.FINEST, "Cannot detect Mozilla : " + e); // NOI18N
81	}	81	}
82	if ((detectedPath != null) && (detectedPath.trim().length() > 0)) {	82	if ((detectedPath != null) && (detectedPath.trim().length() > 0)) {
83	return Boolean.FALSE;	83	return Boolean.FALSE;

Lines 353-359 Link Here

(-)a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java (-1 / +5 lines)
353		353
354	ServletMapping newSM = (ServletMapping)webApp.createBean("ServletMapping");	354	ServletMapping newSM = (ServletMapping)webApp.createBean("ServletMapping");
355	newSM.setServletName (name);	355	newSM.setServletName (name);
356	newSM.setUrlPattern (urlPattern);	356	if (newSM instanceof ServletMapping25) {
		357	((ServletMapping25)newSM).setUrlPatterns(new String[]{urlPattern});
		358	} else {
		359	newSM.setUrlPattern(urlPattern);
		360	}
357	wappTo.addServletMapping (newSM);	361	wappTo.addServletMapping (newSM);
358	} catch (ClassNotFoundException ex) {	362	} catch (ClassNotFoundException ex) {
359	Logger.getLogger("DDDataObject").log(Level.FINE, "ignored exception", ex);	363	Logger.getLogger("DDDataObject").log(Level.FINE, "ignored exception", ex);

Lines 61-66 Link Here

(-)a/web.core/src/org/netbeans/modules/web/wizards/ServletData.java (+5 lines)
61	import org.netbeans.modules.j2ee.dd.api.web.FilterMapping;	61	import org.netbeans.modules.j2ee.dd.api.web.FilterMapping;
62	import org.netbeans.modules.j2ee.dd.api.web.Servlet;	62	import org.netbeans.modules.j2ee.dd.api.web.Servlet;
63	import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;	63	import org.netbeans.modules.j2ee.dd.api.web.ServletMapping;
		64	import org.netbeans.modules.j2ee.dd.api.web.ServletMapping25;
64	import org.netbeans.modules.j2ee.dd.api.web.WebApp;	65	import org.netbeans.modules.j2ee.dd.api.web.WebApp;
65		66
66	// PENDING - it would be better to have a FilterData which extends	67	// PENDING - it would be better to have a FilterData which extends
Lines 567-572 Link Here
567	return;	568	return;
568	}	569	}
569	m.setServletName(name);	570	m.setServletName(name);
		571	if (m instanceof ServletMapping25) {
		572	((ServletMapping25)m).setUrlPatterns(urlMappings);
		573	break;
		574	}
570	m.setUrlPattern(urlMappings[i]);	575	m.setUrlPattern(urlMappings[i]);
571	webApp.addServletMapping(m);	576	webApp.addServletMapping(m);
572	}	577	}

Lines 484-490 Link Here

(-)a/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java (+4 lines)
484	ServletMapping mapping = (ServletMapping)ddRoot.createBean("ServletMapping"); //NOI18N	484	ServletMapping mapping = (ServletMapping)ddRoot.createBean("ServletMapping"); //NOI18N
485	mapping.setServletName(servletName);//NOI18N	485	mapping.setServletName(servletName);//NOI18N
486	// facesMapping = panel == null ? "faces/*" : panel.getURLPattern();	486	// facesMapping = panel == null ? "faces/*" : panel.getURLPattern();
		487	if (mapping instanceof ServletMapping25) {
		488	((ServletMapping25)mapping).setUrlPatterns(new String[]{facesMapping});
		489	} else {
487	mapping.setUrlPattern(facesMapping); //NOI18N	490	mapping.setUrlPattern(facesMapping); //NOI18N
		491	}
488	ddRoot.addServletMapping(mapping);	492	ddRoot.addServletMapping(mapping);
489	}	493	}
490	}	494	}

Return to bug 233401