incubator-kalumet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1187742 [1/2] - in /incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet: ./ model/ ws/client/
Date Sat, 22 Oct 2011 18:01:27 GMT
Author: jbonofre
Date: Sat Oct 22 18:01:26 2011
New Revision: 1187742

URL: http://svn.apache.org/viewvc?rev=1187742&view=rev
Log:
Update the Kalumet model to be clearer.
Complete all WS clients.

Added:
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Application.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServer.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServer.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServers.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServers.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCConnectionPool.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ConnectionPool.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCDataSource.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/DataSource.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JNDIBinding.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/NameSpaceBinding.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/EnvironmentClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/FileClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/J2EEApplicationServerClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/JDBCConnectionPoolClient.java
      - copied, changed from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/ConnectionPoolClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/JDBCDataSourceClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/JMSConnectionFactoryClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/JMSServerClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/JNDIBindingClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/SharedLibraryClient.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/SimplifiedFileObject.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/SoftwareClient.java
Removed:
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Application.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServer.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServers.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ConnectionPool.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/DataSource.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/NameSpaceBinding.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/ConnectionPoolClient.java
Modified:
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/FileManipulator.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Environment.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Kalumet.java
    incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/ws/client/ApplicationClient.java

Modified: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/FileManipulator.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/FileManipulator.java?rev=1187742&r1=1187741&r2=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/FileManipulator.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/FileManipulator.java Sat Oct 22 18:01:26 2011
@@ -23,7 +23,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.vfs.*;
-import org.apache.kalumet.model.Application;
+import org.apache.kalumet.model.J2EEApplication;
 import org.apache.kalumet.model.Environment;
 import org.apache.kalumet.model.Software;
 import org.apache.oro.text.regex.*;
@@ -459,16 +459,16 @@ public class FileManipulator {
     }
 
     /**
-     * Creates an environment application cache directory.
+     * Creates an environment j2EEApplication cache directory.
      *
      * @param environment the <code>Environment</code>.
-     * @param application the <code>Application</code>.
-     * @return the environment application cache directory path.
+     * @param j2EEApplication the <code>J2EEApplication</code>.
+     * @return the environment j2EEApplication cache directory path.
      * @throws FileManipulatorException in case of creation failure.
      */
