Fix loading of JEE applications in the model
git-svn-id: https://svn.apache.org/repos/asf/incubator/kalumet/trunk@1377265 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java b/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java
index b6c4675..295b611 100644
--- a/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java
+++ b/kalumet-modules/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java
@@ -127,7 +127,7 @@
{
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 @@
{
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 @@
{
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 );
}
diff --git a/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java b/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
index f104dca..c2ea36a 100644
--- a/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
+++ b/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Kalumet.java
@@ -571,10 +571,10 @@
// 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(
