You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/11/06 19:48:29 UTC
svn commit: r711940 -
/geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Author: jbohn
Date: Thu Nov 6 10:48:18 2008
New Revision: 711940
URL: http://svn.apache.org/viewvc?rev=711940&view=rev
Log:
merge 711937 from trunk - GERONIMO-3316 - collect all failures before returning when processing manifest classpath
Modified:
geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=711940&r1=711939&r2=711940&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Thu Nov 6 10:48:18 2008
@@ -331,22 +331,22 @@
pathUri = new URI(path);
} catch (URISyntaxException e) {
problems.add(new DeploymentException(printInfo("Invalid manifest classpath entry, path=" + path, moduleBaseUri, classpath, exclusions)));
- return;
+ continue;
}
if (!pathUri.getPath().endsWith(".jar")) {
problems.add(new DeploymentException(printInfo("Manifest class path entries must end with the .jar extension (J2EE 1.4 Section 8.2): path=" + path, moduleBaseUri, classpath, exclusions)));
- return;
+ continue;
}
if (pathUri.isAbsolute()) {
problems.add(new DeploymentException(printInfo("Manifest class path entries must be relative (J2EE 1.4 Section 8.2): path=" + path, moduleBaseUri, classpath, exclusions)));
- return;
+ continue;
}
URI targetUri = moduleBaseUri.resolve(pathUri);
if (targetUri.getPath().endsWith("/")) {
problems.add(new DeploymentException(printInfo("target path must not end with a '/' character: path=" + path + ", resolved to targetURI=" + targetUri, moduleBaseUri, classpath, exclusions)));
- return;
+ continue;
}
String targetEntry = targetUri.toString();
if (exclusions.contains(targetEntry)) {
@@ -365,7 +365,7 @@
classPathJarFile = factory.newJarFile(targetUri);
} catch (IOException e) {
problems.add(new DeploymentException(printInfo("Manifest class path entries must be a valid jar file (JAVAEE 5 Section 8.2): path=" + path + ", resolved to targetURI=" + targetUri, moduleBaseUri, classpath, exclusions), e));
- return;
+ continue;
}
getCompleteManifestClassPath(classPathJarFile, targetUri, resolutionUri, classpath, exclusions, factory, problems);