You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2010/10/24 23:35:22 UTC
svn commit: r1026894 - in /incubator/empire-db/trunk:
empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
empire-db-struts2/src/main/resources/struts-empire-portlet.xml
empire-db-struts2/src/main/resources/struts-empire.xml
Author: doebele
Date: Sun Oct 24 21:35:21 2010
New Revision: 1026894
URL: http://svn.apache.org/viewvc?rev=1026894&view=rev
Log:
EMPIREDB-89
Added:
incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire-portlet.xml (with props)
Modified:
incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire.xml
Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml?rev=1026894&r1=1026893&r2=1026894&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/resources/struts.xml Sun Oct 24 21:35:21 2010
@@ -20,52 +20,26 @@
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
"http://struts.apache.org/dtds/struts-2.1.7.dtd">
+
<struts>
+ <include file="struts-empire.xml"></include>
+
<!--
<constant name="struts.devMode" value="true" />
<constant name="struts.enable.DynamicMethodInvocation" value="false" />
-->
<!-- Configuration for the default package. -->
- <package name="sample" namespace="" extends="struts-default">
-
- <interceptors>
- <!-- org.apache.empire.struts2 Interceptors -->
- <interceptor name="actionBasics" class="org.apache.empire.struts2.interceptors.ActionBasicsInterceptor" >
- <param name="errorAction">login!doError</param>
- </interceptor>
-
- <!-- org.apache.empire.struts2 Interceptors -->
- <interceptor name="actionAccess" class="org.apache.empire.struts2.interceptors.ActionAccessInterceptor" >
- <param name="loginAction">login!doInit</param>
- <param name="accessDeniedAction">login!doInit</param>
- </interceptor>
-
- <!-- Basic stack -->
- <interceptor-stack name="sampleStack">
- <interceptor-ref name="actionBasics"/>
- <interceptor-ref name="actionAccess"/>
- <!-- interceptor-ref name="servlet-config"/ -->
- <!-- interceptor-ref name="prepare"/ -->
- <!-- interceptor-ref name="checkbox"/ -->
- <interceptor-ref name="params"/>
- <!-- interceptor-ref name="conversionError"/ -->
- </interceptor-stack>
-
- </interceptors>
+ <package name="sample" namespace="" extends="empire-default">
- <!-- Default interceptor stack. -->
- <default-interceptor-ref name="sampleStack"/>
+ <!-- Action Mappings -->
+ <action name="error" class="org.apache.empire.struts2.websample.web.actions.LoginAction" method="doInit">
+ <result name="input">/jsp/login.jsp</result>
+ </action>
- <!-- Static Params Interceptor -->
<action name="login" class="org.apache.empire.struts2.websample.web.actions.LoginAction" method="doInit">
<result name="input">/jsp/login.jsp</result>
- <!--
- * UPGRADE-struts 2.1.6
- * CHANGE: changed "redirect-action" to "redirectAction"
- * Reason: The types are now written in "camelCase"
- -->
<result name="success" type="redirectAction">employeeList!doInit</result>
</action>
@@ -76,11 +50,6 @@
<action name="employeeDetail" class="org.apache.empire.struts2.websample.web.actions.EmployeeDetailAction" method="doLoad">
<result name="input">/jsp/employeeDetails.jsp</result>
- <!--
- * UPGRADE-struts 2.1.6
- * CHANGE: changed "redirect-action" to "redirectAction"
- * Reason: The types are now written in "camelCase"
- -->
<result name="return" type="redirectAction">employeeList!doList</result>
</action>
Added: incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire-portlet.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire-portlet.xml?rev=1026894&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire-portlet.xml (added)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire-portlet.xml Sun Oct 24 21:35:21 2010
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "http://struts.apache.org/dtds/struts-2.1.7.dtd">
+
+<struts>
+
+ <!-- empire-portlet-default -->
+ <package name="empire-portlet-default" extends="struts-portlet-default">
+
+ <!-- Result Types -->
+ <result-types>
+ <result-type name="dispatcher" class="org.apache.empire.struts2.web.EmpirePortletResult" default="true"/>
+ <result-type name="redirect" class="org.apache.empire.struts2.web.EmpirePortletResult"/>
+ </result-types>
+
+ <!-- Interceptors -->
+ <interceptors>
+ <!-- org.apache.empire.struts2 Interceptors -->
+ <interceptor name="actionBasics" class="org.apache.empire.struts2.interceptors.ActionBasicsInterceptor" >
+ <param name="errorAction">error</param>
+ </interceptor>
+ <!-- org.apache.empire.struts2 Interceptors -->
+ <interceptor name="actionAccess" class="org.apache.empire.struts2.interceptors.ActionAccessInterceptor" >
+ <param name="loginAction">login</param>
+ <!--
+ <param name="accessDeniedAction">login!doAccessDenied</param>
+ -->
+ </interceptor>
+ <!-- Basic stack -->
+ <interceptor-stack name="empirePortletStack" >
+ <!-- Empire-Interceptors -->
+ <interceptor-ref name="actionBasics"/>
+ <interceptor-ref name="actionAccess"/>
+ <!-- Portlet-Interceptors -->
+ <interceptor-ref name="portletState"/>
+ <interceptor-ref name="portletAware"/>
+ <!-- Struts-Interceptors -->
+ <!--
+ <interceptor-ref name="exception"/>
+ <interceptor-ref name="alias"/>
+ <interceptor-ref name="i18n"/>
+ -->
+ <interceptor-ref name="checkbox"/>
+ <!--
+ <interceptor-ref name="multiselect"/>
+ -->
+ <interceptor-ref name="params">
+ <param name="excludeParams">dojo\..*,^struts\..*</param>
+ </interceptor-ref>
+ <!--
+ <interceptor-ref name="servletConfig"/>
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="modelDriven"/>
+ <interceptor-ref name="staticParams"/>
+ <interceptor-ref name="actionMappingParams"/>
+ <interceptor-ref name="params">
+ <param name="excludeParams">dojo\..*,^struts\..*</param>
+ </interceptor-ref>
+ <interceptor-ref name="conversionError"/>
+ <interceptor-ref name="validation">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ -->
+ </interceptor-stack>
+
+ <!-- File upload stack -->
+ <interceptor-stack name="fileUploadStack">
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="empirePortletStack"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <!-- Default interceptor stack. -->
+ <default-interceptor-ref name="empirePortletStack"/>
+ </package>
+</struts>
Propchange: incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire-portlet.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire.xml?rev=1026894&r1=1026893&r2=1026894&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire.xml (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/resources/struts-empire.xml Sun Oct 24 21:35:21 2010
@@ -86,79 +86,8 @@
<interceptor-ref name="empireDefaultStack"/>
</interceptor-stack>
</interceptors>
+
<!-- set default stack -->
<default-interceptor-ref name="empireDefaultStack"/>
</package>
-
- <!-- empire-tiles-default -->
- <package name="empire-tiles-default" extends="empire-default">
- <!-- Tiles -->
- <result-types>
- <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
- </result-types>
- </package>
-
- <!-- empire-portlet-default -->
- <package name="empire-portlet-default" extends="struts-portlet-default">
-
- <!-- Result Types -->
- <result-types>
- <result-type name="dispatcher" class="org.apache.empire.struts2.web.EmpirePortletResult" default="true"/>
- <result-type name="redirect" class="org.apache.empire.struts2.web.EmpirePortletResult"/>
- </result-types>
-
- <!-- Interceptors -->
- <interceptors>
- <!-- org.apache.empire.struts2 Interceptors -->
- <interceptor name="actionBasics" class="org.apache.empire.struts2.interceptors.ActionBasicsInterceptor" >
- <param name="errorAction">error</param>
- </interceptor>
- <!-- org.apache.empire.struts2 Interceptors -->
- <interceptor name="actionAccess" class="org.apache.empire.struts2.interceptors.ActionAccessInterceptor" >
- <param name="loginAction">login</param>
- <!--
- <param name="accessDeniedAction">login!doAccessDenied</param>
- -->
- </interceptor>
- <!-- Basic stack -->
- <interceptor-stack name="empirePortletStack" >
- <!-- Portlet-Interceptors -->
- <interceptor-ref name="portletState"/>
- <interceptor-ref name="portletAware"/>
- <!-- Struts-Interceptors -->
- <!--
- <interceptor-ref name="exception"/>
- <interceptor-ref name="alias"/>
- <interceptor-ref name="i18n"/>
- -->
- <interceptor-ref name="checkbox"/>
- <!--
- <interceptor-ref name="multiselect"/>
- -->
- <interceptor-ref name="params">
- <param name="excludeParams">dojo\..*,^struts\..*</param>
- </interceptor-ref>
- <!--
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="modelDriven"/>
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="actionMappingParams"/>
- <interceptor-ref name="params">
- <param name="excludeParams">dojo\..*,^struts\..*</param>
- </interceptor-ref>
- <interceptor-ref name="conversionError"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- -->
- </interceptor-stack>
- </interceptors>
- <!-- Default interceptor stack. -->
- <default-interceptor-ref name="empirePortletStack"/>
- </package>
</struts>