Author: snjeza Date: 2010-05-27 14:31:53 -0400 (Thu, 27 May 2010) New Revision: 22387 Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java =================================================================== --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2010-05-27 18:21:19 UTC (rev 22386) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2010-05-27 18:31:53 UTC (rev 22387) @@ -117,7 +117,7 @@ public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities) { boolean oldValue = this.addRichfacesCapabilities; this.addRichfacesCapabilities = addRichfacesCapabilities; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, addRichfacesCapabilities); + notifyListeners(IPortletConstants.RICHFACES_CAPABILITIES, oldValue, addRichfacesCapabilities); updatePreferences(); } public String getRichfacesType() { @@ -126,7 +126,7 @@ public void setRichfacesType(String richfacesType) { String oldValue = this.richfacesType; this.richfacesType = richfacesType; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richfacesType); + notifyListeners(IPortletConstants.RICHFACES_LIBRARIES_TYPE, oldValue, richfacesType); updatePreferences(); } public String getRichfacesRuntime() { @@ -135,7 +135,7 @@ public void setRichfacesRuntime(String richfacesRuntime) { String oldValue = this.richfacesRuntime; this.richfacesRuntime = richfacesRuntime; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richfacesRuntime); + notifyListeners(IPortletConstants.RICHFACES_RUNTIME, oldValue, richfacesRuntime); updatePreferences(); } } Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java =================================================================== --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-27 18:21:19 UTC (rev 22386) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-27 18:31:53 UTC (rev 22387) @@ -92,6 +92,7 @@ addRichFacesLibraries.setSelection(richFacesLibrariesSelected); enableRichfacesLibraries(); richFacesLibraryCombo.select(0); + config.setRichfacesType(richFacesLibraryCombo.getText()); } private void configureRichfacesCombo() { Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java =================================================================== --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java 2010-05-27 18:21:19 UTC (rev 22386) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java 2010-05-27 18:31:53 UTC (rev 22387) @@ -35,7 +35,7 @@ @Override protected List<String> getRichfacesTypes() { List<String> types = new ArrayList<String>(); - types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); + //types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_RICHFACES); return types; }