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

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-06-27 16:01:21 -0400 (Wed, 27 Jun 2012)
New Revision: 42260

Modified:
   branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java
   branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java
   branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java
Log:
JBIDE-12158 - portlet-api library not found for Gatein 3.3 and JBoss 7

Modified: branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java	2012-06-27 19:53:02 UTC (rev 42259)
+++ branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java	2012-06-27 20:01:21 UTC (rev 42260)
@@ -80,7 +80,11 @@
 	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 SERVER_DEFAULT_DEPLOY_GATEIN33 = "standalone/deployments/gatein.ear"; //$NON-NLS-1$
 
+	static final String GATEIN_MODULES_JAVAX_PORTLET_API_MAIN = "gatein/modules/javax/portlet/api/main"; //$NON-NLS-1$
+	
 	static final String TOMCAT_LIB = "lib"; //$NON-NLS-1$
 
 	static final String JAR = ".jar"; //$NON-NLS-1$

Modified: branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java	2012-06-27 19:53:02 UTC (rev 42259)
+++ branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java	2012-06-27 20:01:21 UTC (rev 42260)
@@ -83,6 +83,10 @@
 			if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN)) {
 				return true;
 			}
+			// GateIn Portal Server 3.3 JBoss AS 7
+			if (exists(jbossLocation.toFile(), IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN33)) {
+				return true;
+			}
 			return false;
 		}
 		// Tomcat portletcontainer

Modified: branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java
===================================================================
--- branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java	2012-06-27 19:53:02 UTC (rev 42259)
+++ branches/jbosstools-3.3.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java	2012-06-27 20:01:21 UTC (rev 42260)
@@ -166,7 +166,10 @@
 							if (libDirectory != null) {
 								libDirectory = new File(libDirectory, "lib"); //$NON-NLS-1$
 							} else {
+								libDirectory = getDirectory(jbossLocation.toFile(), IPortletConstants.GATEIN_MODULES_JAVAX_PORTLET_API_MAIN);
+								if (libDirectory == null) {
 								// Tomcat adds portlet-api.jar automatically
+								}
 							}
 						}
 					}