Index: j2eeserver/apichanges.xml
===================================================================
RCS file: /cvs/j2eeserver/apichanges.xml,v
retrieving revision 1.16.6.3
retrieving revision 1.16.6.3.10.1
diff -c -r1.16.6.3 -r1.16.6.3.10.1
*** j2eeserver/apichanges.xml	2 Nov 2005 03:09:05 -0000	1.16.6.3
--- j2eeserver/apichanges.xml	17 Mar 2006 16:12:09 -0000	1.16.6.3.10.1
***************
*** 80,85 ****
--- 80,107 ----
      <!-- ACTUAL CHANGES BEGIN HERE: -->
  
      <changes>
+         <change id="DatasourceManagementAPI">
+             <api name="j2eeserver"/>
+             <summary>DS management API allows clients to access and manipulate the data sources</summary>
+             <version major="1" minor="15"/>
+             <date day="17" month="3" year="2006"/>
+             <author login="lkotouc"/>
+             <compatibility addition="yes"/>
+             <description>
+                 <p>
+                     DS management API allows clients to access and manipulate the data sources. 
+                     Data sources are created in the module and deployed when the module deployment begins.
+                     Data sources are accessed at two places - at the modules where they are stored after creation 
+                     and on the module's target server.
+                 </p>
+             </description>
+             <class package="org.netbeans.modules.j2ee.deployment.devmodules.spi" name="J2eeModuleProvider"/>
+             <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="ConfigurationSupport"/>
+             <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="Datasource"/>
+             <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="DatasourceAlreadyExistsException"/>
+             <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="DatasourceManager"/>
+             <class package="org.netbeans.modules.j2ee.deployment.plugins.api" name="OptionalDeploymentManagerFactory"/>
+         </change>
          <change id="resourceDirUpdate">
              <api name="j2eeserver"/>
              <summary>
Index: j2eeserver/arch.xml
===================================================================
RCS file: /cvs/j2eeserver/arch.xml,v
retrieving revision 1.11.10.3.2.1
retrieving revision 1.11.10.3.2.1.6.1
diff -c -r1.11.10.3.2.1 -r1.11.10.3.2.1.6.1
*** j2eeserver/arch.xml	9 Feb 2006 12:57:23 -0000	1.11.10.3.2.1
--- j2eeserver/arch.xml	17 Mar 2006 16:12:08 -0000	1.11.10.3.2.1.6.1
***************
*** 238,243 ****
--- 238,291 ----
  <p><i>Not supported in current version.</i></p>
  </usecase>
  
+ <usecase id="Retrieve-data-sources" name="Retrieve data sources">
+     <p>
+         Data sources created in the module and deployed on the server are accessed using
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.html">J2eeModuleProvider</a> methods.
+         Some of the module's data source may be already also deployed on the server, in that case the client
+         is responsible for the duplicity handling.
+     </p>
+     <p>
+         Retrieval from a server is done by a server plugin. Core part of the functionality is done by 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceManager.html">DatasourceManager</a> implementation
+         which is exposed from a server plugin through 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/OptionalDeploymentManagerFactory.html">OptionalDeploymentManagerFactory</a>.
+     </p>
+     <p>
+         Retrieval from a module is done with help of 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.ConfigSupport.html">ConfigSupport</a> and 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/ConfigurationSupport.html">ConfigurationSupport</a> implementations.
+     </p>
+ </usecase>
+ 
+ <usecase id="Create-data-source" name="Create data source">
+     <p>
+         Data sources are created in a module if they does not exist yet on a server or in a module itself.
+         Data sources are stored in the server-specific format, only some common subset of attributes 
+         (e.g. JNDI name, username, url, ...) is provided by a creator.<br/>
+     </p>
+     <p>
+         Data source creation is done with help of 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.ConfigSupport.html">ConfigSupport</a> and 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/ConfigurationSupport.html">ConfigurationSupport</a> implementations.
+         In case of conflict with existing data source, the first conflicting data source is passed to the thrown 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceAlreadyExistsException.html">DatasourceAlreadyExistsException</a>.
+     </p>
+ </usecase>
+ 
+ <usecase id="Deploy-data-sources" name="Deploy data source">
+     <p>
+         Data sources stored in a module are deployed (registered) on a module's target server at the beginning
+         of a module deployment.<br/>
+     </p>
+     <p>
+         Data sources stored in a module are retrived and passed to a
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceManager.html">DatasourceManager</a> instance
+         for deploying (registering) on the server.<br/>
+         All module data sources having a conflict with some existing server data source are passed to the thrown 
+         <a href="@TOP@/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceAlreadyExistsException.html">DatasourceAlreadyExistsException</a>.
+     </p>
+ </usecase>
  
  </answer>
  <!--         
