r7048 - in branches/2.18: . war/src/main/webapp/WEB-INF

[sshafroi]

Author: sshafroi
Date: 2008-12-05 18:01:09 +0100 (Fri, 05 Dec 2008)
New Revision: 7048

Modified:
   branches/2.18/pom.xml
   branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml
Log:
Remove permanent redirect, since Aftenposten/Oslopuls doesn't work with this.

Modified: branches/2.18/pom.xml
===================================================================
--- branches/2.18/pom.xml       2008-12-05 14:42:49 UTC (rev 7047)
+++ branches/2.18/pom.xml       2008-12-05 17:01:09 UTC (rev 7048)
@@ -662,30 +662,24 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>aspectj-maven-plugin</artifactId>
-                        <configuration>
-                            <complianceLevel>1.5</complianceLevel>
-                            <encoding>UTF-8</encoding>
-                            <showWeaveInfo>true</showWeaveInfo>
-                            <aspectLibraries>
-                                <aspectLibrary>
-                                    <groupId>sesat</groupId>
-                                    
<artifactId>commons-interpreter-aspectj</artifactId>
-                                </aspectLibrary>
-                            </aspectLibraries>
-                            <verbose>true</verbose>
-                            <showWeaveInfo>true</showWeaveInfo>
-                        </configuration>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.1</version>
                         <executions>
                             <execution>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <tasks>
+   
+                                    </tasks>
+                                </configuration>
                                 <goals>
-                                    <goal>compile</goal>
+                                    <goal>run</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>           
+                </plugins>
+                           
             </build>
             <dependencies>
                 <dependency>

Modified: branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml
===================================================================
--- branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml    2008-12-05 
14:42:49 UTC (rev 7047)
+++ branches/2.18/war/src/main/webapp/WEB-INF/urlrewrite.xml    2008-12-05 
17:01:09 UTC (rev 7048)
@@ -52,6 +52,8 @@
     
<rule><from>^/([^/\?]*)(?:\?(.*))?$</from><to>/search/?q=$1&amp;$2</to></rule>
 
     <!-- legacy -->
+<!-- see SEARCH-5250
     <rule><from>(.*)&amp;output=(.*)</from><to 
type="permanent-redirect">$1&amp;layout=$2</to></rule>
     <rule><from>(.*)\?output=(.*)</from><to 
type="permanent-redirect">$1?layout=$2</to></rule>
+    -->
 </urlrewrite>

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits