portals-bridges-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r1648569 - in /portals/bridges/bridges-jsf/trunk: pom.xml src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
Date Tue, 30 Dec 2014 18:43:21 GMT
Author: taylor
Date: Tue Dec 30 18:43:21 2014
New Revision: 1648569

URL: http://svn.apache.org/r1648569
Log:
PB-112: bridge is now functional with MyFaces 1.1.5

Modified:
    portals/bridges/bridges-jsf/trunk/pom.xml
    portals/bridges/bridges-jsf/trunk/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java

Modified: portals/bridges/bridges-jsf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-jsf/trunk/pom.xml?rev=1648569&r1=1648568&r2=1648569&view=diff
==============================================================================
--- portals/bridges/bridges-jsf/trunk/pom.xml (original)
+++ portals/bridges/bridges-jsf/trunk/pom.xml Tue Dec 30 18:43:21 2014
@@ -22,48 +22,59 @@ limitations under the License.
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
 
     <artifactId>portals-bridges-jsf</artifactId>
+    <groupId>org.apache.portals.bridges</groupId>
+    <version>1.0.5-SNAPSHOT</version>
     <parent>
-        <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>portals-bridges</artifactId>
-        <version>1.0.4</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>org.apache.portals</groupId>
+        <artifactId>bridges-pom</artifactId>
+        <version>1.1-SNAPSHOT</version>
     </parent>
+
     <packaging>jar</packaging>
     <name>JSF Bridge</name>
     <description>
         Apache Portals JSF Bridge
     </description>
 
+    <properties>
+        <javax.servlet.version>3.0.1</javax.servlet.version>
+
+    </properties>
+
     <!-- Dependencies -->
 
     <dependencies>
         <dependency>
-            <groupId>myfaces</groupId>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-        </dependency>                           
+            <version>1.1.5</version>
+        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
         </dependency>             
        <dependency>
          <groupId>org.apache.portals.bridges</groupId>
          <artifactId>portals-bridges-common</artifactId>
-         <version>${pom.version}</version>
+         <version>2.1-SNAPSHOT</version>
       </dependency>   
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>           
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javax.servlet.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals</groupId>
+            <artifactId>portlet-api_2.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-    
+
     <!-- Build Configuration -->
 
     <build>

Modified: portals/bridges/bridges-jsf/trunk/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/bridges-jsf/trunk/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java?rev=1648569&r1=1648568&r2=1648569&view=diff
==============================================================================
--- portals/bridges/bridges-jsf/trunk/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
(original)
+++ portals/bridges/bridges-jsf/trunk/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
Tue Dec 30 18:43:21 2014
@@ -16,12 +16,9 @@
  */
 package org.apache.portals.bridges.jsf;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.portals.bridges.common.GenericServletPortlet;
 
 import javax.faces.FacesException;
 import javax.faces.FactoryFinder;
@@ -44,10 +41,12 @@ import javax.portlet.PortletResponse;
 import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.portals.bridges.common.GenericServletPortlet;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -215,12 +214,12 @@ public class FacesPortlet extends Generi
 
         // Save our PortletConfig instance
         this.portletConfig = portletConfig;
-        this.defaultViewPage = portletConfig.getInitParameter(PARAM_VIEW_PAGE);
-        this.defaultEditPage = portletConfig.getInitParameter(PARAM_EDIT_PAGE);
-        this.defaultHelpPage = portletConfig.getInitParameter(PARAM_HELP_PAGE);
+        setDefaultViewPage(portletConfig.getInitParameter(PARAM_VIEW_PAGE));
+        setDefaultEditPage(portletConfig.getInitParameter(PARAM_EDIT_PAGE));
+        setDefaultHelpPage(portletConfig.getInitParameter(PARAM_HELP_PAGE));
         this.uniqueIds = portletConfig.getInitParameter(PARAM_UNIQUE_IDS);
 
-        if (null == this.defaultViewPage)
+        if (null == getDefaultViewPage())
         {
             // A Faces Portlet is required to have at least the
             // defaultViewPage
@@ -230,21 +229,21 @@ public class FacesPortlet extends Generi
                             + portletConfig.getPortletName()
                             + " is incorrectly configured. No default View page is defined.");
         }
-        if (null == this.defaultActionPage)
+        if (null == getDefaultActionPage())
         {
-            this.defaultActionPage = this.defaultViewPage;
+            setDefaultActionPage(getDefaultViewPage());
         }
-        if (null == this.defaultCustomPage)
+        if (null == getDefaultCustomPage())
         {
-            this.defaultCustomPage = this.defaultViewPage;
+            setDefaultCustomPage(getDefaultViewPage());
         }
-        if (null == this.defaultHelpPage)
+        if (null == getDefaultHelpPage())
         {
-            this.defaultHelpPage = this.defaultViewPage;
+            setDefaultHelpPage(getDefaultViewPage());
         }
-        if (null == this.defaultEditPage)
+        if (null == getDefaultEditPage())
         {
-            this.defaultEditPage = this.defaultViewPage;
+            setDefaultEditPage(getDefaultViewPage());
         }
         if (log.isTraceEnabled())
         {
@@ -259,7 +258,7 @@ public class FacesPortlet extends Generi
     public void doEdit(RenderRequest request, RenderResponse response)
             throws PortletException, IOException
     {
-        process(request, response, defaultEditPage, FacesPortlet.EDIT_REQUEST,
+        process(request, response, getDefaultEditPage(), FacesPortlet.EDIT_REQUEST,
                 JSF_EDIT_ID);
     }
 
@@ -270,13 +269,13 @@ public class FacesPortlet extends Generi
     public void doHelp(RenderRequest request, RenderResponse response)
             throws PortletException, IOException
     {
-        if (this.defaultHelpPage != null
-                && this.defaultHelpPage.endsWith(".html"))
+        if (getDefaultHelpPage() != null
+                && getDefaultHelpPage().endsWith(".html"))
         {
             super.doHelp(request, response);
         } else
         {
-            process(request, response, defaultHelpPage,
+            process(request, response, getDefaultHelpPage(),
                     FacesPortlet.HELP_REQUEST, JSF_HELP_ID);
         }
     }
@@ -294,7 +293,7 @@ public class FacesPortlet extends Generi
     public void doCustom(RenderRequest request, RenderResponse response)
             throws PortletException, IOException
     {
-        process(request, response, defaultCustomPage,
+        process(request, response, getDefaultCustomPage(),
                 FacesPortlet.CUSTOM_REQUEST, JSF_CUSTOM_ID);
     }
 
@@ -305,7 +304,7 @@ public class FacesPortlet extends Generi
     public void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException
     {
-        process(request, response, defaultViewPage, FacesPortlet.VIEW_REQUEST,
+        process(request, response, getDefaultViewPage(), FacesPortlet.VIEW_REQUEST,
                 JSF_VIEW_ID);
     }
 
@@ -327,7 +326,7 @@ public class FacesPortlet extends Generi
         {
             viewId = JSF_HELP_ID;
         }
-        process(request, response, defaultActionPage,
+        process(request, response, getDefaultActionPage(),
                 FacesPortlet.ACTION_REQUEST, viewId);
     }
 
@@ -601,7 +600,7 @@ public class FacesPortlet extends Generi
      * Set the view identifier to the view for the page to be rendered.
      * </p>
      * 
-     * @param context
+     * @param facesContext
      *            The {@link FacesContext}for the current request.
      * @param defaultView
      *            The default view identifier.



---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org


Mime
View raw message