svn commit: r1606608 - in /roller/trunk/app: pom.xml src/main/webapp/WEB-INF/web.xml src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java

[gmazza]

Author: gmazza
Date: Sun Jun 29 21:22:30 2014
New Revision: 1606608

URL: http://svn.apache.org/r1606608
Log:
Upgraded from JSP/Servlet 2.1/2.5 to 2.2/3.0 (i.e., Tomcat 7), switched to a 
less buggy link in LinkbackExtractorTest.

Modified:
    roller/trunk/app/pom.xml
    roller/trunk/app/src/main/webapp/WEB-INF/web.xml
    
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java

Modified: roller/trunk/app/pom.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1606608&r1=1606607&r2=1606608&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sun Jun 29 21:22:30 2014
@@ -126,6 +126,12 @@
             <groupId>org.apache.xmlrpc</groupId>
             <artifactId>xmlrpc-server</artifactId>
             <version>3.1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -150,9 +156,9 @@
         <!-- web -->
 
         <dependency>
-               <artifactId>servlet-api</artifactId>
                <groupId>javax.servlet</groupId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -291,7 +297,7 @@
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
-            <version>2.1</version>
+            <version>2.2</version>
             <scope>provided</scope>
         </dependency>
 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1606608&r1=1606607&r2=1606608&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Sun Jun 29 21:22:30 2014
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5"
-    xmlns="http://java.sun.com/xml/ns/javaee";
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
-    
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+         version="3.0">
+
     <display-name>Roller Weblogger</display-name>
 
     <context-param>

Modified: 
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java?rev=1606608&r1=1606607&r2=1606608&view=diff
==============================================================================
--- 
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
 (original)
+++ 
roller/trunk/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
 Sun Jun 29 21:22:30 2014
@@ -61,8 +61,8 @@ public class LinkbackExtractorTest exten
                         
"http://rollerweblogger.org/roller/entry/composite_keys_in_cassandra";
             },
             {
-                "http://rollermobile.blogspot.com/";,
-                        "http://rollerweblogger.org/project/date/20110523";
+                "http://roller.apache.org/downloads/downloads.html";,
+                        "http://rollerweblogger.org/project/date/20140627";
             }
         };
 
@@ -70,7 +70,7 @@ public class LinkbackExtractorTest exten
         assertEquals("The Apache Cassandra Project", le.getTitle());
         
         le = new LinkbackExtractor(testrefs[1][0],testrefs[1][1]);
-        assertEquals("Apache Roller Mobile Platform", le.getTitle());
+        assertEquals("Downloads", le.getTitle());
 
         // todo: le.getPermalink() and le.getExcerpt() working
     }