Author: snjeza
Date: 2010-07-28 09:51:18 -0400 (Wed, 28 Jul 2010)
New Revision: 23779
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
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java
Log:
https://jira.jboss.org/browse/JBIDE-6719 Make portal facets show up by default,
disregarding runtime
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 2010-07-28
13:32:10 UTC (rev 23778)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2010-07-28
13:51:18 UTC (rev 23779)
@@ -75,6 +75,8 @@
static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL =
"deploy/simple-portal"; //$NON-NLS-1$
+ static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL_SAR =
"deploy/simple-portal.sar"; //$NON-NLS-1$
+
static final String SERVER_DEFAULT_DEPLOY_GATEIN = "deploy/gatein.ear";
//$NON-NLS-1$
static final String TOMCAT_LIB = "lib"; //$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 2010-07-28
13:32:10 UTC (rev 23778)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2010-07-28
13:51:18 UTC (rev 23779)
@@ -75,8 +75,8 @@
return true;
}
// JBoss portletcontainer
- if (exists(configFile,
- IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL)) {
+ if (exists(configFile,IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL) ||
+ exists(configFile,IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL_SAR)) {
return true;
}
// GateIn Portal Server
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java
===================================================================
---
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2010-07-28
13:32:10 UTC (rev 23778)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2010-07-28
13:51:18 UTC (rev 23779)
@@ -149,6 +149,10 @@
} else {
libDirectory = getDirectory(location,
IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL);
+ if (libDirectory == null) {
+ libDirectory = getDirectory(location,
+ IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL_SAR);
+ }
if (libDirectory != null) {
libDirectory = new File(libDirectory, "lib"); //$NON-NLS-1$
} else {