incubator-kalumet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1379028 [4/7] - in /incubator/kalumet/trunk: ./ documentation/src/site/apt/ documentation/src/site/apt/adminguide/ documentation/src/site/apt/userguide/ documentation/src/site/apt/userguide/environment/ kalumet-modules/agent/src/main/java/...
Date Thu, 30 Aug 2012 17:31:30 GMT
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=1379028&r1=1379027&r2=1379028&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 Thu Aug 30 17:31:27 2012
@@ -455,246 +455,246 @@ public class Kalumet
       digester.addCallMethod( "kalumet/environments/environment/notes", "setNotes", 0 );
       digester.addCallMethod( "kalumet/environments/environment/weblinks", "setWeblinks", 0 );
 
-      // j2eeapplicationservers tag rules
-      digester.addObjectCreate( "kalumet/environments/environment/j2eeapplicationservers",
-                                "org.apache.kalumet.model.J2EEApplicationServers" );
-      digester.addSetProperties( "kalumet/environments/environment/j2eeapplicationservers" );
-
-      // j2eeapplicationserver tag rules
-      digester.addObjectCreate( "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver",
-                                "org.apache.kalumet.model.J2EEApplicationServer" );
-      digester.addSetProperties( "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver" );
+      // jeeapplicationservers tag rules
+      digester.addObjectCreate( "kalumet/environments/environment/jeeapplicationservers",
+                                "org.apache.kalumet.model.JEEApplicationServers" );
+      digester.addSetProperties( "kalumet/environments/environment/jeeapplicationservers" );
+
+      // jeeapplicationserver tag rules
+      digester.addObjectCreate( "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver",
+                                "org.apache.kalumet.model.JEEApplicationServer" );
+      digester.addSetProperties( "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver" );
 
-      // j2eeapplicationserver startupcommand and shutdowncommand tag rules
+      // jeeapplicationserver startupcommand and shutdowncommand tag rules
       digester.addCallMethod(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/startupcommand",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/startupcommand",
         "setStartupcommand", 0 );
       digester.addCallMethod(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/shutdowncommand",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/shutdowncommand",
         "setShutdowncommand", 0 );
 
       // jdbcconnectionpool tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jdbcconnectionpools/jdbcconnectionpool",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jdbcconnectionpools/jdbcconnectionpool",
         "org.apache.kalumet.model.JDBCConnectionPool" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jdbcconnectionpools/jdbcconnectionpool" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jdbcconnectionpools/jdbcconnectionpool" );
 
-      // add jdbcconnectionpool to j2eeapplicationserver
+      // add jdbcconnectionpool to jeeapplicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jdbcconnectionpools/jdbcconnectionpool",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jdbcconnectionpools/jdbcconnectionpool",
         "addJDBCConnectionPool", "org.apache.kalumet.model.JDBCConnectionPool" );
 
       // jdbcdatasource tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jdbcdatasources/jdbcdatasource",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jdbcdatasources/jdbcdatasource",
         "org.apache.kalumet.model.JDBCDataSource" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jdbcdatasources/jdbcdatasource" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jdbcdatasources/jdbcdatasource" );
 
-      // add jdbcdatasource to j2eeapplicationserver
+      // add jdbcdatasource to jeeapplicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jdbcdatasources/jdbcdatasource",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jdbcdatasources/jdbcdatasource",
         "addJDBCDataSource", "org.apache.kalumet.model.JDBCDataSource" );
 
       // jmsconnectionfactory tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsconnectionfactories/jmsconnectionfactory",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsconnectionfactories/jmsconnectionfactory",
         "org.apache.kalumet.model.JMSConnectionFactory" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsconnectionfactories/jmsconnectionfactory" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsconnectionfactories/jmsconnectionfactory" );
 
-      // add jmsconnectionfactory to j2eeapplicationserver
+      // add jmsconnectionfactory to jeeapplicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsconnectionfactories/jmsconnectionfactory",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsconnectionfactories/jmsconnectionfactory",
         "addJMSConnectionFactory", "org.apache.kalumet.model.JMSConnectionFactory" );
 
       // jmsserver tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver",
         "org.apache.kalumet.model.JMSServer" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver" );
 
       // jmsqueue tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver/jmsqueues/jmsqueue",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver/jmsqueues/jmsqueue",
         "org.apache.kalumet.model.JMSQueue" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver/jmsqueues/jmsqueue" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver/jmsqueues/jmsqueue" );
 
       // add jmsqueue to jmsserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver/jmsqueues/jmsqueue",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver/jmsqueues/jmsqueue",
         "addJMSQueue", "org.apache.kalumet.model.JMSQueue" );
 
       // jmstopic tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver/jmstopics/jmstopic",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver/jmstopics/jmstopic",
         "org.apache.kalumet.model.JMSTopic" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver/jmstopics/jmstopic" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver/jmstopics/jmstopic" );
 
       // add jmstopic to jmsserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver/jmstopics/jmstopic",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver/jmstopics/jmstopic",
         "addJMSTopic", "org.apache.kalumet.model.JMSTopic" );
 
-      // add jmsserver to j2eeapplicationserver
+      // add jmsserver to jeeapplicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jmsservers/jmsserver",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jmsservers/jmsserver",
         "addJMSServer", "org.apache.kalumet.model.JMSServer" );
 
       // jndibinding tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jndibindings/jndibinding",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jndibindings/jndibinding",
         "org.apache.kalumet.model.JNDIBinding" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jndibindings/jndibinding" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jndibindings/jndibinding" );
 
-      // add jndibinding to j2eeapplicationserver
+      // add jndibinding to jeeapplicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/jndibindings/jndibinding",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jndibindings/jndibinding",
         "addJNDIBinding", "org.apache.kalumet.model.JNDIBinding" );
 
       // sharedlibrary tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/sharedlibrairies/sharedlibrary",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/sharedlibrairies/sharedlibrary",
         "org.apache.kalumet.model.SharedLibrary" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/sharedlibrairies/sharedlibrary" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/sharedlibrairies/sharedlibrary" );
 
-      // add sharedlibrary to j2eeapplicationserver
+      // add sharedlibrary to jeeapplicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/sharedlibrairies/sharedlibrary",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/sharedlibrairies/sharedlibrary",
         "addSharedLibrary", "org.apache.kalumet.model.SharedLibrary" );
 
       // application tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication",
