You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/02/14 16:45:10 UTC
svn commit: r507588 - in /maven/archiva/trunk/archiva-webapp/src/main:
resources/xwork.xml webapp/WEB-INF/decorators.xml
Author: brett
Date: Wed Feb 14 07:45:09 2007
New Revision: 507588
URL: http://svn.apache.org/viewvc?view=rev&rev=507588
Log:
show company logo on no results page (it previously failed as the page contains validation errors, so it would return input)
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=507588&r1=507587&r2=507588
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Wed Feb 14 07:45:09 2007
@@ -41,7 +41,7 @@
<interceptor-ref name="pssEnvironmentChecker"/>
<interceptor-ref name="pssForceAdminUser"/>
<interceptor-ref name="pssAutoLogin"/>
- <interceptor-ref name="pssPolicyEnforcement"/>
+ <interceptor-ref name="pssPolicyEnforcement"/>
<interceptor-ref name="pssSecureActions"/>
</interceptor-stack>
@@ -190,7 +190,8 @@
</package>
- <package name="components" namespace="/components" extends="default">
+ <package name="components" namespace="/components" extends="webwork-default">
+ <default-interceptor-ref name="basicStack"/>
<action name="companyInfo" class="companyInfo">
<result>/WEB-INF/jsp/components/companyLogo.jsp</result>
</action>
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml?view=diff&rev=507588&r1=507587&r2=507588
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml Wed Feb 14 07:45:09 2007
@@ -21,8 +21,9 @@
<decorators defaultdir="/WEB-INF/jsp/decorators">
<excludes>
<pattern>/repository/*</pattern>
+ <pattern>/components/*</pattern>
</excludes>
-
+
<decorator name="default" page="default.jsp">
<pattern>/*</pattern>
</decorator>