You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ga...@apache.org on 2010/02/01 07:54:25 UTC
svn commit: r905192 - in /incubator/aries/trunk/web/web-urlhandler/src:
main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
test/java/org/apache/aries/web/converter/impl/WabConverterTest.java
Author: gawor
Date: Mon Feb 1 06:54:24 2010
New Revision: 905192
URL: http://svn.apache.org/viewvc?rev=905192&view=rev
Log:
directories in Bundle-ClassPath should not end with a slash
Modified:
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/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=905192&r1=905191&r2=905192&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 Mon Feb 1 06:54:24 2010
@@ -48,7 +48,7 @@
public class WarToWabConverterImpl {
private static final String DEFAULT_BUNDLE_VERSION = "1.0";
private static final String DEFAULT_BUNDLE_MANIFESTVERSION = "2";
- private static final String INITIAL_CLASSPATH_ENTRY = "WEB-INF/classes/";
+ private static final String INITIAL_CLASSPATH_ENTRY = "WEB-INF/classes";
private static final String CLASSPATH_LIB_PREFIX = "WEB-INF/lib/";
private static final String DEFAULT_IMPORT_PACKAGE_LIST = "javax.servlet;version=2.5,"
+ "javax.servlet.http;version=2.5,"
@@ -236,7 +236,7 @@
ArrayList<String> classpath = new ArrayList<String>();
// Set initial entry into classpath
- classpath.add(0, INITIAL_CLASSPATH_ENTRY);
+ classpath.add(INITIAL_CLASSPATH_ENTRY);
// Add any files from the WEB-INF/lib directory + their dependencies
classpath.addAll(classPath);
@@ -291,7 +291,7 @@
// Import-Package
//
packages.clear();
-
+
// Get the list from the URL and add to classpath (removing duplicates)
mergePathList(properties.getProperty(Constants.IMPORT_PACKAGE), packages,
",");
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=905192&r1=905191&r2=905192&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 Mon Feb 1 06:54:24 2010
@@ -81,8 +81,7 @@
"javax.servlet.jsp.tagext;version=2.1",
attrs.getValue("Import-Package"));
}
-
-
+
@Test
public void testAcceptNoManifest() throws Exception
{
@@ -113,7 +112,7 @@
"javax.servlet.jsp;version=2.1,javax.servlet.jsp.el;version=2.1," +
"javax.servlet.jsp.tagext;version=2.1",
attrs.getValue(Constants.IMPORT_PACKAGE));
- assertEquals("WEB-INF/classes/",attrs.getValue(Constants.BUNDLE_CLASSPATH));
+ assertEquals("WEB-INF/classes",attrs.getValue(Constants.BUNDLE_CLASSPATH));
}
@Test
@@ -141,18 +140,18 @@
attrs.putValue(Constants.BUNDLE_SYMBOLICNAME, "org.apache.test");
attrs.putValue(Constants.BUNDLE_VERSION, "1.0");
attrs.putValue(Constants.IMPORT_PACKAGE, "org.apache.util,org.apache.test;version=1.0");
- attrs.putValue(Constants.BUNDLE_CLASSPATH, "jsp/classes/");
+ attrs.putValue(Constants.BUNDLE_CLASSPATH, "jsp/classes");
attrs = convertWithProperties(m, Constants.BUNDLE_VERSION, "2.0",
Constants.IMPORT_PACKAGE, "org.apache.wab,org.apache.test;version=2.0",
- Constants.BUNDLE_CLASSPATH, "aries/generated/");
+ Constants.BUNDLE_CLASSPATH, "aries/generated");
assertEquals("org.apache.test", attrs.getValue(Constants.BUNDLE_SYMBOLICNAME));
assertEquals("2.0", attrs.getValue(Constants.BUNDLE_VERSION));
assertTrue(attrs.getValue(Constants.IMPORT_PACKAGE).contains("org.apache.util"));
assertTrue(attrs.getValue(Constants.IMPORT_PACKAGE).contains("org.apache.test;version=2.0"));
assertTrue(attrs.getValue(Constants.IMPORT_PACKAGE).contains("org.apache.wab"));
- assertEquals("WEB-INF/classes/,aries/generated/,jsp/classes/", attrs.getValue(Constants.BUNDLE_CLASSPATH));
+ assertEquals("WEB-INF/classes,aries/generated,jsp/classes", attrs.getValue(Constants.BUNDLE_CLASSPATH));
}
private Attributes convertWithProperties(Manifest m, String ... props) throws Exception {