-        "org.apache.kalumet.model.J2EEApplication" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication",
+        "org.apache.kalumet.model.JEEApplication" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication" );
 
       // archive tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/archives/archive",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/archives/archive",
         "org.apache.kalumet.model.Archive" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/archives/archive" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/archives/archive" );
 
       // add archive archive to application
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/archives/archive",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/archives/archive",
         "addArchive", "org.apache.kalumet.model.Archive" );
 
       // contentmanager tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/contentmanagers/contentmanager",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/contentmanagers/contentmanager",
         "org.apache.kalumet.model.ContentManager" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/contentmanagers/contentmanager" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/contentmanagers/contentmanager" );
 
       // contentmanager property tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/contentmanagers/contentmanager/properties/property",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/contentmanagers/contentmanager/properties/property",
         "org.apache.kalumet.model.Property" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/contentmanagers/contentmanager/properties/property" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/contentmanagers/contentmanager/properties/property" );
 
       // add property in contentmanager
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/contentmanagers/contentmanager/properties/property",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/contentmanagers/contentmanager/properties/property",
         "addProperty", "org.apache.kalumet.model.Property" );
 
       // add contentmanager to application
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/contentmanagers/contentmanager",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/contentmanagers/contentmanager",
         "addContentManager", "org.apache.kalumet.model.ContentManager" );
 
       // configurationfile tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/configurationfiles/configurationfile",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/configurationfiles/configurationfile",
         "org.apache.kalumet.model.ConfigurationFile" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/configurationfiles/configurationfile" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/configurationfiles/configurationfile" );
 
       // mapping tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/configurationfiles/configurationfile/mappings/mapping",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/configurationfiles/configurationfile/mappings/mapping",
         "org.apache.kalumet.model.Mapping" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/configurationfiles/configurationfile/mappings/mapping" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/configurationfiles/configurationfile/mappings/mapping" );
 
       // add mapping to configurationfile
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/configurationfiles/configurationfile/mappings/mapping",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/configurationfiles/configurationfile/mappings/mapping",
         "addMapping", "org.apache.kalumet.model.Mapping" );
 
       // add configurationfile to application
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/configurationfiles/configurationfile",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/configurationfiles/configurationfile",
         "addConfigurationFile", "org.apache.kalumet.model.ConfigurationFile" );
 
       // database tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database",
         "org.apache.kalumet.model.Database" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database" );
 
       // sqlscript tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database/sqlscripts/sqlscript",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database/sqlscripts/sqlscript",
         "org.apache.kalumet.model.SqlScript" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database/sqlscripts/sqlscript" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database/sqlscripts/sqlscript" );
 
       // sqlscript mapping tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database/sqlscripts/sqlscript/mappings/mapping",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database/sqlscripts/sqlscript/mappings/mapping",
         "org.apache.kalumet.model.Mapping" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database/sqlscripts/sqlscript/mappings/mapping" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database/sqlscripts/sqlscript/mappings/mapping" );
 
       // add mapping to sqlscript
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database/sqlscripts/sqlscript/mappings/mapping",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database/sqlscripts/sqlscript/mappings/mapping",
         "addMapping", "org.apache.kalumet.model.Mapping" );
 
       // add sqlscript to database
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database/sqlscripts/sqlscript",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database/sqlscripts/sqlscript",
         "addSqlScript", "org.apache.kalumet.model.SqlScript" );
 
       // add database to application
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/j2eeapplication/databases/database",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/jeeapplication/databases/database",
         "addDatabase", "org.apache.kalumet.model.Database" );
 
       // add application to applicationserver
       digester.addSetNext(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/j2eeapplications/application",
-        "addApplication", "org.apache.kalumet.model.J2EEApplication" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/jeeapplications/application",
+        "addApplication", "org.apache.kalumet.model.JEEApplication" );
 
       // cache tag rules
       digester.addObjectCreate(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/caches/cache",
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/caches/cache",
         "org.apache.kalumet.model.Cache" );
       digester.addSetProperties(
-        "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/caches/cache" );
+        "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/caches/cache" );
 
       // add cache to applicationserver
-      digester.addSetNext( "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver/caches/cache",
+      digester.addSetNext( "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver/caches/cache",
                            "addCache", "org.apache.kalumet.model.Cache" );
 
       // add applicationserver to applicationservers tag rule
-      digester.addSetNext( "kalumet/environments/environment/j2eeapplicationservers/j2eeapplicationserver",
-                           "addJ2EEApplicationServer", "org.apache.kalumet.model.J2EEApplicationServer" );
+      digester.addSetNext( "kalumet/environments/environment/jeeapplicationservers/jeeapplicationserver",
+                           "addJEEApplicationServer", "org.apache.kalumet.model.JEEApplicationServer" );
 
       // add applicationservers to environment tag rule
-      digester.addSetNext( "kalumet/environments/environment/j2eeapplicationservers", "setJ2EEApplicationServers",
-                           "org.apache.kalumet.model.J2EEApplicationServers" );
+      digester.addSetNext( "kalumet/environments/environment/jeeapplicationservers", "setJEEApplicationServers",
+                           "org.apache.kalumet.model.JEEApplicationServers" );
 
       // logfile tag rules
       digester.addObjectCreate( "kalumet/environments/environment/logfiles/logfile",

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Software.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Software.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Software.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/model/Software.java Thu Aug 30 17:31:27 2012
@@ -45,7 +45,7 @@ public class Software
 
   private boolean blocker;
 
-  private boolean beforej2ee;
+  private boolean beforejee;
 
   private LinkedList updatePlan;
 
@@ -104,14 +104,14 @@ public class Software
     this.blocker = blocker;
   }
 
-  public boolean isBeforej2ee()
+  public boolean isBeforejee()
   {
-    return beforej2ee;
+    return beforejee;
   }
 
-  public void setBeforej2ee( boolean beforej2ee )
+  public void setBeforejee(boolean beforejee)
   {
-    this.beforej2ee = beforej2ee;
+    this.beforejee = beforejee;
   }
 
   public LinkedList getUpdatePlan()
@@ -319,7 +319,7 @@ public class Software
     clone.setUri( this.getUri() );
     clone.setActive( this.isActive() );
     clone.setBlocker( this.isBlocker() );
-    clone.setBeforej2ee( this.isBeforej2ee() );
+    clone.setBeforejee(this.isBeforejee());
     for ( Iterator updatePlanIterator = this.getUpdatePlan().iterator(); updatePlanIterator.hasNext(); )
     {
       Object item = updatePlanIterator.next();
@@ -357,7 +357,7 @@ public class Software
     element.setAttribute( "agent", this.getAgent() );
     element.setAttribute( "active", new Boolean( this.isActive() ).toString() );
     element.setAttribute( "blocker", new Boolean( this.isBlocker() ).toString() );
-    element.setAttribute( "beforej2ee", new Boolean( this.isBeforej2ee() ).toString() );
+    element.setAttribute( "beforejee", new Boolean( this.isBeforejee() ).toString() );
     ElementImpl updateplan = new ElementImpl( document, "updateplan" );
     element.appendChild( updateplan );
     for ( Iterator updatePlanIterator = this.getUpdatePlan().iterator(); updatePlanIterator.hasNext(); )

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ArchiveClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ArchiveClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ArchiveClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ArchiveClient.java Thu Aug 30 17:31:27 2012
@@ -35,15 +35,15 @@ public class ArchiveClient
   public ArchiveClient( String host, int port )
     throws ClientException
   {
-    super( "http://" + host + ":" + port + "/axis/services/J2EEApplicationArchiveService" );
+    super( "http://" + host + ":" + port + "/axis/services/JEEApplicationArchiveService" );
   }
 
   /**
    * Wrapper method to call archive update.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @param applicationName       the target J2EE application name.
+   * @param applicationServerName the target JEE application server name.
+   * @param applicationName       the target JEE application name.
    * @param archiveName           the target archive name.
    * @param delegation            true if this call is a delegation from another agent, false else.
    * @throws ClientException in case of communication failure.
@@ -59,7 +59,7 @@ public class ArchiveClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE archive " + archiveName + " update failed", e );
+      throw new ClientException( "JEE archive " + archiveName + " update failed", e );
     }
   }
 
@@ -67,10 +67,10 @@ public class ArchiveClient
    * Wrapper method to call archive check.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @param applicationName       the target J2EE application name.
+   * @param applicationServerName the target JEE application server name.
+   * @param applicationName       the target JEE application name.
    * @param archiveName           the target archive name.
-   * @return true if the J2EE application archive is up to date, false else.
+   * @return true if the JEE application archive is up to date, false else.
    * @throws ClientException in case of communication failure.
    */
   public boolean check( String environmentName, String applicationServerName, String applicationName,
@@ -86,7 +86,7 @@ public class ArchiveClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE archive " + archiveName + " check status failed", e );
+      throw new ClientException( "JEE archive " + archiveName + " check status failed", e );
     }
     return upToDate;
   }

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ConfigurationFileClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ConfigurationFileClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ConfigurationFileClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ConfigurationFileClient.java Thu Aug 30 17:31:27 2012
@@ -35,15 +35,15 @@ public class ConfigurationFileClient
   public ConfigurationFileClient( String host, int port )
     throws ClientException
   {
-    super( "http://" + host + ":" + port + "/axis/services/J2EEApplicationConfigurationFileService" );
+    super( "http://" + host + ":" + port + "/axis/services/JEEApplicationConfigurationFileService" );
   }
 
   /**
-   * Wrapper method to update a J2EE application configuration file.
+   * Wrapper method to update a JEE application configuration file.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @param applicationName       the target J2EE application name.
+   * @param applicationServerName the target JEE application server name.
+   * @param applicationName       the target JEE application name.
    * @param configurationFileName the target configuration file name.
    * @param delegation            true if the call is a delegation from another agent, false else.
    * @throws ClientException in case of communication failure.
@@ -60,16 +60,16 @@ public class ConfigurationFileClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE application configuration file " + configurationFileName + " update failed", e );
+      throw new ClientException( "JEE application configuration file " + configurationFileName + " update failed", e );
     }
   }
 
   /**
-   * Wrapper method to check if the J2EE application configuration file is up to date.
+   * Wrapper method to check if the JEE application configuration file is up to date.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @param applicationName       the target J2EE application name.
+   * @param applicationServerName the target JEE application server name.
+   * @param applicationName       the target JEE application name.
    * @param configurationFileName the target configuration file name.
    * @return true if the configuration file is up to date, false else.
    * @throws ClientException in case of communication failure.
@@ -88,7 +88,7 @@ public class ConfigurationFileClient
     catch ( Exception e )
     {
       throw new ClientException(
-        "J2EE application configuration file " + configurationFileName + " status check failed", e );
+        "JEE application configuration file " + configurationFileName + " status check failed", e );
     }
     return upToDate;
   }

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ContentManagerClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ContentManagerClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ContentManagerClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/ContentManagerClient.java Thu Aug 30 17:31:27 2012
@@ -35,15 +35,15 @@ public class ContentManagerClient
   public ContentManagerClient( String host, int port )
     throws ClientException
   {
-    super( "http://" + host + ":" + port + "/axis/services/J2EEApplicationContentManagerService" );
+    super( "http://" + host + ":" + port + "/axis/services/JEEApplicationContentManagerService" );
   }
 
   /**
-   * Wrapper method to update a J2EE application content manager.
+   * Wrapper method to update a JEE application content manager.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @param applicationName       the target J2EE application name.
+   * @param applicationServerName the target JEE application server name.
+   * @param applicationName       the target JEE application name.
    * @param contentManagerName    the target content manager name.
    * @param delegation            true if the call is a delegation from another agent, false else.
    * @throws ClientException

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/DatabaseClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/DatabaseClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/DatabaseClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/DatabaseClient.java Thu Aug 30 17:31:27 2012
@@ -35,15 +35,15 @@ public class DatabaseClient
   public DatabaseClient( String host, int port )
     throws ClientException
   {
-    super( "http://" + host + ":" + port + "/axis/services/J2EEApplicationDatabaseService" );
+    super( "http://" + host + ":" + port + "/axis/services/JEEApplicationDatabaseService" );
   }
 
   /**
    * Wrapper method to update a database.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @param applicationName       the target J2EE application name.
+   * @param applicationServerName the target JEE application server name.
+   * @param applicationName       the target JEE application name.
    * @param databaseName          the target database name.
    * @param delegation            if true, the call is a delegation from another agent, false else.
    * @throws ClientException in case of communication failure.

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCConnectionPoolClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCConnectionPoolClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCConnectionPoolClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCConnectionPoolClient.java Thu Aug 30 17:31:27 2012
@@ -19,7 +19,7 @@
 package org.apache.kalumet.ws.client;
 
 /**
- * J2EE application server JDBC connection pool WS client.
+ * JEE application server JDBC connection pool WS client.
  */
 public class JDBCConnectionPoolClient
   extends AbstractClient
@@ -42,7 +42,7 @@ public class JDBCConnectionPoolClient
    * Wrapper method to update a JDBC connection pool.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param connectionPoolName    the target connection pool name.
    * @throws ClientException in case of communication failure.
    */
@@ -63,7 +63,7 @@ public class JDBCConnectionPoolClient
    * Wrapper method to check if a JDBC connection pool is up to date or not.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param connectionPoolName    the target connection pool name.
    * @return true if the connection pool is up to date, false else.
    * @throws ClientException in case of communication failure.

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCDataSourceClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCDataSourceClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCDataSourceClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JDBCDataSourceClient.java Thu Aug 30 17:31:27 2012
@@ -42,7 +42,7 @@ public class JDBCDataSourceClient
    * Wrapper method to update a JDBC data source.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param dataSourceName        the target data source name.
    * @throws ClientException in case of update failure.
    */
@@ -63,7 +63,7 @@ public class JDBCDataSourceClient
    * Wrapper method to check if a JDBC data source is up to date or not.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param dataSourceName        the target data source name.
    * @return true if the data source is up to date, false else.
    * @throws ClientException in case of check failure.

Copied: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationClient.java (from r1377266, incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationClient.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationClient.java?p2=incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationClient.java&p1=incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationClient.java&r1=1377266&r2=1379028&rev=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationClient.java Thu Aug 30 17:31:27 2012
@@ -20,9 +20,9 @@ package org.apache.kalumet.ws.client;
 
 
 /**
- * J2EEApplication WS client.
+ * JEEApplication WS client.
  */
-public class J2EEApplicationClient
+public class JEEApplicationClient
   extends AbstractClient
 {
 
@@ -33,17 +33,17 @@ public class J2EEApplicationClient
    * @param port port number of the Kalumet agent WS server.
    * @throws ClientException in case of communication failure.
    */
-  public J2EEApplicationClient( String host, int port )
+  public JEEApplicationClient(String host, int port)
     throws ClientException
   {
-    super( "http://" + host + ":" + port + "/axis/services/J2EEApplicationService" );
+    super( "http://" + host + ":" + port + "/axis/services/JEEApplicationService" );
   }
 
   /**
-   * Wrapper method to update a J2EE application.
+   * Wrapper method to update a JEE application.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param applicationName
    * @param delegation
    * @throws ClientException
@@ -58,7 +58,7 @@ public class J2EEApplicationClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE application " + applicationName + " update failed", e );
+      throw new ClientException( "JEE application " + applicationName + " update failed", e );
     }
   }
 

Copied: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationServerClient.java (from r1377266, incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationServerClient.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationServerClient.java?p2=incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationServerClient.java&p1=incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationServerClient.java&r1=1377266&r2=1379028&rev=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationServerClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JEEApplicationServerClient.java Thu Aug 30 17:31:27 2012
@@ -19,9 +19,9 @@
 package org.apache.kalumet.ws.client;
 
 /**
- * J2EE application server WS client.
+ * JEE application server WS client.
  */
-public class J2EEApplicationServerClient
+public class JEEApplicationServerClient
   extends AbstractClient
 {
 
@@ -32,17 +32,17 @@ public class J2EEApplicationServerClient
    * @param port the port number of the Kalumet agent WS server.
    * @throws ClientException in case of communication failure.
    */
-  public J2EEApplicationServerClient( String host, int port )
+  public JEEApplicationServerClient(String host, int port)
     throws ClientException
   {
-    super( "http://" + host + ":" + port + "/axis/services/J2EEApplicationServerService" );
+    super( "http://" + host + ":" + port + "/axis/services/JEEApplicationServerService" );
   }
 
   /**
-   * Wrapper method to stop a J2EE application server.
+   * Wrapper method to stop a JEE application server.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @throws ClientException in case of stop failure.
    */
   public void stop( String environmentName, String applicationServerName )
@@ -54,15 +54,15 @@ public class J2EEApplicationServerClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE application server " + applicationServerName + " stop failed", e );
+      throw new ClientException( "JEE application server " + applicationServerName + " stop failed", e );
     }
   }
 
   /**
-   * Wrapper method to start a J2EE application server.
+   * Wrapper method to start a JEE application server.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @throws ClientException in case of stop failure.
    */
   public void start( String environmentName, String applicationServerName )
@@ -74,16 +74,16 @@ public class J2EEApplicationServerClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE application server " + applicationServerName + " start failed", e );
+      throw new ClientException( "JEE application server " + applicationServerName + " start failed", e );
     }
   }
 
   /**
-   * Wrapper method to check the status of a J2EE application server.
+   * Wrapper method to check the status of a JEE application server.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
-   * @return the current status of the J2EE application server.
+   * @param applicationServerName the target JEE application server name.
+   * @return the current status of the JEE application server.
    * @throws ClientException in case of status check failure.
    */
   public String status( String environmentName, String applicationServerName )