-    public static String createEnvironmentApplicationCacheDir(Environment environment, Application application) throws FileManipulatorException {
+    public static String createEnvironmentApplicationCacheDir(Environment environment, J2EEApplication j2EEApplication) throws FileManipulatorException {
         String directory = FileManipulator.createEnvironmentCacheDir(environment);
-        directory = directory + "/applications/" + application.getName();
+        directory = directory + "/applications/" + j2EEApplication.getName();
         FileManipulator fileManipulator = FileManipulator.getInstance();
         fileManipulator.createDirectory(directory);
         return directory;

Modified: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Environment.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Environment.java?rev=1187742&r1=1187741&r2=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Environment.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Environment.java Sat Oct 22 18:01:26 2011
@@ -47,7 +47,7 @@ public class Environment implements Seri
    private LinkedList variables;
    private LinkedList freeFields;
    private LinkedList accesses;
-   private ApplicationServers applicationServers;
+   private J2EEApplicationServers j2EEApplicationServers;
    private LinkedList softwares;
    private LinkedList logFiles;
    private Notifiers notifiers;
@@ -58,7 +58,7 @@ public class Environment implements Seri
       this.variables = new LinkedList();
       this.freeFields = new LinkedList();
       this.accesses = new LinkedList();
-      this.applicationServers = new ApplicationServers();
+      this.j2EEApplicationServers = new J2EEApplicationServers();
       this.softwares = new LinkedList();
       this.logFiles = new LinkedList();
       this.notifiers = new Notifiers();
@@ -289,23 +289,23 @@ public class Environment implements Seri
    }
 
    /**
-    * Set the <code>ApplicationServers</code> container in the
+    * Set the <code>J2EEApplicationServers</code> container in the
     * <code>Environment</code>.
     * 
-    * @param applicationServers the <code>ApplicationServers</code> to set.
+    * @param j2EEApplicationServers the <code>J2EEApplicationServers</code> to set.
     */
-   public void setApplicationServers(ApplicationServers applicationServers) {
-      this.applicationServers = applicationServers;
+   public void setJ2EEApplicationServers(J2EEApplicationServers j2EEApplicationServers) {
+      this.j2EEApplicationServers = j2EEApplicationServers;
    }
 
    /**
-    * Get the <code>ApplicationServers</code> container in the
+    * Get the <code>J2EEApplicationServers</code> container in the
     * <code>Environment</code>.
     * 
-    * @return the <code>ApplicationServers</code> container.
+    * @return the <code>J2EEApplicationServers</code> container.
     */
-   public ApplicationServers getApplicationServers() {
-      return this.applicationServers;
+   public J2EEApplicationServers getJ2EEApplicationServers() {
+      return this.j2EEApplicationServers;
    }
 
    /**
@@ -517,7 +517,7 @@ public class Environment implements Seri
           Access access = (Access)accessIterator.next();
           clone.accesses.add((Access)access.clone());
       }
-      clone.setApplicationServers((ApplicationServers) this.getApplicationServers().clone());
+      clone.setJ2EEApplicationServers((J2EEApplicationServers) this.getJ2EEApplicationServers().clone());
       for (Iterator softwareIterator = this.softwares.iterator(); softwareIterator.hasNext(); ) {
           Software software = (Software)softwareIterator.next();
           clone.softwares.add((Software)software.clone());
@@ -588,7 +588,7 @@ public class Environment implements Seri
       weblinks.appendChild(weblinksContent);
       element.appendChild(weblinks);
       // add J2EE servers
-      element.appendChild(this.getApplicationServers().toDOMElement(document));
+      element.appendChild(this.getJ2EEApplicationServers().toDOMElement(document));
       // softwares element
       ElementImpl softwares = new ElementImpl(document, "softwares");
       // add software to softwares

Copied: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java (from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Application.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java?p2=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java&p1=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Application.java&r1=1187715&r2=1187742&rev=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/Application.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplication.java Sat Oct 22 18:01:26 2011
@@ -28,9 +28,9 @@ import org.apache.xerces.dom.ElementImpl
 import org.w3c.dom.Element;
 
 /**
- * Represents the <code>application</code> tag in the Kalumet DOM.
+ * Represents the <code>j2eeapplication</code> tag in the Kalumet DOM.
  */
-public class Application implements Serializable, Cloneable, Comparable {
+public class J2EEApplication implements Serializable, Cloneable, Comparable {
 
    private static final long serialVersionUID = -1198170476993837094L;
 
@@ -45,9 +45,9 @@ public class Application implements Seri
    private LinkedList databases;
 
    /**
-    * Default constructor to create a <code>Application</code>
+    * Default constructor to create a <code>J2EEApplication</code>
     */
-   public Application() {
+   public J2EEApplication() {
       this.archives = new LinkedList();
       this.contentManagers = new LinkedList();
       this.configurationFiles = new LinkedList();
@@ -95,7 +95,7 @@ public class Application implements Seri
    }
 
    /**
-    * Add a new <code>Archive</code> in the <code>Application</code> archives container.
+    * Add a new <code>Archive</code> in the <code>J2EEApplication</code> archives container.
     * 
     * @param archive the <code>Archive</code> to add.
     * @throws ModelObjectAlreadyExistsException if the archive name already exists in the application.
@@ -108,7 +108,7 @@ public class Application implements Seri
    }
 
    /**
-    * Get the <code>Archive</code> list in the <code>Application</code> archives container.
+    * Get the <code>Archive</code> list in the <code>J2EEApplication</code> archives container.
     * 
     * @return the <code>Archive</code> list
     */
@@ -117,7 +117,7 @@ public class Application implements Seri
    }
 
    /**
-    * Overwrite the <code>Archive</code> list in the <code>Application</code> archives container.
+    * Overwrite the <code>Archive</code> list in the <code>J2EEApplication</code> archives container.
     * 
     * @param archives the new <code>Archive</code> list.
     */
@@ -126,7 +126,7 @@ public class Application implements Seri
    }
 
    /**
-    * Get the <code>Archive</code> identified by a given name in the <code>Application</code> archives container.
+    * Get the <code>Archive</code> identified by a given name in the <code>J2EEApplication</code> archives container.
     * 
     * @param name the <code>Archive</code> name.
     * @return the <code>Archive</code> found or null if not found.
@@ -142,7 +142,7 @@ public class Application implements Seri
    }
 
    /**
-    * Add a new <code>ContentManager</code> in the <code>Application</code> content managers container.
+    * Add a new <code>ContentManager</code> in the <code>J2EEApplication</code> content managers container.
     * 
     * @param contentManager the <code>ContentManager</code> to add.
     * @throws ModelObjectAlreadyExistsException if the <code>ContentManager</code> already exists in the application.
@@ -155,7 +155,7 @@ public class Application implements Seri
    }
 
    /**
-    * Get the <code>ContentManager</code> list in the <code>Application</code> content managers container.
+    * Get the <code>ContentManager</code> list in the <code>J2EEApplication</code> content managers container.
     * 
     * @return the <code>ContentManager</code> list.
     */
@@ -164,7 +164,7 @@ public class Application implements Seri
    }
 
    /**
-    * Overwrite the <code>ContentManager</code> list in the <code>Application</code> content managers container.
+    * Overwrite the <code>ContentManager</code> list in the <code>J2EEApplication</code> content managers container.
     * 
     * @param contentManagers the new <code>ContentManagers</code> list.
     */
@@ -173,7 +173,7 @@ public class Application implements Seri
    }
 
    /**
-    * Return the <code>ContentManager</code> identified by a given name in the <code>Application</code> content managers container.
+    * Return the <code>ContentManager</code> identified by a given name in the <code>J2EEApplication</code> content managers container.
     * 
     * @return the <code>ContentManager</code> found or null if not found.
     */
@@ -188,7 +188,7 @@ public class Application implements Seri
    }
 
    /**
-    * Add a new <code>ConfigurationFile</code> in the <code>Application</code>
+    * Add a new <code>ConfigurationFile</code> in the <code>J2EEApplication</code>
     * configuration files container.
     * 
     * @param configurationFile the <code>ConfigurationFile</code> to add.
@@ -203,7 +203,7 @@ public class Application implements Seri
 
    /**
     * Get the <code>ConfigurationFile</code> list in the
-    * <code>Application</code> configuration files container.
+    * <code>J2EEApplication</code> configuration files container.
     * 
     * @return the <code>ConfigurationFile</code> list.
     */
@@ -213,7 +213,7 @@ public class Application implements Seri
 
    /**
     * Overwrite the <code>ConfigurationFile</code> list in the
-    * <code>Application</code> configuration files container.
+    * <code>J2EEApplication</code> configuration files container.
     * 
     * @param configurationFiles the new <code>ConfigurationFile</code> list.
     */
@@ -223,7 +223,7 @@ public class Application implements Seri
 
    /**
     * Get the <code>ConfigurationFile</code> identified by a given name in the
-    * <code>Application</code> configuration files container.
+    * <code>J2EEApplication</code> configuration files container.
     * 
     * @param name the <code>ConfigurationFile</code> name.
     * @return the <code>ConfigurationFile</code> found or null if not found.
@@ -239,7 +239,7 @@ public class Application implements Seri
    }
 
    /**
-    * Add a new <code>Database</code> in the <code>Application</code>
+    * Add a new <code>Database</code> in the <code>J2EEApplication</code>
     * databases container.
     * 
     * @param database the <code>Database</code> to add.
@@ -253,7 +253,7 @@ public class Application implements Seri
    }
 
    /**
-    * Get the <code>Database</code> list in the <code>Application</code>
+    * Get the <code>Database</code> list in the <code>J2EEApplication</code>
     * databases container.
     * 
     * @return the <code>Database</code> list.
@@ -263,7 +263,7 @@ public class Application implements Seri
    }
 
    /**
-    * Overwrite the <code>Database</code> list in the <code>Application</code>
+    * Overwrite the <code>Database</code> list in the <code>J2EEApplication</code>
     * databases container.
     * 
     * @param databases the new <code>Database</code> list.
@@ -274,7 +274,7 @@ public class Application implements Seri
 
    /**
     * Get the <code>Database</code> identified by a given name in the
-    * <code>Application</code> databases container.
+    * <code>J2EEApplication</code> databases container.
     * 
     * @param name the <code>Database</code> name.
     * @return the <code>Database</code> found or null if not found.
@@ -293,7 +293,7 @@ public class Application implements Seri
     * @see java.lang.Object#clone()
     */
    public Object clone() throws CloneNotSupportedException {
-      Application clone = new Application();
+      J2EEApplication clone = new J2EEApplication();
       clone.setName(this.getName());
       clone.setUri(this.getUri());
       clone.setActive(this.isActive());
@@ -319,13 +319,13 @@ public class Application implements Seri
    }
 
    /**
-    * Transforms the <code>Application</code> POJO to a DOM element.
+    * Transforms the <code>J2EEApplication</code> POJO to a DOM element.
     * 
     * @param document the core DOM document.
     * @return the DOM element.
     */
    protected Element toDOMElement(CoreDocumentImpl document) {
-      ElementImpl element = new ElementImpl(document, "application");
+      ElementImpl element = new ElementImpl(document, "j2eeapplication");
       element.setAttribute("name", this.getName());
       element.setAttribute("uri", this.getUri());
       element.setAttribute("active", new Boolean(this.isActive()).toString());
@@ -366,7 +366,7 @@ public class Application implements Seri
     * @see java.lang.Comparable#compareTo(java.lang.Object)
     */
    public int compareTo(Object anotherApplication) {
-       return this.getName().compareTo(((Application)anotherApplication).getName());
+       return this.getName().compareTo(((J2EEApplication)anotherApplication).getName());
    }
 
 }
\ No newline at end of file

Copied: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServer.java (from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServer.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServer.java?p2=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServer.java&p1=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServer.java&r1=1187715&r2=1187742&rev=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServer.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServer.java Sat Oct 22 18:01:26 2011
@@ -29,9 +29,9 @@ import org.apache.xerces.dom.ElementImpl
 import org.w3c.dom.Element;
 
 /**
- * Represents the <code>applicationserver</code> tag in the Kalumet DOM.
+ * Represents the <code>j2eeapplicationserver</code> tag in the Kalumet DOM.
  */
-public class ApplicationServer implements Serializable, Cloneable, Comparable {
+public class J2EEApplicationServer implements Serializable, Cloneable, Comparable {
 
     private static final long serialVersionUID = 2272703476099937797L;
 
@@ -49,27 +49,27 @@ public class ApplicationServer implement
     private String startupcommand;
     private String shutdowncommand;
     private String agent;
-    private LinkedList connectionPools;
-    private LinkedList dataSources;
+    private LinkedList jdbcConnectionPools;
+    private LinkedList jdbcDataSources;
     private LinkedList jmsConnectionFactories;
     private LinkedList jmsServers;
-    private LinkedList nameSpaceBindings;
+    private LinkedList jndiBindings;
     private LinkedList sharedLibraries;
-    private LinkedList applications;
+    private LinkedList j2eeApplications;
     private LinkedList caches;
     private LinkedList logAccesses;
 
     /**
-     * Default constructor to create a new <code>ApplicationServer</code>.
+     * Default constructor to create a new <code>J2EEApplicationServer</code>.
      */
-    public ApplicationServer() {
-        this.connectionPools = new LinkedList();
-        this.dataSources = new LinkedList();
+    public J2EEApplicationServer() {
+        this.jdbcConnectionPools = new LinkedList();
+        this.jdbcDataSources = new LinkedList();
         this.jmsConnectionFactories = new LinkedList();
         this.jmsServers = new LinkedList();
-        this.nameSpaceBindings = new LinkedList();
+        this.jndiBindings = new LinkedList();
         this.sharedLibraries = new LinkedList();
-        this.applications = new LinkedList();
+        this.j2eeApplications = new LinkedList();
         this.caches = new LinkedList();
         this.logAccesses = new LinkedList();
     }
@@ -187,102 +187,102 @@ public class ApplicationServer implement
     }
 
     /**
-     * Add a new <code>ConnectionPool</code> in the
-     * <code>ApplicationServer</code> connection pools container.
+     * Add a new <code>JDBCConnectionPool</code> in the
+     * <code>J2EEApplicationServer</code> connection pools container.
      * 
-     * @param connectionPool the <code>ConnectionPool</code> to add.
-     * @throws ModelObjectAlreadyExistsException if the <code>ConnectionPool</code> name already exists in the application server.
+     * @param JDBCConnectionPool the <code>JDBCConnectionPool</code> to add.
+     * @throws ModelObjectAlreadyExistsException if the <code>JDBCConnectionPool</code> name already exists in the application server.
      */
-    public void addConnectionPool(ConnectionPool connectionPool) throws ModelObjectAlreadyExistsException {
-        if (this.getConnectionPool(connectionPool.getName()) != null) {
-            throw new ModelObjectAlreadyExistsException("Connection pool name already exists in the JZEE server.");
+    public void addJDBCConnectionPool(JDBCConnectionPool JDBCConnectionPool) throws ModelObjectAlreadyExistsException {
+        if (this.getJDBCConnectionPool(JDBCConnectionPool.getName()) != null) {
+            throw new ModelObjectAlreadyExistsException("JDBC connection pool name already exists in the JZEE server.");
         }
-        this.connectionPools.add(connectionPool);
+        this.jdbcConnectionPools.add(JDBCConnectionPool);
     }
 
     /**
-     * Get the <code>ConnectionPool</code> list in the
-     * <code>ApplicationServer</code> connection pools container.
+     * Get the <code>JDBCConnectionPool</code> list in the
+     * <code>J2EEApplicationServer</code> connection pools container.
      * 
-     * @return the <code>ConnectionPool</code> list.
+     * @return the <code>JDBCConnectionPool</code> list.
      */
-    public List getConnectionPools() {
-        return this.connectionPools;
+    public List getJDBCConnectionPools() {
+        return this.jdbcConnectionPools;
     }
 
     /**
-     * Overwrite the <code>ConnectionPool</code> list in the
-     * <code>ApplicationServer</code> connection pools container.
+     * Overwrite the <code>JDBCConnectionPool</code> list in the
+     * <code>J2EEApplicationServer</code> connection pools container.
      * 
-     * @param connectionPools the new <code>ConnectionPool</code> list.
+     * @param jdbcConnectionPools the new <code>JDBCConnectionPool</code> list.
      */
-    public void setConnectionPools(LinkedList connectionPools) {
-        this.connectionPools = connectionPools;
+    public void setJDBCConnectionPools(LinkedList jdbcConnectionPools) {
+        this.jdbcConnectionPools = jdbcConnectionPools;
     }
 
     /**
-     * Get the <code>ConnectionPool</code> identified by a given name in the
-     * <code>ApplicationServer</code> connection pools container.
+     * Get the <code>JDBCConnectionPool</code> identified by a given name in the
+     * <code>J2EEApplicationServer</code> connection pools container.
      * 
-     * @param name the <code>ConnectionPool</code> name.
-     * @return the <code>ConnectionPool</code> found or null if not found.
+     * @param name the <code>JDBCConnectionPool</code> name.
+     * @return the <code>JDBCConnectionPool</code> found or null if not found.
      */
-    public ConnectionPool getConnectionPool(String name) {
-        for (Iterator connectionPoolIterator = this.getConnectionPools().iterator(); connectionPoolIterator.hasNext();) {
-            ConnectionPool connectionPool = (ConnectionPool) connectionPoolIterator.next();
-            if (connectionPool.getName().equals(name)) {
-                return connectionPool;
+    public JDBCConnectionPool getJDBCConnectionPool(String name) {
+        for (Iterator connectionPoolIterator = this.getJDBCConnectionPools().iterator(); connectionPoolIterator.hasNext();) {
+            JDBCConnectionPool JDBCConnectionPool = (JDBCConnectionPool) connectionPoolIterator.next();
+            if (JDBCConnectionPool.getName().equals(name)) {
+                return JDBCConnectionPool;
             }
         }
         return null;
     }
 
     /**
-     * Add a new <code>DataSource</code> in the <code>ApplicationServer</code>
+     * Add a new <code>JDBCDataSource</code> in the <code>J2EEApplicationServer</code>
      * data sources container.
      * 
-     * @param dataSource the <code>DataSource</code> to add.
-     * @throws ModelObjectAlreadyExistsException if the <code>DataSource</code> name already exists in the application server.
+     * @param JDBCDataSource the <code>JDBCDataSource</code> to add.
+     * @throws ModelObjectAlreadyExistsException if the <code>JDBCDataSource</code> name already exists in the application server.
      */
-    public void addDataSource(DataSource dataSource) throws ModelObjectAlreadyExistsException {
-        if (this.getDataSource(dataSource.getName()) != null) {
-            throw new ModelObjectAlreadyExistsException("Datasource name already exists in the JZEE server.");
+    public void addJDBCDataSource(JDBCDataSource JDBCDataSource) throws ModelObjectAlreadyExistsException {
+        if (this.getJDBCDataSource(JDBCDataSource.getName()) != null) {
+            throw new ModelObjectAlreadyExistsException("JDBC data source name already exists in the JZEE server.");
         }
-        this.dataSources.add(dataSource);
+        this.jdbcDataSources.add(JDBCDataSource);
     }
 
     /**
-     * Get the <code>DataSource</code> list in the
-     * <code>ApplicationServer</code> data sources container.
+     * Get the <code>JDBCDataSource</code> list in the
+     * <code>J2EEApplicationServer</code> data sources container.
      * 
-     * @return the <code>DataSource</code> list.
+     * @return the <code>JDBCDataSource</code> list.
      */
-    public List getDataSources() {
-        return this.dataSources;
+    public List getJDBCDataSources() {
+        return this.jdbcDataSources;
     }
 
     /**
-     * Overwrite the <code>DataSource</code> list in the
-     * <code>ApplicationServer</code> data sources container.
+     * Overwrite the <code>JDBCDataSource</code> list in the
+     * <code>J2EEApplicationServer</code> data sources container.
      * 
-     * @param dataSources the new <code>DataSource</code> list.
+     * @param dataSources the new <code>JDBCDataSource</code> list.
      */
-    public void setDataSources(LinkedList dataSources) {
-        this.dataSources = dataSources;
+    public void setJDBCDataSources(LinkedList dataSources) {
+        this.jdbcDataSources = dataSources;
     }
 
     /**
-     * Get the <code>DataSource</code> identified by a given name in the
-     * <code>ApplicationServer</code> data sources container.
+     * Get the <code>JDBCDataSource</code> identified by a given name in the
+     * <code>J2EEApplicationServer</code> data sources container.
      * 
-     * @param name the <code>DataSource</code> name.
-     * @return the <code>DataSource</code> found or null if not found.
+     * @param name the <code>JDBCDataSource</code> name.
+     * @return the <code>JDBCDataSource</code> found or null if not found.
      */
-    public DataSource getDataSource(String name) {
-        for (Iterator dataSourceIterator = this.getDataSources().iterator(); dataSourceIterator.hasNext();) {
-            DataSource dataSource = (DataSource) dataSourceIterator.next();
-            if (dataSource.getName().equals(name)) {
-                return dataSource;
+    public JDBCDataSource getJDBCDataSource(String name) {
+        for (Iterator dataSourceIterator = this.getJDBCDataSources().iterator(); dataSourceIterator.hasNext();) {
+            JDBCDataSource JDBCDataSource = (JDBCDataSource) dataSourceIterator.next();
+            if (JDBCDataSource.getName().equals(name)) {
+                return JDBCDataSource;
             }
         }
         return null;
@@ -290,7 +290,7 @@ public class ApplicationServer implement
 
     /**
      * Add a new <code>JMSConnectionFactory</code> in the
-     * <code>ApplicationServer</code> JMS connection factories container.
+     * <code>J2EEApplicationServer</code> JMS connection factories container.
      * 
      * @param jmsConnectionFactory the <code>JMSConnectionFactory</code> to add.
      * @throws ModelObjectAlreadyExistsException 
@@ -304,7 +304,7 @@ public class ApplicationServer implement
 
     /**
      * Get the <code>JMSConnectionFactory</code> list in the
-     * <code>ApplicationServer</code> JMS connection factories container.
+     * <code>J2EEApplicationServer</code> JMS connection factories container.
      * 
      * @return the <code>JMSConnectionFactory</code> list.
      */
@@ -314,7 +314,7 @@ public class ApplicationServer implement
 
     /**
      * Overwrites the <code>JMSConnectionFactory</code> list in the
-     * <code>ApplicationServer</code> JMS connection factories container.
+     * <code>J2EEApplicationServer</code> JMS connection factories container.
      * 
      * @param jmsConnectionFactories the new <code>JMSConnectionFactory</code> list.
      */
@@ -324,7 +324,7 @@ public class ApplicationServer implement
 
     /**
      * Gets the <code>JMSConnectionFactory</code> identified by a given name in
-     * the <code>ApplicationServer</code> JMS connection factories container.
+     * the <code>J2EEApplicationServer</code> JMS connection factories container.
      * 
      * @param name the <code>JMSConnectionFactory</code> name.
      * @return the <code>JMSConnectionFactory</code> found or null if not found.
@@ -340,7 +340,7 @@ public class ApplicationServer implement
     }
 
     /**
-     * Adds a new <code>JMSServer</code> in the <code>ApplicationServer</code>
+     * Adds a new <code>JMSServer</code> in the <code>J2EEApplicationServer</code>
      * JMS servers container.
      * 
      * @param jmsServer the <code>JMSServer</code> to add.
@@ -348,13 +348,13 @@ public class ApplicationServer implement
      */
     public void addJMSServer(JMSServer jmsServer) throws ModelObjectAlreadyExistsException {
         if (this.getJMSServer(jmsServer.getName()) != null) {
-            throw new ModelObjectAlreadyExistsException("JMS server name already exists in the JZEE server.");
+            throw new ModelObjectAlreadyExistsException("JMS server name already exists in the JZEE application server.");
         }
         this.jmsServers.add(jmsServer);
     }
 
     /**
-     * Gets the <code>JMSServer</code> list in the <code>ApplicationServer</code>
+     * Gets the <code>JMSServer</code> list in the <code>J2EEApplicationServer</code>
      * JMS servers container.
      * 
      * @return the <code>JMSServer</code> list.
@@ -365,7 +365,7 @@ public class ApplicationServer implement
 
     /**
      * Overwrites the <code>JMSServer</code> list in the
-     * <code>ApplicationServer</code> JMS servers container.
+     * <code>J2EEApplicationServer</code> JMS servers container.
      * 
      * @param jmsServers the new <code>JMSServer</code> list.
      */
@@ -375,7 +375,7 @@ public class ApplicationServer implement
 
     /**
      * Gets the <code>JMSServer</code> identified by a given name in the
-     * <code>ApplicationServer</code> JMS servers container.
+     * <code>J2EEApplicationServer</code> JMS servers container.
      * 
      * @param name the <code>JMSServer</code> name.
      * @return the <code>JMSServer</code> found or null if not found.
@@ -391,51 +391,51 @@ public class ApplicationServer implement
     }
 
     /**
-     * Adds a new <code>NameSpaceBinding</code> in the
-     * <code>ApplicationServer</code> name space bindings container.
+     * Adds a new <code>JNDIBinding</code> in the
+     * <code>J2EEApplicationServer</code> name space bindings container.
      * 
-     * @param nameSpaceBinding the <code>NameSpaceBinding</code> to add.
-     * @throws ModelObjectAlreadyExistsException if the <code>NameSpaceBinding</code> name already exists in the application server.
+     * @param JNDIBinding the <code>JNDIBinding</code> to add.
+     * @throws ModelObjectAlreadyExistsException if the <code>JNDIBinding</code> name already exists in the application server.
      */
-    public void addNameSpaceBinding(NameSpaceBinding nameSpaceBinding) throws ModelObjectAlreadyExistsException {
-        if (this.getNameSpaceBinding(nameSpaceBinding.getName()) != null) {
+    public void addJNDIBinding(JNDIBinding JNDIBinding) throws ModelObjectAlreadyExistsException {
+        if (this.getJNDIBinding(JNDIBinding.getName()) != null) {
             throw new ModelObjectAlreadyExistsException("Name space binding name already exists in the JZEE server.");
         }
-        this.nameSpaceBindings.add(nameSpaceBinding);
+        this.jndiBindings.add(JNDIBinding);
     }
 
     /**
-     * Gets the <code>NameSpaceBinding</code> list in the
-     * <code>ApplicationServer</code> name space bindings container.
+     * Gets the <code>JNDIBinding</code> list in the
+     * <code>J2EEApplicationServer</code> name space bindings container.
      * 
-     * @return the <code>NameSpaceBinding</code> list.
+     * @return the <code>JNDIBinding</code> list.
      */
-    public List getNameSpaceBindings() {
-        return this.nameSpaceBindings;
+    public List getJNDIBindings() {
+        return this.jndiBindings;
     }
 
     /**
-     * Overwrites the <code>NameSpaceBinding</code> list in the
-     * <code>ApplicationServer</code> name space bindings container.
+     * Overwrites the <code>JNDIBinding</code> list in the
+     * <code>J2EEApplicationServer</code> name space bindings container.
      * 
-     * @param nameSpaceBindings the new <code>NameSpaceBinding</code> list.
+     * @param jndiBindings the new <code>JNDIBinding</code> list.
      */
-    public void setNameSpaceBindings(LinkedList nameSpaceBindings) {
-        this.nameSpaceBindings = nameSpaceBindings;
+    public void setJNDIBindings(LinkedList jndiBindings) {
+        this.jndiBindings = jndiBindings;
     }
 
     /**
-     * Gets the <code>NameSpaceBinding</code> identified by a given name in the
-     * <code>ApplicationServer</code> name space bindings container.
+     * Gets the <code>JNDIBinding</code> identified by a given name in the
+     * <code>J2EEApplicationServer</code> name space bindings container.
      * 
-     * @param name the <code>NameSpaceBinding</code> name.
-     * @return the <code>NameSpaceBinding</code> found or null if not found.
+     * @param name the <code>JNDIBinding</code> name.
+     * @return the <code>JNDIBinding</code> found or null if not found.
      */
-    public NameSpaceBinding getNameSpaceBinding(String name) {
-        for (Iterator nameSpaceBindingIterator = this.getNameSpaceBindings().iterator(); nameSpaceBindingIterator.hasNext();) {
-            NameSpaceBinding nameSpaceBinding = (NameSpaceBinding) nameSpaceBindingIterator.next();
-            if (nameSpaceBinding.getName().equals(name)) {
-                return nameSpaceBinding;
+    public JNDIBinding getJNDIBinding(String name) {
+        for (Iterator jndiBindingIterator = this.getJNDIBindings().iterator(); jndiBindingIterator.hasNext();) {
+            JNDIBinding JNDIBinding = (JNDIBinding) jndiBindingIterator.next();
+            if (JNDIBinding.getName().equals(name)) {
+                return JNDIBinding;
             }
         }
         return null;
@@ -443,7 +443,7 @@ public class ApplicationServer implement
 
     /**
      * Adds a new <code>SharedLibrary</code> in the
-     * <code>ApplicationServer</code> shared libraries container.
+     * <code>J2EEApplicationServer</code> shared libraries container.
      * 
      * @param sharedLibrary the <code>SharedLibrary</code> to add.
      * @throws ModelObjectAlreadyExistsException if the <code>SharedLibrary</code> name already exists in the application server.
@@ -457,7 +457,7 @@ public class ApplicationServer implement
 
     /**
      * Gets the <code>SharedLibrary</code> list in the
-     * <code>ApplicationServer</code> shared libraries container.
+     * <code>J2EEApplicationServer</code> shared libraries container.
      * 
      * @return the <code>SharedLibrary</code> list.
      */
@@ -467,7 +467,7 @@ public class ApplicationServer implement
 
     /**
      * Overwrites the <code>SharedLibrary</code> list in the
-     * <code>ApplicationServer</code> shared libraries container.
+     * <code>J2EEApplicationServer</code> shared libraries container.
      * 
      * @param sharedLibraries the new <code>SharedLibrary</code> list.
      */
@@ -477,7 +477,7 @@ public class ApplicationServer implement
 
     /**
      * Gets the <code>SharedLibrary</code> identified by a given name in the
-     * <code>ApplicationServer</code> shared libraries container.
+     * <code>J2EEApplicationServer</code> shared libraries container.
      * 
      * @param name the <code>SharedLibrary</code> name.
      * @return the <code>SharedLibrary</code> found or null if not found.
@@ -493,58 +493,58 @@ public class ApplicationServer implement
     }
 
     /**
-     * Adds a new <code>Application</code> in the <code>ApplicationServer</code>
-     * applications container.
+     * Adds a new <code>J2EEApplication</code> in the <code>J2EEApplicationServer</code>
+     * j2eeApplications container.
      * 
-     * @param application the <code>Application</code> to add.
-     * @throws ModelObjectAlreadyExistsException if the <code>Application</code> name already exists in the application server.
+     * @param j2eeApplication the <code>J2EEApplication</code> to add.
+     * @throws ModelObjectAlreadyExistsException if the <code>J2EEApplication</code> name already exists in the j2EEApplication server.
      */
-    public void addApplication(Application application) throws ModelObjectAlreadyExistsException {
-        if (this.getApplication(application.getName()) != null) {
-            throw new ModelObjectAlreadyExistsException("JZEE application name already exists in the JZEE server.");
+    public void addJ2EEApplication(J2EEApplication j2eeApplication) throws ModelObjectAlreadyExistsException {
+        if (this.getJ2EEApplication(j2eeApplication.getName()) != null) {
+            throw new ModelObjectAlreadyExistsException("J2EE application name already exists in the J2EE application server.");
         }
-        this.applications.add(application);
+        this.j2eeApplications.add(j2eeApplication);
     }
 
     /**
-     * Gets the <code>Application</code> list in the
-     * <code>ApplicationServer</code> applications container.
+     * Gets the <code>J2EEApplication</code> list in the
+     * <code>J2EEApplicationServer</code> j2eeApplications container.
      * 
-     * @return the <code>Application</code> list.
+     * @return the <code>J2EEApplication</code> list.
      */
-    public List getApplications() {
-        return this.applications;
+    public List getJ2EEApplications() {
+        return this.j2eeApplications;
     }
 
     /**
-     * Overwrites the <code>Application</code> list in the
-     * <code>ApplicationServer</code> applications container.
+     * Overwrites the <code>J2EEApplication</code> list in the
+     * <code>J2EEApplicationServer</code> j2eeApplications container.
      * 
-     * @param applications the new <code>Application</code> list.
+     * @param j2eeApplications the new <code>J2EEApplication</code> list.
      */
-    public void setApplications(LinkedList applications) {
-        this.applications = applications;
+    public void setJ2EEApplications(LinkedList j2eeApplications) {
+        this.j2eeApplications = j2eeApplications;
     }
 
     /**
-     * Gets the <code>Application</code> identified by a given name in the
-     * <code>ApplicationServer</code> applications container.
+     * Gets the <code>J2EEApplication</code> identified by a given name in the
+     * <code>J2EEApplicationServer</code> j2eeApplications container.
      * 
-     * @param name the <code>Application</code> name.
-     * @return the <code>Application</code> found or null if not found.
+     * @param name the <code>J2EEApplication</code> name.
+     * @return the <code>J2EEApplication</code> found or null if not found.
      */
-    public Application getApplication(String name) {
-        for (Iterator applicationIterator = this.getApplications().iterator(); applicationIterator.hasNext();) {
-            Application application = (Application) applicationIterator.next();
-            if (application.getName().equals(name)) {
-                return application;
+    public J2EEApplication getJ2EEApplication(String name) {
+        for (Iterator applicationIterator = this.getJ2EEApplications().iterator(); applicationIterator.hasNext();) {
+            J2EEApplication j2EEApplication = (J2EEApplication) applicationIterator.next();
+            if (j2EEApplication.getName().equals(name)) {
+                return j2EEApplication;
             }
         }
         return null;
     }
 
     /**
-     * Adds a new <code>Cache</code> in the <code>ApplicationServer</code> caches
+     * Adds a new <code>Cache</code> in the <code>J2EEApplicationServer</code> caches
      * container.
      * 
      * @param cache the <code>Cache</code> to add.
@@ -552,13 +552,13 @@ public class ApplicationServer implement
      */
     public void addCache(Cache cache) throws ModelObjectAlreadyExistsException {
         if (this.getCache(cache.getPath()) != null) {
-            throw new ModelObjectAlreadyExistsException("Cache path already exists in the J2EE server.");
+            throw new ModelObjectAlreadyExistsException("Cache path already exists in the J2EE application server.");
         }
         this.caches.add(cache);
     }
 
     /**
-     * Gets the <code>Cache</code> list in the <code>ApplicationServer</code>
+     * Gets the <code>Cache</code> list in the <code>J2EEApplicationServer</code>
      * caches container.
      * 
      * @return the <code>Cache</code> list.
@@ -569,7 +569,7 @@ public class ApplicationServer implement
 
     /**
      * Overwrites the <code>Cache</code> list in the
-     * <code>ApplicationServer</code> caches container.
+     * <code>J2EEApplicationServer</code> caches container.
      * 
      * @param caches the new <code>Cache</code> list.
      */
@@ -579,7 +579,7 @@ public class ApplicationServer implement
 
     /**
      * Gets the <code>Cache</code> identified by a given path in the
-     * <code>ApplicationServer</code> caches container.
+     * <code>J2EEApplicationServer</code> caches container.
      * 
      * @param path the <code>Cache</code> path.
      * @return the <code>Cache</code> found or null if not found.
@@ -598,7 +598,7 @@ public class ApplicationServer implement
      * @see java.lang.Object#clone()
      */
     public Object clone() throws CloneNotSupportedException {
-        ApplicationServer clone = new ApplicationServer();
+        J2EEApplicationServer clone = new J2EEApplicationServer();
         clone.setName(this.getName());
         clone.setActive(this.isActive());
         clone.setBlocker(this.isBlocker());
@@ -613,13 +613,13 @@ public class ApplicationServer implement
         clone.setStartupcommand(this.getStartupcommand());
         clone.setShutdowncommand(this.getShutdowncommand());
         clone.setAgent(this.getAgent());
-        for (Iterator connectionPoolIterator = this.connectionPools.iterator(); connectionPoolIterator.hasNext();) {
-            ConnectionPool connectionPool = (ConnectionPool) connectionPoolIterator.next();
-            clone.connectionPools.add((ConnectionPool) connectionPool.clone());
-        }
-        for (Iterator dataSourceIterator = this.dataSources.iterator(); dataSourceIterator.hasNext();) {
-            DataSource dataSource = (DataSource) dataSourceIterator.next();
-            clone.dataSources.add((DataSource) dataSource.clone());
+        for (Iterator jdbcConnectionPoolIterator = this.jdbcConnectionPools.iterator(); jdbcConnectionPoolIterator.hasNext();) {
+            JDBCConnectionPool JDBCConnectionPool = (JDBCConnectionPool) jdbcConnectionPoolIterator.next();
+            clone.jdbcConnectionPools.add((JDBCConnectionPool) JDBCConnectionPool.clone());
+        }
+        for (Iterator jdbcDataSourceIterator = this.jdbcDataSources.iterator(); jdbcDataSourceIterator.hasNext();) {
+            JDBCDataSource JDBCDataSource = (JDBCDataSource) jdbcDataSourceIterator.next();
+            clone.jdbcDataSources.add((JDBCDataSource) JDBCDataSource.clone());
         }
         for (Iterator jmsConnectionFactoryIterator = this.jmsConnectionFactories.iterator(); jmsConnectionFactoryIterator
                 .hasNext();) {
@@ -630,17 +630,17 @@ public class ApplicationServer implement
             JMSServer jmsServer = (JMSServer) jmsServerIterator.next();
             clone.jmsServers.add((JMSServer) jmsServer.clone());
         }
-        for (Iterator nameSpaceBindingIterator = this.nameSpaceBindings.iterator(); nameSpaceBindingIterator.hasNext();) {
-            NameSpaceBinding nameSpaceBinding = (NameSpaceBinding) nameSpaceBindingIterator.next();
-            clone.nameSpaceBindings.add((NameSpaceBinding) nameSpaceBinding.clone());
+        for (Iterator jndiBindingIterator = this.jndiBindings.iterator(); jndiBindingIterator.hasNext();) {
+            JNDIBinding JNDIBinding = (JNDIBinding) jndiBindingIterator.next();
+            clone.jndiBindings.add((JNDIBinding) JNDIBinding.clone());
         }
         for (Iterator sharedLibraryIterator = this.sharedLibraries.iterator(); sharedLibraryIterator.hasNext();) {
             SharedLibrary sharedLibrary = (SharedLibrary) sharedLibraryIterator.next();
             clone.sharedLibraries.add((SharedLibrary) sharedLibrary.clone());
         }
-        for (Iterator applicationIterator = this.applications.iterator(); applicationIterator.hasNext();) {
-            Application application = (Application) applicationIterator.next();
-            clone.applications.add((Application) application.clone());
+        for (Iterator applicationIterator = this.j2eeApplications.iterator(); applicationIterator.hasNext();) {
+            J2EEApplication j2EEApplication = (J2EEApplication) applicationIterator.next();
+            clone.j2eeApplications.add((J2EEApplication) j2EEApplication.clone());
         }
         for (Iterator cacheIterator = this.caches.iterator(); cacheIterator.hasNext();) {
             Cache cache = (Cache) cacheIterator.next();
@@ -650,13 +650,13 @@ public class ApplicationServer implement
     }
 
     /**
-     * Transforms the <code>ApplicationServer</code> POJO to a DOM element.
+     * Transforms the <code>J2EEApplicationServer</code> POJO to a DOM element.
      * 
      * @param document the core XML document.
      * @return the DOM element.
      */
     protected Element toDOMElement(CoreDocumentImpl document) {
-        ElementImpl element = new ElementImpl(document, "applicationserver");
+        ElementImpl element = new ElementImpl(document, "j2eeapplicationserver");
         element.setAttribute("name", this.getName());
         element.setAttribute("active", new Boolean(this.isActive()).toString());
         element.setAttribute("blocker", new Boolean(this.isBlocker()).toString());
@@ -680,19 +680,19 @@ public class ApplicationServer implement
         shutdowncommand.appendChild(shutdowncommandContent);
         element.appendChild(shutdowncommand);
         // connectionpools
-        ElementImpl connectionpools = new ElementImpl(document, "connectionpools");
-        for (Iterator connectionPoolIterator = this.getConnectionPools().iterator(); connectionPoolIterator.hasNext();) {
-            ConnectionPool connectionPool = (ConnectionPool) connectionPoolIterator.next();
-            connectionpools.appendChild(connectionPool.toDOMElement(document));
-        }
-        element.appendChild(connectionpools);
-        // datasources
-        ElementImpl datasources = new ElementImpl(document, "datasources");
-        for (Iterator dataSourceIterator = this.getDataSources().iterator(); dataSourceIterator.hasNext();) {
-            DataSource dataSource = (DataSource) dataSourceIterator.next();
-            datasources.appendChild(dataSource.toDOMElement(document));
+        ElementImpl jdbcconnectionpools = new ElementImpl(document, "jdbcconnectionpools");
+        for (Iterator jdbcConnectionPoolIterator = this.getJDBCConnectionPools().iterator(); jdbcConnectionPoolIterator.hasNext();) {
+            JDBCConnectionPool JDBCConnectionPool = (JDBCConnectionPool) jdbcConnectionPoolIterator.next();
+            jdbcconnectionpools.appendChild(JDBCConnectionPool.toDOMElement(document));
+        }
+        element.appendChild(jdbcconnectionpools);
+        // jdbcdatasources
+        ElementImpl jdbcdatasources = new ElementImpl(document, "jdbcdatasources");
+        for (Iterator dataSourceIterator = this.getJDBCDataSources().iterator(); dataSourceIterator.hasNext();) {
+            JDBCDataSource JDBCDataSource = (JDBCDataSource) dataSourceIterator.next();
+            jdbcdatasources.appendChild(JDBCDataSource.toDOMElement(document));
         }
-        element.appendChild(datasources);
+        element.appendChild(jdbcdatasources);
         // jmsconnectionfactories
         ElementImpl jmsconnectionfactories = new ElementImpl(document, "jmsconnectionfactories");
         for (Iterator jmsConnectionFactoryIterator = this.getJMSConnectionFactories().iterator(); jmsConnectionFactoryIterator
@@ -708,14 +708,13 @@ public class ApplicationServer implement
             jmsservers.appendChild(jmsServer.toDOMElement(document));
         }
         element.appendChild(jmsservers);
-        // namespacebindings
-        ElementImpl namespacebindings = new ElementImpl(document, "namespacebindings");
-        for (Iterator nameSpaceBindingIterator = this.getNameSpaceBindings().iterator(); nameSpaceBindingIterator
-                .hasNext();) {
-            NameSpaceBinding nameSpaceBinding = (NameSpaceBinding) nameSpaceBindingIterator.next();
-            namespacebindings.appendChild(nameSpaceBinding.toDOMElement(document));
+        // jndibindings
+        ElementImpl jndiBindings = new ElementImpl(document, "jndibindings");
+        for (Iterator jndiBindingIterator = this.getJNDIBindings().iterator(); jndiBindingIterator.hasNext();) {
+            JNDIBinding JNDIBinding = (JNDIBinding) jndiBindingIterator.next();
+            jndiBindings.appendChild(JNDIBinding.toDOMElement(document));
         }
-        element.appendChild(namespacebindings);
+        element.appendChild(jndiBindings);
         // sharedlibraries
         ElementImpl sharedlibraries = new ElementImpl(document, "sharedlibrairies");
         for (Iterator sharedLibraryIterator = this.getSharedLibraries().iterator(); sharedLibraryIterator.hasNext();) {
@@ -723,11 +722,11 @@ public class ApplicationServer implement
             sharedlibraries.appendChild(sharedLibrary.toDOMElement(document));
         }
         element.appendChild(sharedlibraries);
-        // applications
-        ElementImpl applications = new ElementImpl(document, "applications");
-        for (Iterator applicationIterator = this.getApplications().iterator(); applicationIterator.hasNext();) {
-            Application application = (Application) applicationIterator.next();
-            applications.appendChild(application.toDOMElement(document));
+        // j2eeApplications
+        ElementImpl applications = new ElementImpl(document, "j2eeApplications");
+        for (Iterator applicationIterator = this.getJ2EEApplications().iterator(); applicationIterator.hasNext();) {
+            J2EEApplication j2EEApplication = (J2EEApplication) applicationIterator.next();
+            applications.appendChild(j2EEApplication.toDOMElement(document));
         }
         element.appendChild(applications);
         // caches
@@ -744,7 +743,7 @@ public class ApplicationServer implement
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     public int compareTo(Object anotherApplicationServer) {
-        return this.getName().compareTo(((ApplicationServer)anotherApplicationServer).getName());
+        return this.getName().compareTo(((J2EEApplicationServer)anotherApplicationServer).getName());
     }
 
 }
\ No newline at end of file

Copied: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServers.java (from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServers.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServers.java?p2=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServers.java&p1=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServers.java&r1=1187715&r2=1187742&rev=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ApplicationServers.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/J2EEApplicationServers.java Sat Oct 22 18:01:26 2011
@@ -28,16 +28,16 @@ import org.apache.xerces.dom.ElementImpl
 import org.w3c.dom.Element;
 
 /**
- * Represents the <code>applicationservers</code> tag in the Kalumet DOM.
+ * Represents the <code>j2eeapplicationservers</code> tag in the Kalumet DOM.
  */
-public class ApplicationServers implements Serializable, Cloneable {
+public class J2EEApplicationServers implements Serializable, Cloneable {
 
    private static final long serialVersionUID = -4940898204749451109L;
 
    private boolean cluster;
    private LinkedList applicationServers;
 
-   public ApplicationServers() {
+   public J2EEApplicationServers() {
       this.applicationServers = new LinkedList();
    }
 
@@ -50,50 +50,50 @@ public class ApplicationServers implemen
    }
 
    /**
-    * Adds a new <code>ApplicationServer</code> in the
-    * <code>ApplicationServers</code> container.
+    * Adds a new <code>J2EEApplicationServer</code> in the
+    * <code>J2EEApplicationServers</code> container.
     * 
-    * @param applicationServer the <code>ApplicationServer</code> to add.
+    * @param j2EEApplicationServer the <code>J2EEApplicationServer</code> to add.
     */
-   public void addApplicationServer(ApplicationServer applicationServer) throws ModelObjectAlreadyExistsException {
-      if (this.getApplicationServer(applicationServer.getName()) != null) {
-         throw new ModelObjectAlreadyExistsException("J2EE server name already exists in the environment.");
+   public void addApplicationServer(J2EEApplicationServer j2EEApplicationServer) throws ModelObjectAlreadyExistsException {
+      if (this.getApplicationServer(j2EEApplicationServer.getName()) != null) {
+         throw new ModelObjectAlreadyExistsException("J2EE application server name already exists in the environment.");
       }
-      this.applicationServers.add(applicationServer);
+      this.applicationServers.add(j2EEApplicationServer);
    }
 
    /**
-    * Gets the <code>ApplicationServer</code> list in the
-    * <code>ApplicationServers</code> container.
+    * Gets the <code>J2EEApplicationServer</code> list in the
+    * <code>J2EEApplicationServers</code> container.
     * 
-    * @return the <code>ApplicationServer</code> list.
+    * @return the <code>J2EEApplicationServer</code> list.
     */
    public List getApplicationServers() {
       return this.applicationServers;
    }
 
    /**
-    * Overwrites the <code>ApplicationServer</code> list in the
-    * <code>ApplicationServers</code> container.
+    * Overwrites the <code>J2EEApplicationServer</code> list in the
+    * <code>J2EEApplicationServers</code> container.
     * 
-    * @param applicationServers the new <code>ApplicationServer</code> list.
+    * @param applicationServers the new <code>J2EEApplicationServer</code> list.
     */
    public void setApplicationServers(LinkedList applicationServers) {
       this.applicationServers = applicationServers;
    }
 
    /**
-    * Gets the <code>ApplicationServer</code> identified by a given name in the
-    * <code>ApplicationServers</code> container.
+    * Gets the <code>J2EEApplicationServer</code> identified by a given name in the
+    * <code>J2EEApplicationServers</code> container.
     * 
-    * @param name the <code>ApplicationServer</code> name.
-    * @return the <code>ApplicationServer</code> found or null if no found.
+    * @param name the <code>J2EEApplicationServer</code> name.
+    * @return the <code>J2EEApplicationServer</code> found or null if no found.
     */
-   public ApplicationServer getApplicationServer(String name) {
+   public J2EEApplicationServer getApplicationServer(String name) {
       for (Iterator applicationServerIterator = this.getApplicationServers().iterator(); applicationServerIterator.hasNext();) {
-         ApplicationServer applicationServer = (ApplicationServer) applicationServerIterator.next();
-         if (applicationServer.getName().equals(name)) {
-            return applicationServer;
+         J2EEApplicationServer j2EEApplicationServer = (J2EEApplicationServer) applicationServerIterator.next();
+         if (j2EEApplicationServer.getName().equals(name)) {
+            return j2EEApplicationServer;
          }
       }
       return null;
@@ -103,28 +103,28 @@ public class ApplicationServers implemen
     * @see java.lang.Object#clone()
     */
    public Object clone() throws CloneNotSupportedException {
-      ApplicationServers clone = new ApplicationServers();
+      J2EEApplicationServers clone = new J2EEApplicationServers();
       clone.setCluster(this.isCluster());
       for (Iterator applicationServerIterator = this.applicationServers.iterator(); applicationServerIterator.hasNext(); ) {
-          ApplicationServer applicationServer = (ApplicationServer) applicationServerIterator.next();
-          clone.applicationServers.add((ApplicationServer)applicationServer.clone());
+          J2EEApplicationServer j2EEApplicationServer = (J2EEApplicationServer) applicationServerIterator.next();
+          clone.applicationServers.add((J2EEApplicationServer) j2EEApplicationServer.clone());
       }
       return clone;
    }
 
    /**
-    * Transforms the <code>ApplicationServers</code> POJO to a DOM element.
+    * Transforms the <code>J2EEApplicationServers</code> POJO to a DOM element.
     * 
     * @param document the DOM document.
     * @return the DOM element.
     */
    protected Element toDOMElement(CoreDocumentImpl document) {
-      ElementImpl element = new ElementImpl(document, "applicationservers");
+      ElementImpl element = new ElementImpl(document, "j2eeapplicationservers");
       element.setAttribute("cluster", new Boolean(this.isCluster()).toString());
       // add applicationserver child nodes
       for (Iterator applicationServerIterator = this.getApplicationServers().iterator(); applicationServerIterator.hasNext();) {
-         ApplicationServer applicationServer = (ApplicationServer) applicationServerIterator.next();
-         element.appendChild(applicationServer.toDOMElement(document));
+         J2EEApplicationServer j2EEApplicationServer = (J2EEApplicationServer) applicationServerIterator.next();
+         element.appendChild(j2EEApplicationServer.toDOMElement(document));
       }
       return element;
    }

Copied: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCConnectionPool.java (from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ConnectionPool.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCConnectionPool.java?p2=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCConnectionPool.java&p1=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ConnectionPool.java&r1=1187715&r2=1187742&rev=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/ConnectionPool.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCConnectionPool.java Sat Oct 22 18:01:26 2011
@@ -25,10 +25,10 @@ import org.apache.xerces.dom.ElementImpl
 import org.w3c.dom.Element;
 
 /**
- * Represent the <code>connectionpool</code> tag in the Kalumet XML
+ * Represent the <code>jdbcconnectionpool</code> tag in the Kalumet XML
  * configuration file.
  */
-public class ConnectionPool implements Serializable, Cloneable, Comparable {
+public class JDBCConnectionPool implements Serializable, Cloneable, Comparable {
 
    private static final long serialVersionUID = 8052573645587249685L;
 
@@ -45,7 +45,7 @@ public class ConnectionPool implements S
    private boolean active;
    private boolean blocker;
 
-   public ConnectionPool() { }
+   public JDBCConnectionPool() { }
 
    public String getName() {
       return this.name;
@@ -147,7 +147,7 @@ public class ConnectionPool implements S
     * @see java.lang.Object#clone()
     */
    public Object clone() throws CloneNotSupportedException {
-      ConnectionPool clone = new ConnectionPool();
+      JDBCConnectionPool clone = new JDBCConnectionPool();
       clone.setName(this.getName());
       clone.setDriver(this.getDriver());
       clone.setHelperclass(this.getHelperclass());
@@ -164,13 +164,13 @@ public class ConnectionPool implements S
    }
 
    /**
-    * Transform the <code>ConnectionPool</code> POJO to a DOM element.
+    * Transform the <code>JDBCConnectionPool</code> POJO to a DOM element.
     * 
     * @param document the core XML document.
     * @return the DOM element.
     */
    protected Element toDOMElement(CoreDocumentImpl document) {
-      ElementImpl element = new ElementImpl(document, "connectionpool");
+      ElementImpl element = new ElementImpl(document, "jdbcconnectionpool");
       element.setAttribute("name", this.getName());
       element.setAttribute("driver", this.getDriver());
       element.setAttribute("helperclass", this.getHelperclass());
@@ -190,7 +190,7 @@ public class ConnectionPool implements S
     * @see java.lang.Comparable#compareTo(java.lang.Object)
     */
    public int compareTo(Object anotherConnectionPool) {
-       return this.getName().compareTo(((ConnectionPool)anotherConnectionPool).getName());
+       return this.getName().compareTo(((JDBCConnectionPool)anotherConnectionPool).getName());
    }
 
 }
\ No newline at end of file

Copied: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCDataSource.java (from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/DataSource.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCDataSource.java?p2=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCDataSource.java&p1=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/DataSource.java&r1=1187715&r2=1187742&rev=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/DataSource.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JDBCDataSource.java Sat Oct 22 18:01:26 2011
@@ -25,9 +25,9 @@ import org.apache.xerces.dom.ElementImpl
 import org.w3c.dom.Element;
 
 /**
- * Represent the <code>datasource</code> tag in the Kalumet configuration DOM.
+ * Represent the <code>jdbcdatasource</code> tag in the Kalumet configuration DOM.
  */
-public class DataSource implements Serializable, Cloneable, Comparable {
+public class JDBCDataSource implements Serializable, Cloneable, Comparable {
 
    private static final long serialVersionUID = -6850328756411047364L;
 
@@ -36,7 +36,7 @@ public class DataSource implements Seria
    private boolean active;
    private boolean blocker;
 
-   public DataSource() { }
+   public JDBCDataSource() { }
 
    public String getName() {
       return this.name;
@@ -74,7 +74,7 @@ public class DataSource implements Seria
     * @see java.lang.Object#clone()
     */
    public Object clone() throws CloneNotSupportedException {
-      DataSource clone = new DataSource();
+      JDBCDataSource clone = new JDBCDataSource();
       clone.setName(this.getName());
       clone.setPool(this.getPool());
       clone.setActive(this.isActive());
@@ -83,13 +83,13 @@ public class DataSource implements Seria
    }
 
    /**
-    * Transforms the <code>DataSource</code> POJO to a DOM element.
+    * Transforms the <code>JDBCDataSource</code> POJO to a DOM element.
     * 
     * @param document the DOM document.
     * @return the DOM element.
     */
    protected Element toDOMElement(CoreDocumentImpl document) {
-      ElementImpl element = new ElementImpl(document, "datasource");
+      ElementImpl element = new ElementImpl(document, "jdbcdatasource");
       element.setAttribute("name", this.getName());
       element.setAttribute("pool", this.getPool());
       element.setAttribute("active", new Boolean(this.isActive()).toString());
@@ -101,7 +101,7 @@ public class DataSource implements Seria
     * @see java.lang.Comparable#compareTo(java.lang.Object)
     */
    public int compareTo(Object anotherDataSource) {
-       return this.getName().compareTo(((DataSource)anotherDataSource).getName());
+       return this.getName().compareTo(((JDBCDataSource)anotherDataSource).getName());
    }
 
 }
\ No newline at end of file

Copied: incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JNDIBinding.java (from r1187715, incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/NameSpaceBinding.java)
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JNDIBinding.java?p2=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JNDIBinding.java&p1=incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/NameSpaceBinding.java&r1=1187715&r2=1187742&rev=1187742&view=diff
==============================================================================
--- incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/NameSpaceBinding.java (original)
+++ incubator/kalumet/trunk/common/src/main/java/org/apache/kalumet/model/JNDIBinding.java Sat Oct 22 18:01:26 2011
@@ -25,9 +25,9 @@ import org.apache.xerces.dom.ElementImpl
 import org.w3c.dom.Element;
 
 /**
- * Represent the <code>namespacebinding</code> tag in the Kalumet configuration DOM.
+ * Represent the <code>jndibinding</code> tag in the Kalumet configuration DOM.
  */
-public class NameSpaceBinding implements Serializable, Cloneable, Comparable {
+public class JNDIBinding implements Serializable, Cloneable, Comparable {
 
    private static final long serialVersionUID = -2336476111740231781L;
 
@@ -38,7 +38,7 @@ public class NameSpaceBinding implements
    private boolean active;
    private boolean blocker;
 
-   public NameSpaceBinding() { }
+   public JNDIBinding() { }
 
    public String getName() {
       return this.name;
@@ -92,7 +92,7 @@ public class NameSpaceBinding implements
     * @see java.lang.Object#clone()
     */
    public Object clone() throws CloneNotSupportedException {
-      NameSpaceBinding clone = new NameSpaceBinding();
+      JNDIBinding clone = new JNDIBinding();
       clone.setName(this.getName());
       clone.setJndiname(this.getJndiname());
       clone.setJndialias(this.getJndialias());
@@ -103,13 +103,13 @@ public class NameSpaceBinding implements
    }
 
    /**
-    * Transform the <code>NameSpaceBinding</code> POJO to a DOM element.
+    * Transform the <code>JNDIBinding</code> POJO to a DOM element.
     * 
     * @param document the DOM document.
     * @return the DOM element.
     */
    protected Element toDOMElement(CoreDocumentImpl document) {
-      ElementImpl element = new ElementImpl(document, "namespacebinding");
+      ElementImpl element = new ElementImpl(document, "jndibinding");
       element.setAttribute("name", this.getName());
       element.setAttribute("jndiname", this.getJndiname());
       element.setAttribute("jndialias", this.getJndialias());
@@ -123,7 +123,7 @@ public class NameSpaceBinding implements
     * @see java.lang.Comparable#compareTo(java.lang.Object)
     */
    public int compareTo(Object anotherNameSpaceBinding) {
-       return this.getName().compareTo(((NameSpaceBinding)anotherNameSpaceBinding).getName());
+       return this.getName().compareTo(((JNDIBinding)anotherNameSpaceBinding).getName());
    }
 
 }
\ No newline at end of file



Mime
View raw message