[jboss-svn-commits] JBL Code SVN: r9634 - in labs/jbosslabs/trunk/portal-extensions: jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-02-20 06:56:07 -0500 (Tue, 20 Feb 2007)
New Revision: 9634

Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
   labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
login fixed in / context

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-02-20 11:54:49 UTC (rev 9633)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-02-20 11:56:07 UTC (rev 9634)
@@ -47,7 +47,7 @@
    	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
    	<init-param>
 			<param-name>LOGIN_FAILED</param-name>
-			<param-value>/portal/default/login/LoginWindow?action=2&amp;loginFailed=loginFailed</param-value>
+			<param-value>/loginPage/LoginWindow?action=2&amp;loginFailed=loginFailed</param-value>
 			<description>Page with information that the login was failed</description>
 	</init-param>
    </servlet>
@@ -62,7 +62,7 @@
 		<servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
 		<init-param>
 			<param-name>LOGIN_PAGE</param-name>
-			<param-value>/portal/default/login</param-value>
+			<param-value>/loginPage</param-value>
 			<description>Login page that will get forwarded (dispatched) to</description>
 		</init-param>
 		<init-param>

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java	2007-02-20 11:54:49 UTC (rev 9633)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/PortletAttributesExctractor.java	2007-02-20 11:56:07 UTC (rev 9634)
@@ -137,7 +137,7 @@
 
 			String jsfUrl = portletURL.toString();
 
-			log.info("ViewID: "
+			log.debug("ViewID: "
 					+ FacesContext.getCurrentInstance().getViewRoot()
 							.getViewId());
 			try {

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java	2007-02-20 11:54:49 UTC (rev 9633)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java	2007-02-20 11:56:07 UTC (rev 9634)
@@ -33,7 +33,6 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
@@ -44,7 +43,6 @@
 import org.apache.myfaces.portlet.MyFacesGenericPortlet;
 import org.jboss.logging.Logger;
 import org.jboss.wiki.helper.WikiHelper;
-import org.jboss.wiki.ui.WikiEdit;
 
 /**
  * WikiPortletMyFaces.java

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2007-02-20 11:54:49 UTC (rev 9633)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2007-02-20 11:56:07 UTC (rev 9634)
@@ -107,7 +107,7 @@
 			fileDSProps.load(FileMediaDataSource.class
 					.getResourceAsStream(propFileName));
 
-		} catch (IOException ioe) {
+		} catch (Exception ioe) {
 			log.error("Can't load the file " + propFileName + "\n", ioe);
 		}
 

Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-02-20 11:54:49 UTC (rev 9633)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-02-20 11:56:07 UTC (rev 9634)
@@ -264,7 +264,7 @@
         
         <page>
             <!--  login page -->
-            <page-name>login</page-name>
+            <page-name>loginPage</page-name>
             <window>
                 <window-name>LoginWindow</window-name>
                 <instance-ref>LoginInstance</instance-ref>