Author: djencks
Date: Fri Sep 26 00:20:57 2008
New Revision: 699201
URL: http://svn.apache.org/viewvc?rev=699201&view=rev
Log:
GERONIMO-4323 make default plans use 'car' as type
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=699201&r1=699200&r2=699201&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 Sep 26 00:20:57 2008
@@ -301,10 +301,10 @@
Environment clientEnvironment = EnvironmentBuilder.buildEnvironment(clientEnvironmentType,
defaultClientEnvironment);
if (standAlone) {
String name = new File(moduleFile.getName()).getName();
- idBuilder.resolve(clientEnvironment, name + "_" + name, "jar");
+ idBuilder.resolve(clientEnvironment, name + "_" + name, "car");
} else {
Artifact earConfigId = earEnvironment.getConfigId();
- idBuilder.resolve(clientEnvironment, earConfigId.getArtifactId() + "_" + targetPath,
"jar");
+ idBuilder.resolve(clientEnvironment, earConfigId.getArtifactId() + "_" + targetPath,
"car");
}
EnvironmentType serverEnvironmentType = gerAppClient.getServerEnvironment();
Environment serverEnvironment = EnvironmentBuilder.buildEnvironment(serverEnvironmentType,
defaultServerEnvironment);
@@ -315,7 +315,7 @@
throw new IllegalStateException("Server environment module ID should be fully
resolved (not " + serverEnvironment.getConfigId() + ")");
}
} else {
- idBuilder.resolve(serverEnvironment, new File(moduleFile.getName()).getName(),
"jar");
+ idBuilder.resolve(serverEnvironment, new File(moduleFile.getName()).getName(),
"car");
}
if (earName == null) {
|