@@ -96,16 +96,16 @@ public class J2EEApplicationServerClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE application server " + applicationServerName + " status check failed", e );
+      throw new ClientException( "JEE application server " + applicationServerName + " status check failed", e );
     }
     return status;
   }
 
   /**
-   * Wrapper method to update a J2EE application server.
+   * Wrapper method to update a JEE application server.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param delegation            if true, the call is a delegation from another agent, false else.
    * @throws ClientException in case of update failure.
    */
@@ -118,7 +118,7 @@ public class J2EEApplicationServerClient
     }
     catch ( Exception e )
     {
-      throw new ClientException( "J2EE application server " + applicationServerName + " update failed", e );
+      throw new ClientException( "JEE application server " + applicationServerName + " update failed", e );
     }
   }
 

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSConnectionFactoryClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSConnectionFactoryClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSConnectionFactoryClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSConnectionFactoryClient.java Thu Aug 30 17:31:27 2012
@@ -42,7 +42,7 @@ public class JMSConnectionFactoryClient
    * Wrapper method to update a JMS connection factory.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param connectionFactoryName the target JMS connection factory.
    * @throws ClientException in case of update failure.
    */
@@ -63,7 +63,7 @@ public class JMSConnectionFactoryClient
    * Wrapper method to check if a JMS connection factory is up to date or not.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param connectionFactoryName the target JMS connection factory name.
    * @return true if the JMS connection factory is up to date, false else.
    * @throws ClientException in case of status check failure.

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSServerClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSServerClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSServerClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JMSServerClient.java Thu Aug 30 17:31:27 2012
@@ -42,7 +42,7 @@ public class JMSServerClient
    * Wrapper method to update a JMS server.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param jmsServerName         the target JMS server name.
    * @throws ClientException in case of update failure.
    */