Index: j2eeserver/nbproject/project.properties
===================================================================
RCS file: /cvs/j2eeserver/nbproject/project.properties,v
retrieving revision 1.9.34.1
retrieving revision 1.9.34.1.6.2
diff -c -r1.9.34.1 -r1.9.34.1.6.2
*** j2eeserver/nbproject/project.properties	9 Feb 2006 12:57:26 -0000	1.9.34.1
--- j2eeserver/nbproject/project.properties	24 Mar 2006 17:12:22 -0000	1.9.34.1.6.2
***************
*** 10,16 ****
  # Microsystems, Inc. All Rights Reserved.
  
  is.autoload=true
! spec.version.base=1.14.0
  
  javadoc.title=J2EE Server API
  javadoc.overview=${basedir}/api/doc/overview.html
--- 10,17 ----
  # Microsystems, Inc. All Rights Reserved.
  
  is.autoload=true
! javac.source=1.5
! spec.version.base=1.15.0
  
  javadoc.title=J2EE Server API
  javadoc.overview=${basedir}/api/doc/overview.html
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/Datasource.java
===================================================================
RCS file: j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/Datasource.java
diff -N j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/Datasource.java
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/Datasource.java	24 Mar 2006 17:41:42 -0000	1.1.2.1
***************
*** 0 ****
--- 1,66 ----
+ /*
+  *                 Sun Public License Notice
+  *
+  * The contents of this file are subject to the Sun Public License
+  * Version 1.0 (the "License"). You may not use this file except in
+  * compliance with the License. A copy of the License is available at
+  * http://www.sun.com/
+  *
+  * The Original Code is NetBeans. The Initial Developer of the Original
+  * Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+  * Microsystems, Inc. All Rights Reserved.
+  */
+ 
+ package org.netbeans.modules.j2ee.deployment.common.api;
+ 
+ /**
+  * Represents a data source
+  *
+  * @author Libor Kotouc
+  *
+  * @since 1.15
+  */
+ public interface Datasource {
+     
+     /**
+      * Returns the JNDI name
+      *
+      * @return the JNDI name
+      */
+     String getJndiName();
+     
+     /**
+      * Returns the database URL
+      *
+      * @return the database URL
+      */
+     String getUrl();
+     
+     /**
+      * Returns the database user
+      *
+      * @return the database user
+      */
+     String getUsername();
+     
+     /**
+      * Returns the password
+      *
+      * @return the the password
+      */
+     String getPassword();
+     
+     /**
+      * Returns the fully qualified name of the database driver class
+      *
+      * @return the fully qualified name of the database driver class
+      */
+     String getDriverClassName();
+     
+     /**
+      * Returns the data source display name
+      *
+      * @return the data source display name
+      */
+     String getDisplayName();
+ }
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/DatasourceAlreadyExistsException.java
===================================================================
RCS file: j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/DatasourceAlreadyExistsException.java
diff -N j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/DatasourceAlreadyExistsException.java
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/common/api/DatasourceAlreadyExistsException.java	24 Mar 2006 17:41:42 -0000	1.1.2.1
***************
*** 0 ****
--- 1,65 ----
+ /*
+  *                 Sun Public License Notice
+  *
+  * The contents of this file are subject to the Sun Public License
+  * Version 1.0 (the "License"). You may not use this file except in
+  * compliance with the License. A copy of the License is available at
+  * http://www.sun.com/
+  *
+  * The Original Code is NetBeans. The Initial Developer of the Original
+  * Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+  * Microsystems, Inc. All Rights Reserved.
+  */
+ 
+ package org.netbeans.modules.j2ee.deployment.common.api;
+ 
+ import java.util.LinkedList;
+ import java.util.List;
+ import org.openide.util.NbBundle;
+ 
+ /**
+  *
+  * Indicates conflict between the data sources being deployed/saved and the existing ones.
+  *
+  * @author Libor Kotouc
+  *
+  * @since 1.15
+  */
+ public final class DatasourceAlreadyExistsException extends Exception {
+     
+     private List<Datasource> datasources;
+     
+     /**
+      * Creates new DatasourceAlreadyExistsException with the list of conflicting data sources
+      *
+      * @param datasources the list of conflicting data sources
+      *
+      * @exception NullPointerException if the <code>datasources</code> argument is <code>null</code>
+      */
+     public DatasourceAlreadyExistsException(List<Datasource> datasources) {
+         if (datasources == null) {
+             throw new NullPointerException(NbBundle.getMessage(getClass(), "ERR_CannotPassNullDatasources")); // NOI18N
+         }
+         this.datasources = datasources;
+     }
+     
+     /**
+      * Creates new DatasourceAlreadyExistsException with the conflicting data source
+      *
+      * @param datasource the conflicting data source
+      */
+     public DatasourceAlreadyExistsException(Datasource datasource) {
+         datasources = new LinkedList<Datasource>();
+         datasources.add(datasource);
+     }
+     
+     /**
+      * Returns list of conflicting data sources
+      *
+      * @return list of conflicting data sources
+      */
+     public List<Datasource> getDatasources() {
+         return datasources;
+     }
+     
+ }
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java,v
retrieving revision 1.40.2.4
retrieving revision 1.40.2.4.10.3
diff -c -r1.40.2.4 -r1.40.2.4.10.3
*** j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java	18 Jan 2006 19:32:46 -0000	1.40.2.4
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java	27 Mar 2006 12:49:37 -0000	1.40.2.4.10.3
***************
*** 23,28 ****
--- 23,30 ----
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
+ import java.util.Set;
+ import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
  import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
  import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
  import org.netbeans.modules.j2ee.deployment.impl.Server;
