Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

JBIDE-16056 - JSF Portlet deployment error on JPP 6 #21

Merged
merged 1 commit into from Nov 23, 2013
Merged

JBIDE-16056 - JSF Portlet deployment error on JPP 6 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...s/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java
View file
Open in desktop
Expand Up @@ -346,4 +346,9 @@ public static boolean isWebApp25(final Object webApp) {
return true;
return false;
}

public static void logMessage(String message) {
IStatus status = new Status(IStatus.INFO, PLUGIN_ID, message);
PortletCoreActivator.getDefault().getLog().log(status);
}
}
14 changes: 10 additions & 4 deletions ...c/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.common.util.EList;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
import org.eclipse.jst.j2ee.model.IModelProvider;
Expand All @@ -36,6 +35,7 @@
import org.jboss.tools.portlet.core.JBossWebUtil25;
import org.jboss.tools.portlet.core.Messages;
import org.jboss.tools.portlet.core.PortletCoreActivator;
import org.jboss.tools.portlet.core.internal.util.PortletUtil;

/**
* @author snjeza
Expand Down Expand Up @@ -88,11 +88,12 @@ public void execute(final IProject project, final IProjectFacetVersion fv,
}
}

configureFacesConfig(project, monitor, config);


//Configure libraries
( (LibraryInstallDelegate) config.getProperty( IPortletConstants.JSFPORTLET_LIBRARY_PROVIDER_DELEGATE ) ).execute( monitor );

configureFacesConfig(project, monitor, config, fv);

if (monitor != null) {
monitor.worked(1);
}
Expand All @@ -105,8 +106,13 @@ public void execute(final IProject project, final IProjectFacetVersion fv,
}

private void configureFacesConfig(IProject project,
IProgressMonitor monitor, IDataModel config) {
IProgressMonitor monitor, IDataModel config, IProjectFacetVersion fv) {

int version = PortletUtil.getPortletBridgeVersion(project);
// faces_config.xml mustn't be updated for portletbridge 3.x
if (version >= 3) {
return;
}
String facesConfigString = getFacesConfigFile(project, monitor);
if (facesConfigString == null || facesConfigString.trim().length() <= 0) {
return;
Expand Down