[jbosstools-commits] JBoss Tools SVN: r13300 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal and 1 other directory.

Author: snjeza Date: 2009-01-27 19:27:44 -0500 (Tue, 27 Jan 2009) New Revision: 13300 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java Log: JBIDE-3660 Portlet facet doesn't recognize JBoss Portal server within EPP distribution Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2009-01-28 00:17:44 UTC (rev 13299) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2009-01-28 00:27:44 UTC (rev 13300) @@ -72,6 +72,8 @@ static final String USER_LIBRARY_NAME = "userLibraryName"; //$NON-NLS-1$ static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR = "deploy/jboss-portal.sar"; //$NON-NLS-1$ + + static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR = "deploy/jboss-portal-ha.sar"; //$NON-NLS-1$ static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL = "deploy/simple-portal"; //$NON-NLS-1$ Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2009-01-28 00:17:44 UTC (rev 13299) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2009-01-28 00:27:44 UTC (rev 13300) @@ -54,10 +54,16 @@ IPath jbossLocation = runtime.getLocation(); IPath configPath = jbossLocation.append(IJBossServerConstants.SERVER).append(jbossRuntime.getJBossConfiguration()); File configFile = configPath.toFile(); + // JBoss Portal server if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR)) { return true; } + // JBoss Portal clustering server + if (exists(configFile, + IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR)) { + return true; + } // JBoss portletcontainer if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL)) {