***************
*** 36,41 ****
--- 38,45 ----
  import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;
  import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
  import org.netbeans.modules.j2ee.deployment.plugins.api.ConfigurationSupport;
+ import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
+ import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
  import org.openide.ErrorManager;
  import org.openide.filesystems.FileLock;
  import org.openide.filesystems.FileObject;
***************
*** 291,296 ****
--- 295,349 ----
          ConfigurationSupport serverConfig = server.getConfigurationSupport();
          serverConfig.ensureResourceDefined(config, ejbBean);
      }
+     
+     public Set<Datasource> getDatasources() {
+         
+         Set<Datasource> projectDS = null;
+         
+         if (server != null) {
+             ConfigurationSupport configSupport = server.getConfigurationSupport();
+             if (configSupport != null) {
+                 DeploymentConfiguration config = getDeploymentConfiguration();
+                 if (config != null) {
+                     projectDS = configSupport.getDatasources(config);
+                 }
+             }
+         }
+ 
+         return projectDS;
+     }
+ 
+     public boolean isDatasourceCreationSupported() {
+         ConfigurationSupport configSupport = server.getConfigurationSupport();
+         
+         if (configSupport == null)
+             return false;
+         
+         return configSupport.isDatasourceCreationSupported();
+     }
+     
+     public Datasource createDatasource(String jndiName, String  url, String username, String password, String driver) 
+     throws OperationUnsupportedException, DatasourceAlreadyExistsException
+     {
+ 
+         Datasource ds = null;
+         
+         if (server != null) {
+             ConfigurationSupport configSupport = server.getConfigurationSupport();
+             if (configSupport != null) {
+                 DeploymentConfiguration config = getDeploymentConfiguration();
+                 if (config != null) {
+                     try {
+                         ds = configSupport.createDatasource(config, jndiName, url, username, password, driver);
+                     } catch (ConfigurationException ce) {
+                         ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ce);
+                     }
+                 }
+             }
+         }
+         
+         return ds;
+     }    
      
      // DeploymentConfigurationProvider implementation -------------------------
      
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java,v
retrieving revision 1.21.6.1
retrieving revision 1.21.6.1.10.1
diff -c -r1.21.6.1 -r1.21.6.1.10.1
*** j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java	24 Nov 2005 19:26:09 -0000	1.21.6.1
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java	13 Mar 2006 17:35:17 -0000	1.21.6.1.10.1
***************
*** 64,69 ****
--- 64,70 ----
      }
      
      public String deploy (J2eeModuleProvider jmp, boolean debugmode, String clientModuleUrl, String clientUrlPart, boolean forceRedeploy, Logger logger) throws DeploymentException {
+         
          DeploymentTargetImpl target = new DeploymentTargetImpl(jmp, clientModuleUrl);
          TargetModule[] modules = null;
          final J2eeModule module = target.getModule();
***************
*** 74,79 ****
--- 75,82 ----
          try {
              progress.start();
              
+             jmp.deployDatasources();
+ 
              ServerString server = target.getServer(); //will throw exception if bad server id
          
              if (module == null) {
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/.cvsignore
===================================================================
RCS file: j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/.cvsignore
diff -N j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/.cvsignore
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/.cvsignore	13 Mar 2006 17:35:19 -0000	1.1.4.1
***************
*** 0 ****
--- 1 ----
+ gen
\ No newline at end of file
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.java,v
retrieving revision 1.47.30.3
retrieving revision 1.47.30.3.10.6
diff -c -r1.47.30.3 -r1.47.30.3.10.6
*** j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.java	2 Nov 2005 03:09:08 -0000	1.47.30.3
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.java	27 Mar 2006 12:49:38 -0000	1.47.30.3.10.6
***************
*** 15,22 ****
--- 15,28 ----
  
  import java.beans.PropertyChangeListener;
  import java.beans.PropertyChangeSupport;
+ import java.io.IOException;
  import java.io.OutputStream;
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.Set;
  import javax.enterprise.deploy.spi.Target;
+ import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
+ import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
  import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
  import org.netbeans.modules.j2ee.deployment.common.api.ValidationException;
  import org.netbeans.modules.j2ee.deployment.config.*;
***************
*** 27,38 ****
--- 33,48 ----
  import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
  import org.netbeans.modules.j2ee.deployment.impl.ServerString;
  import org.netbeans.modules.j2ee.deployment.impl.ServerTarget;
+ import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
+ import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
  import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
  import org.netbeans.modules.j2ee.deployment.plugins.api.ServerDebugInfo;
  import org.netbeans.modules.j2ee.deployment.common.api.SourceFileMap;
  import org.netbeans.modules.j2ee.deployment.plugins.api.StartServer;
  import org.netbeans.modules.j2ee.deployment.plugins.api.VerifierSupport;
+ import org.openide.ErrorManager;
  import org.openide.filesystems.FileObject;
+ import org.openide.filesystems.FileUtil;
  import org.openide.util.WeakListeners;
  import java.io.File;
  import java.util.ArrayList;
***************
*** 117,122 ****
--- 127,224 ----
      }
      
      /**
+      * Gets the data sources deployed on the target server instance.
+      *
+      * @return set of data sources
+      *
+      * @since 1.15 
+      */
+     public Set<Datasource> getServerDatasources() {
+         ServerInstance si = ServerRegistry.getInstance ().getServerInstance (getServerInstanceID ());
+         Set<Datasource> deployedDS = si.getDatasources();
+         return deployedDS;
+     }
+     
+     /**
+      * Gets the data sources saved in the module.
+      *
+      * @return set of data sources
+      *
+      * @since 1.15 
+      */
+     public Set<Datasource> getModuleDatasources() {
+         Set<Datasource> projectDS = getConfigSupport().getDatasources();
+         return projectDS;
+     }
+ 
+     /**
+      * Tests whether data source creation is supported.
+      *
+      * @return true if data source creation is supported, false otherwise.
+      *
+      * @since 1.15 
+      */
+     public boolean isDatasourceCreationSupported() {
+         return getConfigSupport().isDatasourceCreationSupported();
+     }
+     
+     
+     /**
+      * Creates and saves data source in the module if it does not exist yet on the target server or in the module.
+      * Data source is considered to be existing when JNDI name of the found data source and the one
+      * just created equal.
+      *
+      * @param jndiName name of data source
+      * @param url database URL
+      * @param username database user
+      * @param password user's password
+      * @param driver fully qualified name of database driver class
+      * @return created data source
+      * @exception DatasourceAlreadyExistsException if conflicting data source is found
+      *
+      * @since 1.15 
+      */
+     public final Datasource createDatasource(String jndiName, String  url, String username, String password, String driver) 
+     throws DatasourceAlreadyExistsException {
+ 
+         //check whether the ds is not already on the server
+         Set<Datasource> deployedDS = getServerDatasources();
+         if (deployedDS != null) {
+             for (Iterator it = deployedDS.iterator(); it.hasNext();) {
+                 Datasource ds = (Datasource) it.next();
+                 if (jndiName.equals(ds.getJndiName())) // ds with the same JNDI name already exists on the server, do not create new one
+                     throw new DatasourceAlreadyExistsException(ds);
+             }
+         }
+         
+         Datasource ds = null;
+         try {
+             //btw, ds existence in a project is verified directly in the deployment configuration
+             ds = getConfigSupport().createDatasource(jndiName, url, username, password, driver);
+         } catch (OperationUnsupportedException oue) {
+             ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, oue);
+         }
+         
+         return ds;
+     }
+     
+     /**
+      * Deploys data sources saved in the module.
+      *
+      * @exception ConfigurationException if there is some problem with data source configuration
+      * @exception DatasourceAlreadyExistsException if module data source(s) are conflicting
+      * with data source(s) already deployed on the server
+      *
+      * @since 1.15 
+      */
+     public void deployDatasources() throws ConfigurationException, DatasourceAlreadyExistsException {
+         ServerInstance si = ServerRegistry.getInstance ().getServerInstance (getServerInstanceID ());
+         Set<Datasource> moduleDS = getModuleDatasources();
+         si.deployDatasources(moduleDS);
+     }
+     
+     
+     /**
       * Register a listener which will be notified when some of the properties
       * change.
       * 
***************
*** 206,211 ****
--- 308,350 ----
           * @param ejbtype dtd name for type of ejb: 'message-drive', 'entity', 'session'.
           */
          public void ensureResourceDefinedForEjb(String ejbname, String ejbtype);
+         
+         /**
+          * Tests whether data source creation is supported.
+          *
+          * @return true if data source creation is supported, false otherwise.
+          *
+          * @since 1.15 
+          */
+         public boolean isDatasourceCreationSupported();
+                 
+         /**
+          * Gets the data sources saved in the module.
+          *
+          * @return set of data sources
+          *
+          * @since 1.15 
+          */
+         public Set<Datasource> getDatasources();
+         
+         /**
+          * Creates and saves data source in the module if it does not exist yet in the module.
+          * Data source is considered to be existing when JNDI name of the found data source and the one
+          * just created equal.
+          *
+          * @param jndiName name of data source
+          * @param url database URL
+          * @param username database user
+          * @param password user's password
+          * @param driver fully qualified name of database driver class
+          * @return created data source
+          * @exception OperationUnsupportedException if operation is not supported
+          * @exception DatasourceAlreadyExistsException if conflicting data source is found
+          *
+          * @since 1.15 
+          */
+         public Datasource createDatasource(String jndiName, String  url, String username, String password, String driver)
+         throws OperationUnsupportedException, DatasourceAlreadyExistsException;
      }
      
      /**
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java,v
retrieving revision 1.61.2.4
retrieving revision 1.61.2.4.10.2
diff -c -r1.61.2.4 -r1.61.2.4.10.2
*** j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java	18 Jan 2006 19:32:46 -0000	1.61.2.4
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java	24 Mar 2006 17:41:42 -0000	1.61.2.4.10.2
***************
*** 18,35 ****
  import java.beans.PropertyChangeListener;
  import javax.enterprise.deploy.spi.*;
  import javax.enterprise.deploy.shared.*;
  import javax.enterprise.deploy.spi.status.*;
  import javax.swing.JButton;
  import javax.swing.SwingUtilities;
- import org.netbeans.api.debugger.Breakpoint;
- import org.netbeans.api.debugger.DebuggerEngine;
  import org.netbeans.api.debugger.DebuggerManager;
  import org.netbeans.api.debugger.DebuggerManagerAdapter;
- import org.netbeans.api.debugger.DebuggerManagerListener;
  import org.netbeans.api.debugger.Session;
- import org.netbeans.api.debugger.Watch;
  import org.netbeans.api.debugger.jpda.AttachingDICookie;
  import org.netbeans.api.debugger.jpda.JPDADebugger;
  import org.netbeans.modules.j2ee.deployment.plugins.api.*;
  import org.openide.filesystems.*;
  import java.util.*;
--- 18,33 ----
  import java.beans.PropertyChangeListener;
  import javax.enterprise.deploy.spi.*;
  import javax.enterprise.deploy.shared.*;
+ import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
  import javax.enterprise.deploy.spi.status.*;
  import javax.swing.JButton;
  import javax.swing.SwingUtilities;
  import org.netbeans.api.debugger.DebuggerManager;
  import org.netbeans.api.debugger.DebuggerManagerAdapter;
  import org.netbeans.api.debugger.Session;
  import org.netbeans.api.debugger.jpda.AttachingDICookie;
  import org.netbeans.api.debugger.jpda.JPDADebugger;
+ import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
  import org.netbeans.modules.j2ee.deployment.plugins.api.*;
  import org.openide.filesystems.*;
  import java.util.*;
***************
*** 86,91 ****
--- 84,90 ----
      private J2eePlatformImpl j2eePlatformImpl;
      private StartServer startServer;
      private FindJSPServlet findJSPServlet;
+     private DatasourceManager dsMgr;
      private final Set targetsStartedByIde = new HashSet(); // valued by target name
      private Map targets; // keyed by target name, valued by ServerTarget
      private boolean managerStartedByIde = false;
***************
*** 417,422 ****
--- 416,462 ----
              }
          }
          return findJSPServlet;
+     }
+     
+     private DatasourceManager getDatasourceManager() {
+         
+         if (dsMgr == null) {
+             DeploymentManager dm = getDeploymentManager();
+             dsMgr = server.getOptionalFactory().getDatasourceManager(dm);
+         }
+ 
+         return dsMgr;
+     }
+     
+     /**
+      * Gets the data sources deployed on the this server instance.
+      *
+      * @return set of data sources 
+      */
+     public Set getDatasources() {
+         
+         DatasourceManager dsMgr = getDatasourceManager();
+                 
+         Set deployedDS = new HashSet();
+         if (dsMgr != null) 
+             deployedDS = dsMgr.getDatasources();
+         
+         return deployedDS;
+     }
+     
+     /**
+      * Deploys data sources saved in the module.
+      *
+      * @exception ConfigurationException if there is some problem with data source configuration
+      * @exception DatasourceAlreadyExistsException if module data source(s) are conflicting
+      * with data source(s) already deployed on the server
+      */
+     public void deployDatasources(Set datasources) throws ConfigurationException, DatasourceAlreadyExistsException {
+         
+         DatasourceManager dsMgr = getDatasourceManager();
+ 
+         if (dsMgr != null) 
+             dsMgr.deployDatasources(datasources);
      }
      
      //---------- State API's:  running, debuggable, startedByIDE -----------
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/ConfigurationSupport.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/ConfigurationSupport.java,v
retrieving revision 1.2.42.2
retrieving revision 1.2.42.2.10.4
diff -c -r1.2.42.2 -r1.2.42.2.10.4
*** j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/ConfigurationSupport.java	2 Nov 2005 03:09:10 -0000	1.2.42.2
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/ConfigurationSupport.java	24 Mar 2006 17:41:39 -0000	1.2.42.2.10.4
***************
*** 14,25 ****
--- 14,31 ----
  package org.netbeans.modules.j2ee.deployment.plugins.api;
  
  import java.io.File;
