[portal-commits] JBoss Portal SVN: r8845 - in branches/JBoss_Portal_Branch_2_6: core-samples/src/resources/portal-basic-samples-war/WEB-INF and 1 other directory.

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2007-11-07 23:49:10 -0500 (Wed, 07 Nov 2007)
New Revision: 8845

Modified:
   branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml
   branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/web.xml
Log:
- Conform to DTD.

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml	2007-11-07 22:24:50 UTC (rev 8844)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml	2007-11-08 04:49:10 UTC (rev 8845)
@@ -36,6 +36,11 @@
       <servlet-class>org.jboss.portal.core.cms.servlet.CMSExportServlet</servlet-class>
       <load-on-startup>0</load-on-startup>
    </servlet>
+   <servlet>
+      <servlet-name>ApprovePublishServlet</servlet-name>
+      <servlet-class>org.jboss.portal.cms.workflow.ApprovePublishServlet</servlet-class>
+   </servlet>
+
    <servlet-mapping>
       <servlet-name>CMSPreviewServlet</servlet-name>
       <url-pattern>/cmspreview/*</url-pattern>
@@ -44,11 +49,6 @@
       <servlet-name>CMSExportServlet</servlet-name>
       <url-pattern>/cmsexport/*</url-pattern>
    </servlet-mapping>
-   
-   <servlet>
-      <servlet-name>ApprovePublishServlet</servlet-name>
-      <servlet-class>org.jboss.portal.cms.workflow.ApprovePublishServlet</servlet-class>
-   </servlet>      
    <servlet-mapping>
       <servlet-name>ApprovePublishServlet</servlet-name>
       <url-pattern>/approve/*</url-pattern>

Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/web.xml	2007-11-07 22:24:50 UTC (rev 8844)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/web.xml	2007-11-08 04:49:10 UTC (rev 8845)
@@ -22,13 +22,9 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<!DOCTYPE web-app PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
-   <listener>
-      <listener-class> org.jboss.portal.portlet.session.SessionListener </listener-class>
-   </listener>
    <context-param>
       <param-name>org.jboss.portal.content_type</param-name>
       <param-value>filesystem</param-value>
@@ -38,6 +34,9 @@
       <param-value>FSContentDrivenPortletInstance</param-value>
    </context-param>
    <listener>
+      <listener-class>org.jboss.portal.portlet.session.SessionListener</listener-class>
+   </listener>
+   <listener>
       <listener-class>org.jboss.portlet.content.ContentTypeRegistration</listener-class>
    </listener>
 </web-app>