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 2011/04/06 23:01:29 UTC
svn commit: r1089625 - in /geronimo/server/branches/3.0-M2:
framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/
plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
Author: gawor
Date: Wed Apr 6 21:01:28 2011
New Revision: 1089625
URL: http://svn.apache.org/viewvc?rev=1089625&view=rev
Log:
GERONIMO-5765: Move the warning from Deployer to EARConfigBuilder
Modified:
geronimo/server/branches/3.0-M2/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Modified: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java?rev=1089625&r1=1089624&r2=1089625&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/server/branches/3.0-M2/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java Wed Apr 6 21:01:28 2011
@@ -242,14 +242,6 @@ public class Deployer implements GBeanLi
(moduleFile == null ? "" : (planFile == null ? "" : ", ") + "moduleFile=" + moduleFile.getAbsolutePath()) + ")");
}
-
- if (module != null) {
- Manifest mf = module.getManifest();
- if (mf != null && mf.getMainAttributes().getValue("Bundle-SymbolicName") != null) {
- log.warn("Application module contains OSGi manifest. The OSGi manifest will be ignored and the application will be deployed as a regular Java EE application.");
- }
- }
-
Artifact configID = getConfigID(module, idBuilder, plan, builder);
ConfigurationStore store = getConfigurationStore(targetConfigurationStore);
Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1089625&r1=1089624&r2=1089625&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Wed Apr 6 21:01:28 2011
@@ -538,6 +538,14 @@ public class EARConfigBuilder implements
public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, Object plan, JarFile earFile, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException {
assert plan != null;
+
+ if (earFile != null) {
+ Manifest mf = earFile.getManifest();
+ if (mf != null && mf.getMainAttributes().getValue("Bundle-SymbolicName") != null) {
+ log.warn("Application module contains OSGi manifest. The OSGi manifest will be ignored and the application will be deployed as a regular Java EE application.");
+ }
+ }
+
ApplicationInfo applicationInfo = (ApplicationInfo) plan;
EARContext earContext = null;