[jboss-cvs] JBossBlog SVN: r282 - in trunk: resources/WEB-INF and 1 other directory.

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

Author: adamw
Date: 2008-04-02 05:26:50 -0400 (Wed, 02 Apr 2008)
New Revision: 282

Modified:
   trunk/blog.iml
   trunk/resources/WEB-INF/components.xml
   trunk/resources/WEB-INF/pages.xml
Log:


Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml	2008-03-31 15:48:18 UTC (rev 281)
+++ trunk/blog.iml	2008-04-02 09:26:50 UTC (rev 282)
@@ -493,6 +493,42 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../.maven/repository/jboss/jars/jgroups.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../.maven/repository/jboss/jars/jboss-cache.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../.maven/repository/jboss/jars/jboss-system.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../.maven/repository/jboss/jars/jboss-jmx.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: trunk/resources/WEB-INF/components.xml
===================================================================
--- trunk/resources/WEB-INF/components.xml	2008-03-31 15:48:18 UTC (rev 281)
+++ trunk/resources/WEB-INF/components.xml	2008-04-02 09:26:50 UTC (rev 282)
@@ -7,6 +7,7 @@
             xmlns:bpm="http://jboss.com/products/seam/bpm"
             xmlns:security="http://jboss.com/products/seam/security"
             xmlns:web="http://jboss.com/products/seam/web"
+            xmlns:navigation="http://jboss.com/products/seam/navigation"
             xmlns:mail="http://jboss.com/products/seam/mail"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation=
@@ -18,6 +19,7 @@
                  http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd
                  http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
                  http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
+                 http://jboss.com/products/seam/navigation http://jboss.com/products/seam/navigation-2.0.xsd
                  http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
 
     <core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
@@ -59,6 +61,8 @@
 
     <web:context-filter url-pattern="/feeds.seam" />
 
+    <navigation:pages https-port="8443" http-port="8080" />
+
     <component name="linkService">
         <property name="serverAddress">http://localhost:8080</property>
         <property name="contextName">feeds</property>

Modified: trunk/resources/WEB-INF/pages.xml
===================================================================
--- trunk/resources/WEB-INF/pages.xml	2008-03-31 15:48:18 UTC (rev 281)
+++ trunk/resources/WEB-INF/pages.xml	2008-04-02 09:26:50 UTC (rev 282)
@@ -7,7 +7,13 @@
 
     <!-- Security -->
 
-    <page view-id="/security/login.xhtml">        
+    <page view-id="*">
+        <navigation from-action="#{identity.logout}">
+            <redirect view-id="/home.xhtml"/>
+        </navigation>
+    </page>
+
+    <page view-id="/security/login.xhtml" scheme="https">        
         <navigation from-action="#{identity.login}">
             <rule if="#{identity.loggedIn}">
                 <redirect view-id="/home.xhtml"/>
@@ -15,14 +21,10 @@
         </navigation>
     </page>
 
-    <page view-id="*">
-        <navigation from-action="#{identity.logout}">
-            <redirect view-id="/home.xhtml"/>
-        </navigation>
-    </page>
-
     <!-- View feeds -->
 
+    <page view-id="/home.xhtml" />
+
     <page view-id="/view/feed.xhtml">
         <param name="name" converterId="feedConverter" value="#{feedView.feed}" />
         <param name="from" value="#{feedView.from}" />