incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r905725 - in /incubator/aries/trunk/web/web-urlhandler/src: main/java/org/apache/aries/web/converter/ main/java/org/apache/aries/web/converter/impl/ test/java/org/apache/aries/web/converter/impl/
Date Tue, 02 Feb 2010 17:41:11 GMT
Author: gawor
Date: Tue Feb  2 17:41:06 2010
New Revision: 905725

URL: http://svn.apache.org/viewvc?rev=905725&view=rev
Log:
Remove support for Web-JSPExtractLocation header as it was removed from the spec

Modified:
    incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/WarToWabConverter.java
    incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
    incubator/aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java

Modified: incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/WarToWabConverter.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/WarToWabConverter.java?rev=905725&r1=905724&r2=905725&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/WarToWabConverter.java
(original)
+++ incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/WarToWabConverter.java
Tue Feb  2 17:41:06 2010
@@ -36,7 +36,6 @@
   }
 
   public static final String WEB_CONTEXT_PATH = "Web-ContextPath";
-  public static final String WEB_JSP_EXTRACT_LOCATION = "Web-JSPExtractLocation";
 
   
   /**

Modified: incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java?rev=905725&r1=905724&r2=905725&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
(original)
+++ incubator/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
Tue Feb  2 17:41:06 2010
@@ -19,7 +19,6 @@
 package org.apache.aries.web.converter.impl;
 
 import static org.apache.aries.web.converter.WarToWabConverter.WEB_CONTEXT_PATH;
-import static org.apache.aries.web.converter.WarToWabConverter.WEB_JSP_EXTRACT_LOCATION;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -342,16 +341,6 @@
         properties.put(WEB_CONTEXT_PATH, webCPath);
     }
 
-    //
-    // Web-JSPExtractLocation
-    //
-
-    if (manifest.getMainAttributes().getValue(WEB_JSP_EXTRACT_LOCATION) == null
-        && !properties.containsKey(WEB_JSP_EXTRACT_LOCATION)) {
-      properties
-          .put(WEB_JSP_EXTRACT_LOCATION, DEFAULT_WEB_JSP_EXTRACT_LOCATION);
-    }
-
     // Take the properties map and add them to the manifest file
     for (Object s : properties.keySet())
       manifest.getMainAttributes().put(new Attributes.Name((String) s), properties.get(s));

Modified: incubator/aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java?rev=905725&r1=905724&r2=905725&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java
(original)
+++ incubator/aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java
Tue Feb  2 17:41:06 2010
@@ -124,7 +124,6 @@
     Attributes attrs = convertWithProperties();
     
     assertTrue(attrs.getValue(Constants.BUNDLE_SYMBOLICNAME).startsWith(WAR_FILE_NAME_WO_SUFFIX));
-    assertEquals("/", attrs.getValue(WarToWabConverter.WEB_JSP_EXTRACT_LOCATION));    
     assertEquals("1.0", attrs.getValue(Constants.BUNDLE_VERSION));
     assertEquals("javax.servlet;version=2.5,javax.servlet.http;version=2.5,javax.el;version=2.1,"
+
         "javax.servlet.jsp;version=2.1,javax.servlet.jsp.el;version=2.1," +
@@ -137,12 +136,10 @@
   public void testPropertySupport() throws Exception {
     Attributes attrs = convertWithProperties(
         WarToWabConverter.WEB_CONTEXT_PATH, "WebFiles",
-        WarToWabConverter.WEB_JSP_EXTRACT_LOCATION, "/jsp",
         Constants.BUNDLE_VERSION, "2.0",
         Constants.IMPORT_PACKAGE, "org.apache.aries.test;version=2.5,org.apache.aries.test.eba;version=1.0");
     
     assertEquals("/WebFiles", attrs.getValue(WarToWabConverter.WEB_CONTEXT_PATH));
-    assertEquals("/jsp", attrs.getValue(WarToWabConverter.WEB_JSP_EXTRACT_LOCATION));
     assertEquals("2.0", attrs.getValue(Constants.BUNDLE_VERSION));
     assertEquals("org.apache.aries.test;version=2.5,org.apache.aries.test.eba;version=1.0,"+
         "javax.servlet;version=2.5,javax.servlet.http;version=2.5,javax.el;version=2.1,"
+



Mime
View raw message