geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1089619 - /geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Wed, 06 Apr 2011 20:48:46 GMT
Author: gawor
Date: Wed Apr  6 20:48:45 2011
New Revision: 1089619

URL: http://svn.apache.org/viewvc?rev=1089619&view=rev
Log:
GERONIMO-5765: Display a warning message when web application is deployed with WAB manifest

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=1089619&r1=1089618&r2=1089619&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Wed Apr  6 20:48:45 2011
@@ -545,6 +545,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("Deploying module as a regular Java EE application. Its existing
OSGi manifest will be ignored.");
+            }
+        }
+        
         ApplicationInfo applicationInfo = (ApplicationInfo) plan;
 
         EARContext earContext = null;



Mime
View raw message