Author: snjeza
Date: 2008-11-27 17:46:03 -0500 (Thu, 27 Nov 2008)
New Revision: 12104
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/project/facet/PortletFacetInstallDataModelProvider.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java
Log:
JBIDE-2792 Add runtime support for portal
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 2008-11-27
22:45:52 UTC (rev 12103)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2008-11-27
22:46:03 UTC (rev 12104)
@@ -63,7 +63,7 @@
static final String USER_LIBRARY = Messages.IPortletConstants_User_library;
- static final String LIBRARY_PROVIDED_BY_JBOSS_TOOLS =
Messages.IPortletConstants_Library_provided_by_JBoss_Tools;
+ //static final String LIBRARY_PROVIDED_BY_JBOSS_TOOLS =
Messages.IPortletConstants_Library_provided_by_JBoss_Tools;
static final String LIBRARIES_PROVIDED_BY_SERVER_RUNTIME =
Messages.IPortletConstants_Libraries_provided_by_server_runtime;
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java
===================================================================
---
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java 2008-11-27
22:45:52 UTC (rev 12103)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDataModelProvider.java 2008-11-27
22:46:03 UTC (rev 12104)
@@ -15,6 +15,7 @@
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
import org.jboss.tools.portlet.core.IPortletConstants;
import org.jboss.tools.portlet.core.Messages;
+import org.jboss.tools.portlet.core.PortletCoreActivator;
/**
* @author snjeza
@@ -38,7 +39,15 @@
return ""; //$NON-NLS-1$
}
if (propertyName.equals(IPortletConstants.IMPLEMENTATION_LIBRARY)) {
- return IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS;
+ boolean checkRuntimes = PortletCoreActivator.getDefault()
+ .getPluginPreferences().getBoolean(
+ PortletCoreActivator.CHECK_RUNTIMES);
+ if (checkRuntimes) {
+ return IPortletConstants.LIBRARIES_PROVIDED_BY_SERVER_RUNTIME;
+ } else {
+ return IPortletConstants.USER_LIBRARY;
+ }
+ //return IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS;
}
return super.getDefaultProperty(propertyName);
}
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java
===================================================================
---
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2008-11-27
22:45:52 UTC (rev 12103)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2008-11-27
22:46:03 UTC (rev 12104)
@@ -102,10 +102,11 @@
copyLibraries(monitor,javaProject,config);
} else {
String implementationLibrary =
config.getStringProperty(IPortletConstants.IMPLEMENTATION_LIBRARY);
- if (IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS.equals(implementationLibrary))
{
+ /*if (IPortletConstants.LIBRARY_PROVIDED_BY_JBOSS_TOOLS.equals(implementationLibrary))
{
IPath containerPath = new Path(IPortletConstants.PORTLET_CONTAINER_20_ID);
setContainerPath(monitor, javaProject, containerPath);
- } else if
(IPortletConstants.LIBRARIES_PROVIDED_BY_SERVER_RUNTIME.equals(implementationLibrary)) {
+ } else*/
+ if
(IPortletConstants.LIBRARIES_PROVIDED_BY_SERVER_RUNTIME.equals(implementationLibrary)) {
IPath containerPath = new Path(IPortletConstants.PORTLET_RUNTIME_CONTAINER_ID);
setContainerPath(monitor, javaProject, containerPath);
} else {
Show replies by date