show company logo on no results page (it previously failed as the page contains valid...

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 00c308ad55c36e6ffa72decb00605d25bca0b8b3..e5ee95b158c8e63c661be5ae39e194ff61e21b50 100644 (file)
--- 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 8ead22da1fc6d6fde1a507c32806fbbc0d99e855..acb6a423ab974a5c43e5c17f004df780d0807410 100644 (file)
--- 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>