[jbosstools-commits] JBoss Tools SVN: r22316 - in branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: libprov and 1 other directory.

Author: snjeza Date: 2010-05-25 17:30:24 -0400 (Tue, 25 May 2010) New Revision: 22316 Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.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/internal/project/facet/PortletPostInstallListener.java =================================================================== --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-05-25 21:27:46 UTC (rev 22315) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-05-25 21:30:24 UTC (rev 22316) @@ -414,7 +414,9 @@ IContainer folder = rootFolder.getUnderlyingFolder(); IContainer webinf = folder.getFolder(new Path( IPortletConstants.WEB_INF_LIB)); - deleteOldRichfacesLibs(earProject, webinf); + if (!addRichfacesFromRichfacesRuntime) { + deleteOldRichfacesLibs(earProject, webinf); + } IPath destPath = folder.getFullPath(); ImportOperation op = new ImportOperation( destPath, Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java =================================================================== --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java 2010-05-25 21:27:46 UTC (rev 22315) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java 2010-05-25 21:30:24 UTC (rev 22316) @@ -26,6 +26,12 @@ } IRuntime runtime = FacetUtil.getRuntime(primaryRuntime); if (runtime != null) { + if ("isJSFPortletRuntime".equals(property)) { //$NON-NLS-1$ + String id = runtime.getRuntimeType().getId(); + if (! "org.jboss.ide.eclipse.as.runtime.eap.43".equals(id) && ! "org.jboss.ide.eclipse.as.runtime.42".equals(id)) { //$NON-NLS-1$//$NON-NLS-2$ + return false; + } + } File location = runtime.getLocation().toFile(); return PortletRuntimeComponentProvider.isPortalPresent(location, runtime, property); }