@@ -63,7 +63,7 @@ public class JMSServerClient
    * Wrapper method to check if a JMS server is up to date or not.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param jmsServerName         the target JMS server name.
    * @return true if the JMS server is up to date, false else.
    * @throws ClientException in case of status check failure.

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JNDIBindingClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JNDIBindingClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JNDIBindingClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/JNDIBindingClient.java Thu Aug 30 17:31:27 2012
@@ -42,7 +42,7 @@ public class JNDIBindingClient
    * Wrapper method to update a JNDI binding.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param jndiBindingName       the target JNDI binding name.
    * @throws ClientException in case of update failure.
    */
@@ -63,7 +63,7 @@ public class JNDIBindingClient
    * Wrapper method to check if a JNDI binding is up to date or not.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param jndiBindingName       the target JNDI binding name.
    * @return true of the JNDI binding is up to date, false else.
    * @throws ClientException in case of status check failure.

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/SharedLibraryClient.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/SharedLibraryClient.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/SharedLibraryClient.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/main/java/org/apache/kalumet/ws/client/SharedLibraryClient.java Thu Aug 30 17:31:27 2012
@@ -42,7 +42,7 @@ public class SharedLibraryClient
    * Wrapper method to update a shared library.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param sharedLibraryName     the target shared library name.
    * @throws ClientException in case of update failure.
    */
@@ -63,7 +63,7 @@ public class SharedLibraryClient
    * Wrapper method to check if a shared library is up to date or not.
    *
    * @param environmentName       the target environment name.
-   * @param applicationServerName the target J2EE application server name.
+   * @param applicationServerName the target JEE application server name.
    * @param sharedLibraryName     the target shared library name.
    * @return true if the shared library is up to date, false else.
    * @throws ClientException in case of status check failure.

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/test/java/org/apache/kalumet/model/KalumetTest.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/test/java/org/apache/kalumet/model/KalumetTest.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/test/java/org/apache/kalumet/model/KalumetTest.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/test/java/org/apache/kalumet/model/KalumetTest.java Thu Aug 30 17:31:27 2012
@@ -78,7 +78,7 @@ public class KalumetTest
     assertEquals( 5000, agent.getPort() );
     assertEquals( "0 * * * * *", agent.getCron() );
     assertEquals( 5, agent.getMaxmanagedenvironments() );
-    assertEquals( 3, agent.getMaxj2eeapplicationserversstarted() );
+    assertEquals( 3, agent.getMaxjeeapplicationserversstarted() );
   }
 
   @Test
@@ -120,13 +120,13 @@ public class KalumetTest
     Access access = kalumetModel.getEnvironment( "test_auto" ).getAccess( "test" );
     assertEquals( "false", access.getProperty( "admin" ).getValue() );
     assertEquals( "true", access.getProperty( "update" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_application_servers_change" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_application_servers_update" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_application_servers_control" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_resources_change" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_resources_update" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_applications_change" ).getValue() );
-    assertEquals( "true", access.getProperty( "j2ee_applications_update" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_application_servers_change" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_application_servers_update" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_application_servers_control" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_resources_change" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_resources_update" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_applications_change" ).getValue() );
+    assertEquals( "true", access.getProperty( "jee_applications_update" ).getValue() );
     assertEquals( "true", access.getProperty( "softwares_change" ).getValue() );
     assertEquals( "true", access.getProperty( "softwares_update" ).getValue() );
     assertEquals( "true", access.getProperty( "release" ).getValue() );
@@ -146,19 +146,19 @@ public class KalumetTest
   }
 
   @Test
-  public void testJ2EEApplicationServersUnmarshalling()
+  public void testJEEApplicationServersUnmarshalling()
   {
-    LOGGER.info( "Get Kalumet test_auto environment J2EE application servers" );
-    J2EEApplicationServers applicationServers = kalumetModel.getEnvironment( "test_auto" ).getJ2EEApplicationServers();
+    LOGGER.info( "Get Kalumet test_auto environment JEE application servers" );
+    JEEApplicationServers applicationServers = kalumetModel.getEnvironment( "test_auto" ).getJEEApplicationServers();
     assertEquals( false, applicationServers.isCluster() );
   }
 
   @Test
-  public void testJ2EEApplicationServerUnmarshalling()
+  public void testJEEApplicationServerUnmarshalling()
   {
-    LOGGER.info( "Get Kalumet test_auto environment as_test J2EE application server" );
-    J2EEApplicationServer applicationServer =
-      kalumetModel.getEnvironment( "test_auto" ).getJ2EEApplicationServers().getJ2EEApplicationServer( "as_test" );
+    LOGGER.info( "Get Kalumet test_auto environment as_test JEE application server" );
+    JEEApplicationServer applicationServer =
+      kalumetModel.getEnvironment( "test_auto" ).getJEEApplicationServers().getJEEApplicationServer("as_test");
     assertEquals( "org.apache.kalumet.jmx.plugins.DummyPlugin", applicationServer.getClassname() );
     assertEquals( "dummy://localhost:1099", applicationServer.getJmxurl() );
     assertEquals( "admin_user", applicationServer.getAdminuser() );
@@ -175,20 +175,20 @@ public class KalumetTest
   @Test
   public void testJDBCConnectionPoolUnmarshalling()
   {
-    LOGGER.info( "Get Kalumet test_auto environment, as_test J2EE application server, JDBC connection pool test" );
+    LOGGER.info( "Get Kalumet test_auto environment, as_test JEE application server, JDBC connection pool test" );
     JDBCConnectionPool connectionPool =
-      kalumetModel.getEnvironment( "test_auto" ).getJ2EEApplicationServers().getJ2EEApplicationServer(
-        "as_test" ).getJDBCConnectionPool( "test" );
+      kalumetModel.getEnvironment( "test_auto" ).getJEEApplicationServers().getJEEApplicationServer(
+              "as_test").getJDBCConnectionPool( "test" );
     assertEquals( "test", connectionPool.getName() );
   }
 
   @Test
   public void testJDBCDataSourceUnmarshalling()
   {
-    LOGGER.info( "Get Kalumet test_auto environment, as_test J2EE application server, JDBC data source test" );
+    LOGGER.info( "Get Kalumet test_auto environment, as_test JEE application server, JDBC data source test" );
     JDBCDataSource dataSource =
-      kalumetModel.getEnvironment( "test_auto" ).getJ2EEApplicationServers().getJ2EEApplicationServer(
-        "as_test" ).getJDBCDataSource( "test" );
+      kalumetModel.getEnvironment( "test_auto" ).getJEEApplicationServers().getJEEApplicationServer(
+              "as_test").getJDBCDataSource( "test" );
     assertEquals( "test", dataSource.getName() );
   }
 
@@ -202,7 +202,7 @@ public class KalumetTest
     assertEquals( "test", software.getAgent() );
     assertEquals( true, software.isActive() );
     assertEquals( false, software.isBlocker() );
-    assertEquals( false, software.isBeforej2ee() );
+    assertEquals( false, software.isBeforejee() );
   }
 
   @Test

Modified: incubator/kalumet/trunk/kalumet-modules/common/src/test/resources/kalumet.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/common/src/test/resources/kalumet.xml?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/common/src/test/resources/kalumet.xml (original)
+++ incubator/kalumet/trunk/kalumet-modules/common/src/test/resources/kalumet.xml Thu Aug 30 17:31:27 2012
@@ -38,7 +38,7 @@
 
   <agents>
     <agent id="test" hostname="localhost" port="5000" cron="0 * * * * *" maxmanagedenvironments="5"
-           maxj2eeapplicationserversstarted="3"/>
+           maxjeeapplicationserversstarted="3"/>
   </agents>
 
   <environments>
@@ -69,13 +69,13 @@ field
           <properties>
             <property name="admin" value="false"/>
             <property name="update" value="true"/>
-            <property name="j2ee_application_servers_change" value="true"/>
-            <property name="j2ee_application_servers_update" value="true"/>
-            <property name="j2ee_application_servers_control" value="true"/>
-            <property name="j2ee_resources_change" value="true"/>
-            <property name="j2ee_resources_update" value="true"/>
-            <property name="j2ee_applications_change" value="true"/>
-            <property name="j2ee_applications_update" value="true"/>
+            <property name="jee_application_servers_change" value="true"/>
+            <property name="jee_application_servers_update" value="true"/>
+            <property name="jee_application_servers_control" value="true"/>
+            <property name="jee_resources_change" value="true"/>
+            <property name="jee_resources_update" value="true"/>
+            <property name="jee_applications_change" value="true"/>
+            <property name="jee_applications_update" value="true"/>
             <property name="softwares_change" value="true"/>
             <property name="softwares_update" value="true"/>
             <property name="release" value="true"/>
@@ -88,8 +88,8 @@ field
       <logfiles>
         <logfile name="test" path="/tmp" agent="test"/>
       </logfiles>
-      <j2eeapplicationservers cluster="false">
-        <j2eeapplicationserver name="as_test" classname="org.apache.kalumet.jmx.plugins.DummyPlugin"
+      <jeeapplicationservers cluster="false">
+        <jeeapplicationserver name="as_test" classname="org.apache.kalumet.jmx.plugins.DummyPlugin"
                                jmxurl="dummy://localhost:1099" adminuser="admin_user" adminpassword="admin_password"
                                updateRequireRestart="true" updateRequireCacheCleaning="true" usejmxstop="false"
                                deletecomponents="false" agent="test">
@@ -109,11 +109,11 @@ echo "Shutdown"
           <jdbcdatasources>
             <jdbcdatasource name="test"/>
           </jdbcdatasources>
-        </j2eeapplicationserver>
-      </j2eeapplicationservers>
+        </jeeapplicationserver>
+      </jeeapplicationservers>
       <softwares>
         <software name="test" uri="http://www.example.com/software" agent="test" active="true" blocker="false"
-                  beforej2ee="false">
+                  beforejee="false">
           <updateplan>
             <command name="command_test" agent="test" active="true" blocker="false">
               <![CDATA[

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/AdminAgentWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/AdminAgentWindow.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/AdminAgentWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/AdminAgentWindow.java Thu Aug 30 17:31:27 2012
@@ -176,7 +176,7 @@ public class AdminAgentWindow
       }
       agent.setCron( newCron );
       agent.setMaxmanagedenvironments( new Integer( newMaxEnvironments ).intValue() );
-      agent.setMaxj2eeapplicationserversstarted( new Integer( newMaxEnvironmentsActive ).intValue() );
+      agent.setMaxjeeapplicationserversstarted(new Integer(newMaxEnvironmentsActive).intValue());
       if ( agentId == null || agentId.trim().length() < 1 )
       {
         // it's a new agent
@@ -206,7 +206,7 @@ public class AdminAgentWindow
       portField.setText( new Integer( clone.getPort() ).toString() );
       cronField.setText( clone.getCron() );
       maxEnvironmentsField.setText( new Integer( clone.getMaxmanagedenvironments() ).toString() );
-      maxActiveApplicationServersField.setText( new Integer( clone.getMaxj2eeapplicationserversstarted() ).toString() );
+      maxActiveApplicationServersField.setText( new Integer( clone.getMaxjeeapplicationserversstarted() ).toString() );
     }
   };
 
@@ -504,7 +504,7 @@ public class AdminAgentWindow
     portField.setText( new Integer( agent.getPort() ).toString() );
     cronField.setText( agent.getCron() );
     maxEnvironmentsField.setText( new Integer( agent.getMaxmanagedenvironments() ).toString() );
-    maxActiveApplicationServersField.setText( new Integer( agent.getMaxj2eeapplicationserversstarted() ).toString() );
+    maxActiveApplicationServersField.setText( new Integer( agent.getMaxjeeapplicationserversstarted() ).toString() );
   }
 
 }

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchiveWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchiveWindow.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchiveWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchiveWindow.java Thu Aug 30 17:31:27 2012
@@ -112,20 +112,20 @@ public class ApplicationArchiveWindow
                         archiveName );
         if ( uptodate )
         {
-          message = "J2EE application " + parent.getParentPane().getApplicationName() + " archive " + archiveName
+          message = "JEE application " + parent.getParentPane().getApplicationName() + " archive " + archiveName
             + " is up to date.";
         }
         else
         {
           failure = true;
-          message = "J2EE appliction " + parent.getParentPane().getApplicationName() + " archive " + archiveName
+          message = "JEE appliction " + parent.getParentPane().getApplicationName() + " archive " + archiveName
             + " is not up to date.";
         }
       }
       catch ( Exception e )
       {
         failure = true;
-        message = "J2EE application " + parent.getParentPane().getApplicationName() + " archive " + archiveName
+        message = "JEE application " + parent.getParentPane().getApplicationName() + " archive " + archiveName
           + " status check failed: " + e.getMessage();
       }
       finally
@@ -168,7 +168,7 @@ public class ApplicationArchiveWindow
       catch ( Exception e )
       {
         failure = true;
-        message = "J2EE application " + parent.getParentPane().getApplicationName() + " archive " + archiveName
+        message = "JEE application " + parent.getParentPane().getApplicationName() + " archive " + archiveName
           + " update failed: " + e.getMessage();
       }
       finally
@@ -302,7 +302,7 @@ public class ApplicationArchiveWindow
       // add a change event
       if ( archiveName != null )
       {
-        String change = "Modify J2EE application archive " + nameFieldValue;
+        String change = "Modify JEE application archive " + nameFieldValue;
         if ( !archive.getUri().equals( uriFieldValue ) )
         {
           change += " URI from " + archive.getUri() + " to " + uriFieldValue;
@@ -359,7 +359,7 @@ public class ApplicationArchiveWindow
         {
           parent.getParentPane().getApplication().addArchive( archive );
           parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-            "Add J2EE application archive " + archive.getName() );
+            "Add JEE application archive " + archive.getName() );
         }
         catch ( Exception e )
         {

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchivesPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchivesPane.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchivesPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationArchivesPane.java Thu Aug 30 17:31:27 2012
@@ -37,7 +37,7 @@ import org.apache.kalumet.ws.client.Arch
 import java.util.Iterator;
 
 /**
- * J2EE application archives pane.
+ * JEE application archives pane.
  */
 public class ApplicationArchivesPane
   extends ContentPane
@@ -79,20 +79,20 @@ public class ApplicationArchivesPane
                         parent.getApplicationName(), archiveName );
         if ( uptodate )
         {
-          message = "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " is up to date.";
+          message = "JEE application " + parent.getApplicationName() + " archive " + archiveName + " is up to date.";
         }
         else
         {
           failure = true;
           message =
-            "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " is not up to date.";
+            "JEE application " + parent.getApplicationName() + " archive " + archiveName + " is not up to date.";
         }
       }
       catch ( Exception e )
       {
         failure = true;
         message =
-          "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " status check failed: "
+          "JEE application " + parent.getApplicationName() + " archive " + archiveName + " status check failed: "
             + e.getMessage();
       }
       finally
@@ -136,7 +136,7 @@ public class ApplicationArchivesPane
       catch ( Exception e )
       {
         failure = true;
-        message = "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " update failed: "
+        message = "JEE application " + parent.getApplicationName() + " archive " + archiveName + " update failed: "
           + e.getMessage();
       }
       finally
@@ -180,13 +180,13 @@ public class ApplicationArchivesPane
       {
         archive.setActive( false );
         parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-          "Disable J2EE application archive " + archive.getName() );
+          "Disable JEE application archive " + archive.getName() );
       }
       else
       {
         archive.setActive( true );
         parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-          "Enable J2EE application archive " + archive.getName() );
+          "Enable JEE application archive " + archive.getName() );
       }
       // change the updated flag
       parent.getParentPane().getEnvironmentWindow().setUpdated( true );
@@ -231,13 +231,13 @@ public class ApplicationArchivesPane
       {
         archive.setBlocker( false );
         parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-          "Set not blocker for J2EE application archive " + archive.getName() );
+          "Set not blocker for JEE application archive " + archive.getName() );
       }
       else
       {
         archive.setBlocker( true );
         parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-          "Set blocker for J2EE application archive " + archive.getName() );
+          "Set blocker for JEE application archive " + archive.getName() );
       }
       // change the updated flag
       parent.getParentPane().getEnvironmentWindow().setUpdated( true );
@@ -289,7 +289,7 @@ public class ApplicationArchivesPane
             parent.getApplication().getArchives().remove( archive );
             // add a change event
             parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-              "Delete J2EE application archive " + archive.getName() );
+              "Delete JEE application archive " + archive.getName() );
             // change the updated flag
             parent.getParentPane().getEnvironmentWindow().setUpdated( true );
             // update the journal log tab pane
@@ -317,10 +317,10 @@ public class ApplicationArchivesPane
       String archiveName = event.getActionCommand();
       // add a message into the log pane and in the journal
       KalumetConsoleApplication.getApplication().getLogPane().addInfo(
-        "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " status check in progress...",
+        "JEE application " + parent.getApplicationName() + " archive " + archiveName + " status check in progress...",
         parent.getParentPane().getEnvironmentWindow().getEnvironmentName() );
       parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-        "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " check requested." );
+        "JEE application " + parent.getApplicationName() + " archive " + archiveName + " check requested." );
       // start the status thread
       final StatusThread statusThread = new StatusThread();
       statusThread.archiveName = archiveName;
@@ -398,10 +398,10 @@ public class ApplicationArchivesPane
           {
             // add a message in the log pane and in the journal
             KalumetConsoleApplication.getApplication().getLogPane().addInfo(
-              "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " update in progress...",
+              "JEE application " + parent.getApplicationName() + " archive " + archiveName + " update in progress...",
               parent.getParentPane().getEnvironmentWindow().getEnvironmentName() );
             parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-              "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " update requested." );
+              "JEE application " + parent.getApplicationName() + " archive " + archiveName + " update requested." );
             // start the update thread
             final UpdateThread updateThread = new UpdateThread();
             updateThread.archiveName = archiveName;
@@ -423,10 +423,10 @@ public class ApplicationArchivesPane
                   else
                   {
                     KalumetConsoleApplication.getApplication().getLogPane().addConfirm(
-                      "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " updated.",
+                      "JEE application " + parent.getApplicationName() + " archive " + archiveName + " updated.",
                       parent.getParentPane().getEnvironmentWindow().getEnvironmentName() );
                     parent.getParentPane().getEnvironmentWindow().getChangeEvents().add(
-                      "J2EE application " + parent.getApplicationName() + " archive " + archiveName + " updated" );
+                      "JEE application " + parent.getApplicationName() + " archive " + archiveName + " updated" );
                   }
                 }
                 else

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationConfigurationFileWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationConfigurationFileWindow.java?rev=1379028&r1=1379027&r2=1379028&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationConfigurationFileWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ApplicationConfigurationFileWindow.java Thu Aug 30 17:31:27 2012
@@ -46,7 +46,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * J2EE application configuration file window.
+ * JEE application configuration file window.
  */
 public class ApplicationConfigurationFileWindow
   extends WindowPane
@@ -108,20 +108,20 @@ public class ApplicationConfigurationFil
                         configurationFileName );
         if ( uptodate )
         {
-          message = "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+          message = "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
             + configurationFileName + " is up to date.";
         }
         else
         {
           failure = true;
-          message = "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+          message = "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
             + configurationFileName + " is not up to date.";
         }
       }
       catch ( Exception e )
       {
         failure = true;
-        message = "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+        message = "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
           + configurationFileName + " status check failed: " + e.getMessage();
       }
       finally
@@ -164,7 +164,7 @@ public class ApplicationConfigurationFil
       catch ( Exception e )
       {
         failure = true;
-        message = "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+        message = "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
           + configurationFileName + " update failed: " + e.getMessage();
       }
       finally
@@ -231,7 +231,7 @@ public class ApplicationConfigurationFil
             parent.getParentPane().getApplication().getConfigurationFiles().remove( configurationFile );
             // add a change event
             parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-              "Delete J2EE application configuration file " + configurationFile.getName() );
+              "Delete JEE application configuration file " + configurationFile.getName() );
             // change the updated flag
             parent.getParentPane().getParentPane().getEnvironmentWindow().setUpdated( true );
             // update the journal log tab pane
@@ -289,7 +289,7 @@ public class ApplicationConfigurationFil
       if ( configurationFileName != null )
       {
         parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-          "Change J2EE application configuration file " + configurationFile.getName() );
+          "Change JEE application configuration file " + configurationFile.getName() );
       }
       // update the configuration file object
       configurationFile.setName( nameFieldValue );
@@ -319,7 +319,7 @@ public class ApplicationConfigurationFil
         {
           parent.getParentPane().getApplication().addConfigurationFile( configurationFile );
           parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-            "Add J2EE application configuration file " + configurationFile.getName() );
+            "Add JEE application configuration file " + configurationFile.getName() );
         }
         catch ( Exception e )
         {
@@ -361,11 +361,11 @@ public class ApplicationConfigurationFil
       }
       // add a message into the log pane and the journal
       KalumetConsoleApplication.getApplication().getLogPane().addInfo(
-        "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+        "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
           + configurationFileName + " status check in progress...",
         parent.getParentPane().getParentPane().getEnvironmentWindow().getEnvironmentName() );
       parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-        "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+        "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
           + configurationFileName + " status check requested." );
       // start the status thread
       final StatusThread statusThread = new StatusThread();
@@ -439,11 +439,11 @@ public class ApplicationConfigurationFil
           {
             // add a message into the log pane and the journal
             KalumetConsoleApplication.getApplication().getLogPane().addInfo(
-              "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+              "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
                 + configurationFileName + " update in progress...",
               parent.getParentPane().getParentPane().getEnvironmentWindow().getEnvironmentName() );
             parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-              "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+              "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
                 + configurationFileName + " update requested." );
             // start the update thread
             final UpdateThread updateThread = new UpdateThread();
@@ -466,11 +466,11 @@ public class ApplicationConfigurationFil
                   else
                   {
                     KalumetConsoleApplication.getApplication().getLogPane().addConfirm(
-                      "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+                      "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
                         + configurationFileName + " updated.",
                       parent.getParentPane().getParentPane().getEnvironmentWindow().getEnvironmentName() );
                     parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-                      "J2EE application " + parent.getParentPane().getApplicationName() + " configuration file "
+                      "JEE application " + parent.getParentPane().getApplicationName() + " configuration file "
                         + configurationFileName + " updated." );
                   }
                 }
@@ -519,7 +519,7 @@ public class ApplicationConfigurationFil
       configurationFile.getMappings().remove( mapping );
       // add a change event
       parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-        "Delete J2EE application configuration file " + configurationFile.getName() + " mapping " + mapping.getKey() );
+        "Delete JEE application configuration file " + configurationFile.getName() + " mapping " + mapping.getKey() );
       // change the updated flag
       parent.getParentPane().getParentPane().getEnvironmentWindow().setUpdated( true );
       // update the journal log tab pane
@@ -592,7 +592,7 @@ public class ApplicationConfigurationFil
       }
       // add a change event
       parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-        "Change J2EE application configuration file " + configurationFile.getName() + " mapping " + mapping.getKey() );
+        "Change JEE application configuration file " + configurationFile.getName() + " mapping " + mapping.getKey() );
       // update the mapping
       mapping.setKey( keyFieldValue );
       mapping.setValue( valueFieldValue );
@@ -652,7 +652,7 @@ public class ApplicationConfigurationFil
       }
       // add a change event
       parent.getParentPane().getParentPane().getEnvironmentWindow().getChangeEvents().add(
-        "Add J2EE application configuration file " + configurationFile.getName() + " mapping " + mapping.getKey() );
+        "Add JEE application configuration file " + configurationFile.getName() + " mapping " + mapping.getKey() );
       // change the updated flag
       parent.getParentPane().getParentPane().getEnvironmentWindow().setUpdated( true );
       // update the journal log tab pane



Mime
View raw message