You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/05/21 23:28:51 UTC
svn commit: r947180 -
/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Author: gawor
Date: Fri May 21 21:28:50 2010
New Revision: 947180
URL: http://svn.apache.org/viewvc?rev=947180&view=rev
Log:
return null if there is no manifest so other config builders can deploy the module
Modified:
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=947180&r1=947179&r2=947180&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Fri May 21 21:28:50 2010
@@ -254,11 +254,12 @@ public class AppClientModuleBuilder impl
try {
Manifest manifest = moduleFile.getManifest();
if (manifest == null) {
- throw new DeploymentException("App client module jar does not contain a manifest: " + moduleFile.getName());
+ // if there is no manifest, it's not an app client module
+ return null;
}
mainClass = manifest.getMainAttributes().getValue(Attributes.Name.MAIN_CLASS);
if (mainClass == null) {
- //not an app client
+ // if there is no Main-Class header in manifest, it's not an app client module
return null;
}
String classPath = manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH);