You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kalumet-commits@incubator.apache.org by jb...@apache.org on 2012/08/25 11:27:23 UTC

svn commit: r1377265 - in /incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model: J2EEApplication.java Kalumet.java

Author: jbonofre
Date: Sat Aug 25 11:27:23 2012
New Revision: 1377265

URL: http://svn.apache.org/viewvc?rev=1377265&view=rev
Log:
Fix loading of JEE applications in the model

Modified:
    incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java
    incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java?rev=1377265&r1=1377264&r2=1377265&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java Sat Aug 25 11:27:23 2012
@@ -127,7 +127,7 @@ public class J2EEApplication
   {
     if ( this.getArchive( archive.getName() ) != null )
     {
-      throw new ModelObjectAlreadyExistsException( "Archive name already exists in the JZEE application." );
+      throw new ModelObjectAlreadyExistsException( "Archive name already exists in the JEE application." );
     }
     this.archives.add( archive );
   }
@@ -183,7 +183,7 @@ public class J2EEApplication
   {
     if ( this.getContentManager( contentManager.getName() ) != null )
     {
-      throw new ModelObjectAlreadyExistsException( "Content manager name already exists in the JZEE application." );
+      throw new ModelObjectAlreadyExistsException( "Content manager name already exists in the JEE application." );
     }
     this.contentManagers.add( contentManager );
   }
@@ -239,7 +239,7 @@ public class J2EEApplication
   {
     if ( this.getConfigurationFile( configurationFile.getName() ) != null )
     {
-      throw new ModelObjectAlreadyExistsException( "Configuration file name already exists in the JZEE application." );
+      throw new ModelObjectAlreadyExistsException( "Configuration file name already exists in the JEE application." );
     }
     this.configurationFiles.add( configurationFile );
   }

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java?rev=1377265&r1=1377264&r2=1377265&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java Sat Aug 25 11:27:23 2012
@@ -571,10 +571,10 @@ public class Kalumet
 
       // application tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/application",
+        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication",
         "org.apache.kalumet.model.J2EEApplication" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/application" );
+        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication" );
 
       // archive tag rules
       digester.addObjectCreate(