From: Brett Porter <brett@apache.org>
Date: Wed, 14 Feb 2007 15:45:09 +0000 (+0000)
Subject: show company logo on no results page (it previously failed as the page contains valid... 
X-Git-Tag: archiva-0.9-alpha-1~115
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c3126b7ef68fa501a7e686b2296b88c768a4a6cb;p=archiva.git

show company logo on no results page (it previously failed as the page contains validation errors, so it would return input)

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@507588 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index 00c308ad5..e5ee95b15 100644
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -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>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
index 8ead22da1..acb6a423a 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
+++ b/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
@@ -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>