+ import java.util.Collections;
+ import java.util.HashSet;
+ import java.util.Set;
  import javax.enterprise.deploy.model.DDBean;
  import javax.enterprise.deploy.model.DeployableObject;
  import javax.enterprise.deploy.spi.DeploymentConfiguration;
  import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
+ import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
  import org.netbeans.api.project.FileOwnerQuery;
  import org.netbeans.api.project.Project;
+ import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
+ import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
  import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
  import org.netbeans.modules.j2ee.deployment.config.ConfigSupportImpl;
  import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
***************
*** 236,239 ****
--- 242,292 ----
       * @since 1.12
       */
      public abstract void updateResourceDir(DeploymentConfiguration config, File resourceDir);
+     
+     /**
+      * Gets the data sources saved in the module.
+      *
+      * @param config deployment configuration
+      * @return a set of data sources. The default implementation returns an empty set.
+      *
+      * @since 1.15
+      */
+     public Set<Datasource> getDatasources(DeploymentConfiguration config) {
+         return Collections.emptySet();
+     }
+     
+     /**
+      * Tests whether data source creation is supported.
+      *
+      * @return true if data source creation is supported. The default implementation returns false.
+      *
+      * @since 1.15
+      */
+     public boolean isDatasourceCreationSupported() {
+         return false;
+     }
+             
+     /**
+      * Creates and saves data source in the module if it does not exist yet in the module.
+      * Data source is considered to be existing when JNDI name of the found data source and the one
+      * just created equal.
+      *
+      * @param config deployment configuration
+      * @param jndiName name of data source
+      * @param url database URL
+      * @param username database user
+      * @param password user's password
+      * @param driver fully qualified name of the database driver class
+      * @return created data source
+      * @exception OperationUnsupportedException if operation is not supported
+      * @exception ConfigurationException if data source configuration file is not parseable
+      * @exception DatasourceAlreadyExistsException if conflicting data source is found
+      *
+      * @since 1.15
+      */
+     public Datasource createDatasource(DeploymentConfiguration config, String jndiName, String  url, String username, String password, String driver) 
+     throws OperationUnsupportedException, ConfigurationException, DatasourceAlreadyExistsException
+     {
+         throw new OperationUnsupportedException(""); // NOI18N
+     }
  }
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceManager.java
===================================================================
RCS file: j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceManager.java
diff -N j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceManager.java
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/DatasourceManager.java	24 Mar 2006 17:41:39 -0000	1.1.4.4
***************
*** 0 ****
--- 1,47 ----
+ /*
+  *                 Sun Public License Notice
+  *
+  * The contents of this file are subject to the Sun Public License
+  * Version 1.0 (the "License"). You may not use this file except in
+  * compliance with the License. A copy of the License is available at
+  * http://www.sun.com/
+  *
+  * The Original Code is NetBeans. The Initial Developer of the Original
+  * Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+  * Microsystems, Inc. All Rights Reserved.
+  */
+ 
+ package org.netbeans.modules.j2ee.deployment.plugins.api;
+ 
+ import java.util.Set;
+ import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
+ import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
+ import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
+ 
+ /**
+  * DatasourceManager is responsible for retrieving data sources deployed on the server and
+  * deploying data sources onto the server.
+  *
+  * @author Libor Kotouc
+  *
+  * @since 1.15
+  */
+ public interface DatasourceManager {
+     
+     /**
+      * Retrieves the data sources deployed on the server
+      *
+      * @return the set of data sources deployed on the server
+      */
+     Set<Datasource> getDatasources();
+ 
+     /**
+      * Deploys given set of data sources.
+      *
+      * @exception ConfigurationException if there is some problem with data source configuration
+      * @exception DatasourceAlreadyExistsException if module data source(s) are conflicting
+      * with data source(s) already deployed on the server
+      */
+     void deployDatasources(Set<Datasource> datasources) 
+     throws ConfigurationException, DatasourceAlreadyExistsException;
+ }
Index: j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/OptionalDeploymentManagerFactory.java
===================================================================
RCS file: /cvs/j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/OptionalDeploymentManagerFactory.java,v
retrieving revision 1.4
retrieving revision 1.4.42.3
diff -c -r1.4 -r1.4.42.3
*** j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/OptionalDeploymentManagerFactory.java	30 May 2005 09:16:01 -0000	1.4
--- j2eeserver/src/org/netbeans/modules/j2ee/deployment/plugins/api/OptionalDeploymentManagerFactory.java	24 Mar 2006 17:12:22 -0000	1.4.42.3
***************
*** 58,61 ****
--- 58,77 ----
      public WizardDescriptor.InstantiatingIterator getAddInstanceIterator() {
          return null;
      }
+     
+     /**
+      * Creates a <code>DatasourceManager</code> for the given deployment manager
+      * or <code>null</code> if data source management is not supported
+      *
+      * @param dm the deployment manager
+      *
+      * @return a data source manager or <code>null</code> if data source management
+      *         is not supported
+      *
+      * @since 1.15
+      */
+     public DatasourceManager getDatasourceManager(DeploymentManager dm) {
+         return null;
+     }
+     
  }