Attachment #39932 for bug #93815

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 93815
Collapse All | Expand All




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (the License). You may not use this file except in
 * compliance with the License.
 *
 * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.j2ee.deployment.common.api;

/**
 * Represents a message destination
 *
 * @author Libor Kotouc
 *
 * @since 1.25
 */
public interface MessageDestination {
    
    /**
     * Message destination type
     */
    public enum Type {
        /**
         * Queue
         */ 
        QUEUE, 
        
        /**
         * Topic
         */
        TOPIC
    };
    
    /**
     * Returns the JNDI name
     *
     * @return the JNDI name
     */
    public String getJndiName();
    
    /**
     * Returns the type
     * 
     * @return the type
     */
    public Type getType();
}




 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.j2ee.deployment.config;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;

import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.enterprise.deploy.model.DDBean;
import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
import org.netbeans.modules.j2ee.dd.api.common.ComponentInterface;
import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeApplication;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
import org.netbeans.modules.j2ee.deployment.execution.ModuleConfigurationProvider;
import org.netbeans.modules.j2ee.deployment.impl.Server;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import javax.enterprise.deploy.shared.ModuleType;

import org.openide.util.NbBundle;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
import org.netbeans.modules.j2ee.deployment.execution.ModuleConfigurationProvider;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.MessageDestinationConfiguration;

/**
 * Each J2eeModuleProvider hold a reference to an instance of this config support.

    }
    
    public Datasource createDatasource(String jndiName, String  url, String username, String password, String driver) 
    throws UnsupportedOperationException, DatasourceAlreadyExistsException {
        Datasource ds = null;
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();

        }
        return ds;
    }    
    
    public void bindDatasourceReference(String dsReferenceName, String dsJNDIName) throws ConfigurationException {
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    datasourceConfiguration.bindDatasourceReference(dsReferenceName, dsJNDIName);
                }
            }
        }
   }

    public void bindDatasourceReferenceEjb(String dsReferenceName, String dsJNDIName,
                                           String ejbName, String ejbType) throws ConfigurationException {
        if (!EnterpriseBeans.SESSION.equals(ejbType) &&
            !EnterpriseBeans.ENTITY.equals(ejbType) &&
            !EnterpriseBeans.MESSAGE_DRIVEN.equals(ejbType)) {
            throw new IllegalArgumentException("ejbType parameter doesn't have an allowed value.");
        }
        
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    datasourceConfiguration.bindDatasourceReferenceEjb(dsReferenceName, dsJNDIName, ejbName, ejbType);
                }
            }
        }
    }

    public Datasource findDatasourceForReference(String referenceName) throws ConfigurationException {
        String jndiName = findDatasourceBinding(referenceName);
        if (jndiName == null) {
            return null;
        }
        Set<Datasource> datasources = getDatasources();
        for (Datasource ds : datasources) {
            if (jndiName.equals(ds.getJndiName())) {
                return ds;
            }
        }
        datasources = provider.getServerDatasources();
        for (Datasource ds : datasources) {
            if (jndiName.equals(ds.getJndiName())) {
                return ds;
            }
        }
        
        return null;
    }

    private String findDatasourceBinding(String dsReferenceName) throws ConfigurationException {
        String jndiName = null;
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    jndiName = datasourceConfiguration.findDatasourceBinding(dsReferenceName);
                }
            }
        }
        
        return jndiName;
    }

    public Datasource findDatasourceForReferenceEjb(String referenceName, String ejbName) throws ConfigurationException {
        String jndiName = findDatasourceBindingEjb(referenceName, ejbName);
        if (jndiName == null) {
            return null;
        }
        Set<Datasource> datasources = getDatasources();
        for (Datasource ds : datasources) {
            if (jndiName.equals(ds.getJndiName())) {
                return ds;
            }
        }
        datasources = provider.getServerDatasources();
        for (Datasource ds : datasources) {
            if (jndiName.equals(ds.getJndiName())) {
                return ds;
            }
        }
        
        return null;
    }
    
    private String findDatasourceBindingEjb(String dsReferenceName, String ejbName) throws ConfigurationException {
        String jndiName = null;
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    jndiName = datasourceConfiguration.findDatasourceBindingEjb(dsReferenceName, ejbName);
                }
            }
        }
        
        return jndiName;
    }

    public Set<MessageDestination> getMessageDestinations() throws ConfigurationException {
        
        Set<MessageDestination> destinations = Collections.<MessageDestination>emptySet();
        
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
                if (msgConfig != null) {
                    destinations = msgConfig.getMessageDestinations();
                }
            }
        }

        return destinations;
    }

    public Set<MessageDestination> getServerMessageDestinations() throws ConfigurationException {
        ServerInstance si = ServerRegistry.getInstance().getServerInstance(provider.getServerInstanceID());
        if (si == null) {
            ErrorManager.getDefault().log(ErrorManager.WARNING, 
                    "The server data sources cannot be retrieved because the server instance cannot be found.");
            return Collections.<MessageDestination>emptySet();
        }
        
        return si.getMessageDestinations();
   }
    
    public boolean supportsCreateMessageDestination() {
        if (server == null) {
            // the module has no target server
            return false;
        }
        ModuleConfiguration config = getModuleConfiguration();
        if (config != null) {
            MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
            if (msgConfig != null) {
                return msgConfig.supportsCreateMessageDestination();
            }
        }
        return false;
    }

    public MessageDestination createMessageDestination(String jndiName, MessageDestination.Type type) 
    throws UnsupportedOperationException, ConfigurationException {
        
        if (server == null) {
            return null;
        }
         
        ModuleConfiguration config = getModuleConfiguration();
        if (config == null) {
            return null;
        }
        
        MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
        if (msgConfig != null) {
            return msgConfig.createMessageDestination(jndiName, type);
        }

        return null;
    }
    
    // DeploymentConfigurationProvider implementation -------------------------
    




 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.j2ee.deployment.devmodules.api;

import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
import org.netbeans.modules.j2ee.deployment.impl.*;

            }

            jmp.deployDatasources();
            
if (System.getProperties().getProperty("resource-api-redesign") != null) {
            deployMessageDestinations(jmp);
}

            modules = targetserver.deploy(progress, forceRedeploy);
            // inform the plugin about the deploy action, even if there was

            if (progress != null) {
                progress.finish();
            }
        }
    }
    
    public void deployMessageDestinations(J2eeModuleProvider jmp) throws ConfigurationException {
        ServerInstance si = ServerRegistry.getInstance ().getServerInstance (jmp.getServerInstanceID ());
        if (si != null) {
            si.deployMessageDestinations(jmp.getConfigSupport().getMessageDestinations());
        }
        else {
            ErrorManager.getDefault().log(ErrorManager.WARNING, 
                    "The message destinations cannot be deployed because the server instance cannot be found.");
        }
    }
    




 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.j2ee.deployment.devmodules.spi;

import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.enterprise.deploy.spi.Target;
import org.netbeans.modules.j2ee.deployment.common.api.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.*;

import org.netbeans.modules.j2ee.deployment.impl.Server;
import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;
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.spi.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;
import java.util.List;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;

/** This object must be implemented by J2EE module support and an instance 
 * added into project lookup.

        try {
            //btw, ds existence in a project is verified directly in the deployment configuration
            ds = getConfigSupport().createDatasource(jndiName, url, username, password, driver);
        } catch (UnsupportedOperationException oue) {
            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, oue);
        }
        

         * @param password user's password
         * @param driver fully qualified name of database driver class
         * @return created data source
         * @exception UnsupportedOperationException 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 UnsupportedOperationException, DatasourceAlreadyExistsException, ConfigurationException;
        
        /**
         * Binds the data source name used in the sources with the corresponding data source which is
         * identified the given JNDI name.
         * 
         * @param referenceName name used to identify the data source
         * @param jndiName JNDI name of the data source
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public void bindDatasourceReference(String dsReferenceName, String dsJNDIName) throws ConfigurationException;

        /**
         * Binds the data source name used in the sources with the corresponding data source which is
         * identified the given JNDI name. The reference is used within the scope of the EJB.
         * 
         * @param referenceName name used to identify the data source
         * @param jndiName JNDI name of the data source
         * @param ejbName EJB name
         * @param ejbType EJB type - the possible values are 
         * org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION,
         * org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY and
         * org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN

         * @throws ConfigurationException if there is some problem with data source configuration
         * @throws IllegalArgumentException if ejbType doesn't have one of allowed values
         * 
         * @since 1.25
         */
        public void bindDatasourceReferenceEjb(String dsReferenceName, String dsJNDIName,
                                               String ejbName, String ejbType) throws ConfigurationException;
        
        /**
         * Finds data source which is mapped to the given reference name.
         * 
         * @referenceName reference name
         * @return data source if it exists, null otherwise
         *
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public Datasource findDatasourceForReference(String referenceName) throws ConfigurationException;

        /**
         * Finds data source which is mapped to the given reference name in the scope the EJB.
         * 
         * @param referenceName reference name
         * @param ejbName EJB name
         * @return data source if it exists, null otherwise
         *
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public Datasource findDatasourceForReferenceEjb(String referenceName, String ejbName) throws ConfigurationException;
        
        /**
         * Retrieves message destinations stored in the module.
         * 
         * @return set of message destinations
         * 
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25
         */
        public Set<MessageDestination> getMessageDestinations() throws ConfigurationException;

        /**
         * Retrieves message destinations configured on the target server instance.
         *
         * @return set of message destinations
         * 
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25 
         */
        public Set<MessageDestination> getServerMessageDestinations() throws ConfigurationException;
        
        /**
         * Tests whether a message destination creation is supported.
         *
         * @return true if message destination creation is supported, false otherwise.
         *
         * @since 1.25
         */
        public boolean supportsCreateMessageDestination();

        /**
         * Creates and saves a message destination in the module if it does not exist in the module yet.
         * Message destinations are considered to be equal if their JNDI names are equal.
         *
         * @param jndiName JNDI name of the message destination
         * @param type message destination type; the value is of 
         * org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type type
         * @return created message destination
         * 
         * @throws UnsupportedOperationException if this opearation is not supported
         * @throws ConfigurationException if there is some problem with message destination configuration
         *
         * @since 1.25 
         */
        public MessageDestination createMessageDestination(String jndiName, MessageDestination.Type type) 
        throws UnsupportedOperationException, ConfigurationException;
    }

    /**




 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */


import org.openide.filesystems.*;
import java.util.*;
import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
import org.netbeans.modules.j2ee.deployment.impl.ui.ProgressUI;

import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;
import org.netbeans.modules.j2ee.deployment.plugins.spi.IncrementalDeployment;
import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory;
import org.netbeans.modules.j2ee.deployment.plugins.spi.MessageDestinationDeployment;
import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;
import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerSupport;
import org.netbeans.modules.j2ee.deployment.profiler.spi.Profiler;

    private FindJSPServlet findJSPServlet;
    private DatasourceManager dsMgr;
    private DatasourceManager ddsMgr;
    private MessageDestinationDeployment msgDestDeploymentConnected;
    private MessageDestinationDeployment msgDestDeploymentDisconnected;
    private final Set targetsStartedByIde = new HashSet(); // valued by target name
    private Map targets; // keyed by target name, valued by ServerTarget
    private boolean managerStartedByIde = false;


        if (dsMgr != null) 
            dsMgr.deployDatasources(datasources);
    }
    
    private synchronized MessageDestinationDeployment getMessageDestinationDeploymentConnected() {
        if (msgDestDeploymentConnected == null) {
            msgDestDeploymentConnected = server.getOptionalFactory().
                    getMessageDestinationDeployment(getDeploymentManager());
        }

        return msgDestDeploymentConnected;
    }
    
    private MessageDestinationDeployment getMessageDestinationDeploymentDisconnected() {
        DeploymentManager dm = null;
        try {
            dm = getDisconnectedDeploymentManager();
        }  catch (DeploymentManagerCreationException dmce) {
            throw new RuntimeException(dmce);
        }
        synchronized (this) {
            if (msgDestDeploymentDisconnected == null) {
                msgDestDeploymentDisconnected = server.getOptionalFactory().getMessageDestinationDeployment(dm);
            }
            return msgDestDeploymentDisconnected;
        }
    }
    
    /**
     * Retrieves message destinations configured on the target server instance.
     *
     * @return set of message destinations
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     */
    public Set<MessageDestination> getMessageDestinations() throws ConfigurationException {
        
        MessageDestinationDeployment destDepl = getMessageDestinationDeploymentDisconnected();
        if (destDepl != null) {
            return destDepl.getMessageDestinations();
        }
        
        return Collections.<MessageDestination>emptySet();
    }
    
    /**
     * Deploys message destinations saved in the module.
     *
     * @param destinations set of message destinations
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     */
    public void deployMessageDestinations(Set<MessageDestination> destinations) throws ConfigurationException {
        
        MessageDestinationDeployment destDepl = getMessageDestinationDeploymentConnected();
        if (destDepl != null) {
            destDepl.deployMessageDestinations(destinations);
        }
    }
    
    //---------- State API's:  running, debuggable, startedByIDE -----------




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (the License). You may not use this file except in
 * compliance with the License.
 *
 * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.j2ee.deployment.plugins.spi;

import java.util.Set;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;

/**
 * MessageDestinationDeployment is responsible for retrieving message destinations
 * configured on the server and for message destination deployment.
 *
 * @author Libor Kotouc
 *
 * @since 1.25
 */
public interface MessageDestinationDeployment {
    
    /**
     * Retrieves message destinations configured on the target server instance.
     *
     * @return set of message destinations
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     */
    Set<MessageDestination> getMessageDestinations() throws ConfigurationException;

    /**
     * Deploys message destinations saved in the module.
     *
     * @param destinations set of message destinations
     * 
     * @exception ConfigurationException if there is some problem with message destination configuration
     */
    void deployMessageDestinations(Set<MessageDestination> destinations) throws ConfigurationException;
}




 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */


package org.netbeans.modules.j2ee.deployment.plugins.spi;

import javax.enterprise.deploy.spi.DeploymentManager;
import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer;
import org.netbeans.modules.j2ee.deployment.plugins.spi.TargetModuleIDResolver;
import org.openide.WizardDescriptor;

/**

    public DatasourceManager getDatasourceManager(DeploymentManager dm) {
        return null;
    }

    /**
     * Creates a <code>MessageDestinationDeployment</code> for the given deployment manager
     * or <code>null</code> if message destination deployment is not supported
     *
     * @param dm the deployment manager
     *
     * @return a message destination deployment or <code>null</code> 
     *          if message destination deployment is not supported
     *
     * @since 1.25
     */
    public MessageDestinationDeployment getMessageDestinationDeployment(DeploymentManager dm) {
        return null;
    }
    
}




     */
    Datasource createDatasource(String jndiName, String  url, String username, String password, String driver) 
    throws UnsupportedOperationException, ConfigurationException, DatasourceAlreadyExistsException;

    /**
     * Binds the data source name used in the sources with the corresponding data source which is
     * identified the given JNDI name.
     * 
     * @param referenceName name used to identify the data source
     * @param jndiName JNDI name of the data source
     * @throws ConfigurationException if there is some problem with data source configuration
     * 
     * @since 1.25
     */
    public void bindDatasourceReference(String dsReferenceName, String dsJNDIName) throws ConfigurationException;

    /**
     * Binds the data source name used in the sources with the corresponding data source which is
     * identified the given JNDI name. The reference is used within the scope of the EJB.
     * 
     * @param referenceName name used to identify the data source
     * @param jndiName JNDI name of the data source
     * @param ejbName EJB name
     * @param ejbType EJB type - the possible values are 
     * org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION,
     * org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY and
     * org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN

     * @throws ConfigurationException if there is some problem with data source configuration
     * 
     * @since 1.25
     */
    public void bindDatasourceReferenceEjb(String dsReferenceName, String dsJNDIName,
                                           String ejbName, String ejbType) throws ConfigurationException;

    /**
     * Finds JNDI name of the data source which is mapped to the given reference name.
     * 
     * @referenceName reference name
     * @return JNDI name of the data source if the mapping exists, null otherwise
     *
     * @throws ConfigurationException if there is some problem with data source configuration
     * 
     * @since 1.25
     */
    public String findDatasourceBinding(String dsReferenceName) throws ConfigurationException;
    
    /**
     * Finds JNDI name of the data source which is mapped to the given reference name in the scope the EJB.
     * 
     * @param referenceName reference name
     * @param ejbName EJB name
     * @return JNDI name of the data source if the mapping exists, null otherwise
     *
     * @throws ConfigurationException if there is some problem with data source configuration
     * 
     * @since 1.25
     */
    public String findDatasourceBindingEjb(String dsReferenceName, String ejbName) throws ConfigurationException;
}




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (the License). You may not use this file except in
 * compliance with the License.
 *
 * You can obtain a copy of the License at http://www.netbeans.org/cddl.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.j2ee.deployment.plugins.spi.config;

import java.util.Set;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;

/**
 * Configuration useful for managing module message destinations.
 * <p>
 * Implementation of this interface should be registered in the {@link ModuleConfiguration}
 * lookup.
 *
 * @author Libor Kotouc
 */
public interface MessageDestinationConfiguration {
    
    /**
     * Retrieves message destinations stored in the module.
     * 
     * @return set of message destinations
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     * 
     * @since 1.25
     */
    public Set<MessageDestination> getMessageDestinations() throws ConfigurationException;
    
    /**
     * Tests whether a message destination creation is supported.
     *
     * @return true if message destination creation is supported, false otherwise.
     *
     * @since 1.25
     */
    public boolean supportsCreateMessageDestination();
            
    /**
     * Creates and saves a message destination in the module if it does not exist in the module yet.
     * Message destinations are considered to be equal if their JNDI names are equal.
     *
     * @param jndiName JNDI name of the message destination
     * @param type message destination type; the value is of 
     * org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type type
     * @return created message destination
     * 
     * @throws UnsupportedOperationException if this opearation is not supported
     * @throws ConfigurationException if there is some problem with message destination configuration
     *
     * @since 1.25 
     */
    public MessageDestination createMessageDestination(String jndiName, MessageDestination.Type type) 
    throws UnsupportedOperationException, ConfigurationException;
    
}

Lines 39-45 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/plugins/spi/config/ModuleConfiguration.java (-1 / +2 lines)
39	* implementations of all the supported configurations.	39	* implementations of all the supported configurations.
40	* <p>	40	* <p>
41	* The configuration are: {@link ContextRootConfiguration}, {@link DatasourceConfiguration},	41	* The configuration are: {@link ContextRootConfiguration}, {@link DatasourceConfiguration},
42	* {@link MappingConfiguration}, {@link EjbResourceConfiguration}, {@link DeploymentPlanConfiguration}	42	* {@link MappingConfiguration}, {@link EjbResourceConfiguration}, {@link DeploymentPlanConfiguration},
		43	* {@link MessageDestinationConfiguration}
43	* <p>	44	* <p>
44	* Implementators are advised to use {@link org.openide.util.lookup.Lookups#fixed}	45	* Implementators are advised to use {@link org.openide.util.lookup.Lookups#fixed}
45	* to implement this method.	46	* to implement this method.

Return to bug 93815

Lines 13-33 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/devmodules/api/Deployment.java (-5 / +17 lines)
13	* "Portions Copyrighted [year] [name of copyright owner]"	13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*	14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original	15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun	16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.	17	* Microsystems, Inc. All Rights Reserved.
18	*/	18	*/
19		19
20	package org.netbeans.modules.j2ee.deployment.devmodules.api;	20	package org.netbeans.modules.j2ee.deployment.devmodules.api;
21		21
22	import java.awt.event.WindowAdapter;
23	import java.awt.event.WindowEvent;
24	import java.util.ArrayList;	22	import java.util.ArrayList;
25	import java.util.Collection;	23	import java.util.Collection;
26	import java.util.Iterator;	24	import java.util.Iterator;
27	import java.util.List;	25	import java.util.List;
28	import java.util.Map;
29	import java.util.Set;	26	import java.util.Set;
30	import java.util.WeakHashMap;	27	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
31	import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener;	28	import org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener;
32	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;	29	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
33	import org.netbeans.modules.j2ee.deployment.impl.*;	30	import org.netbeans.modules.j2ee.deployment.impl.*;
Lines 106-111 Link Here
106	}	103	}
107		104
108	jmp.deployDatasources();	105	jmp.deployDatasources();
		106
		107	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		108	deployMessageDestinations(jmp);
		109	}
109		110
110	modules = targetserver.deploy(progress, forceRedeploy);	111	modules = targetserver.deploy(progress, forceRedeploy);
111	// inform the plugin about the deploy action, even if there was	112	// inform the plugin about the deploy action, even if there was
Lines 127-132 Link Here
127	if (progress != null) {	128	if (progress != null) {
128	progress.finish();	129	progress.finish();
129	}	130	}
		131	}
		132	}
		133
		134	public void deployMessageDestinations(J2eeModuleProvider jmp) throws ConfigurationException {
		135	ServerInstance si = ServerRegistry.getInstance ().getServerInstance (jmp.getServerInstanceID ());
		136	if (si != null) {
		137	si.deployMessageDestinations(jmp.getConfigSupport().getMessageDestinations());
		138	}
		139	else {
		140	ErrorManager.getDefault().log(ErrorManager.WARNING,
		141	"The message destinations cannot be deployed because the server instance cannot be found.");
130	}	142	}
131	}	143	}
132		144

Lines 13-35 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/devmodules/spi/J2eeModuleProvider.java (-13 / +110 lines)
13	* "Portions Copyrighted [year] [name of copyright owner]"	13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*	14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original	15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun	16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.	17	* Microsystems, Inc. All Rights Reserved.
18	*/	18	*/
19		19
20	package org.netbeans.modules.j2ee.deployment.devmodules.spi;	20	package org.netbeans.modules.j2ee.deployment.devmodules.spi;
21		21
22	import java.beans.PropertyChangeListener;
23	import java.beans.PropertyChangeSupport;
24	import java.io.IOException;
25	import java.io.OutputStream;	22	import java.io.OutputStream;
26	import java.util.Collections;	23	import java.util.Collections;
27	import java.util.Iterator;	24	import java.util.Iterator;
28	import java.util.Map;
29	import java.util.Set;	25	import java.util.Set;
30	import javax.enterprise.deploy.spi.Target;	26	import javax.enterprise.deploy.spi.Target;
31	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;	27	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
32	import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
33	import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;	28	import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
34	import org.netbeans.modules.j2ee.deployment.common.api.ValidationException;	29	import org.netbeans.modules.j2ee.deployment.common.api.ValidationException;
35	import org.netbeans.modules.j2ee.deployment.config.*;	30	import org.netbeans.modules.j2ee.deployment.config.*;
Lines 38-44 Link Here
38	import org.netbeans.modules.j2ee.deployment.impl.Server;	33	import org.netbeans.modules.j2ee.deployment.impl.Server;
39	import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;	34	import org.netbeans.modules.j2ee.deployment.impl.ServerInstance;
40	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;	35	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
41	import org.netbeans.modules.j2ee.deployment.impl.ServerString;
42	import org.netbeans.modules.j2ee.deployment.impl.ServerTarget;	36	import org.netbeans.modules.j2ee.deployment.impl.ServerTarget;
43	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;	37	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
44	import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;	38	import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
Lines 49-59 Link Here
49	import org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport;	43	import org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport;
50	import org.openide.ErrorManager;	44	import org.openide.ErrorManager;
51	import org.openide.filesystems.FileObject;	45	import org.openide.filesystems.FileObject;
52	import org.openide.filesystems.FileUtil;
53	import org.openide.util.WeakListeners;
54	import java.io.File;
55	import java.util.ArrayList;	46	import java.util.ArrayList;
56	import java.util.List;	47	import java.util.List;
		48	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
57		49
58	/** This object must be implemented by J2EE module support and an instance	50	/** This object must be implemented by J2EE module support and an instance
59	* added into project lookup.	51	* added into project lookup.
Lines 207-213 Link Here
207	try {	199	try {
208	//btw, ds existence in a project is verified directly in the deployment configuration	200	//btw, ds existence in a project is verified directly in the deployment configuration
209	ds = getConfigSupport().createDatasource(jndiName, url, username, password, driver);	201	ds = getConfigSupport().createDatasource(jndiName, url, username, password, driver);
210	} catch (OperationUnsupportedException oue) {	202	} catch (UnsupportedOperationException oue) {
211	ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, oue);	203	ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, oue);
212	}	204	}
213		205
Lines 325-337 Link Here
325	* @param password user's password	317	* @param password user's password
326	* @param driver fully qualified name of database driver class	318	* @param driver fully qualified name of database driver class
327	* @return created data source	319	* @return created data source
328	* @exception OperationUnsupportedException if operation is not supported	320	* @exception UnsupportedOperationException if operation is not supported
329	* @exception DatasourceAlreadyExistsException if conflicting data source is found	321	* @exception DatasourceAlreadyExistsException if conflicting data source is found
330	*	322	*
331	* @since 1.15	323	* @since 1.15
332	*/	324	*/
333	public Datasource createDatasource(String jndiName, String url, String username, String password, String driver)	325	public Datasource createDatasource(String jndiName, String url, String username, String password, String driver)
334	throws OperationUnsupportedException, DatasourceAlreadyExistsException, ConfigurationException;	326	throws UnsupportedOperationException, DatasourceAlreadyExistsException, ConfigurationException;
		327
		328	/**
		329	* Binds the data source name used in the sources with the corresponding data source which is
		330	* identified the given JNDI name.
		331	*
		332	* @param referenceName name used to identify the data source
		333	* @param jndiName JNDI name of the data source
		334	* @throws ConfigurationException if there is some problem with data source configuration
		335	*
		336	* @since 1.25
		337	*/
		338	public void bindDatasourceReference(String dsReferenceName, String dsJNDIName) throws ConfigurationException;
		339
		340	/**
		341	* Binds the data source name used in the sources with the corresponding data source which is
		342	* identified the given JNDI name. The reference is used within the scope of the EJB.
		343	*
		344	* @param referenceName name used to identify the data source
		345	* @param jndiName JNDI name of the data source
		346	* @param ejbName EJB name
		347	* @param ejbType EJB type - the possible values are
		348	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION,
		349	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY and
		350	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN
		351
		352	* @throws ConfigurationException if there is some problem with data source configuration
		353	* @throws IllegalArgumentException if ejbType doesn't have one of allowed values
		354	*
		355	* @since 1.25
		356	*/
		357	public void bindDatasourceReferenceEjb(String dsReferenceName, String dsJNDIName,
		358	String ejbName, String ejbType) throws ConfigurationException;
		359
		360	/**
		361	* Finds data source which is mapped to the given reference name.
		362	*
		363	* @referenceName reference name
		364	* @return data source if it exists, null otherwise
		365	*
		366	* @throws ConfigurationException if there is some problem with data source configuration
		367	*
		368	* @since 1.25
		369	*/
		370	public Datasource findDatasourceForReference(String referenceName) throws ConfigurationException;
		371
		372	/**
		373	* Finds data source which is mapped to the given reference name in the scope the EJB.
		374	*
		375	* @param referenceName reference name
		376	* @param ejbName EJB name
		377	* @return data source if it exists, null otherwise
		378	*
		379	* @throws ConfigurationException if there is some problem with data source configuration
		380	*
		381	* @since 1.25
		382	*/
		383	public Datasource findDatasourceForReferenceEjb(String referenceName, String ejbName) throws ConfigurationException;
		384
		385	/**
		386	* Retrieves message destinations stored in the module.
		387	*
		388	* @return set of message destinations
		389	*
		390	* @throws ConfigurationException if there is some problem with message destination configuration
391	*
392	* @since 1.25
393	*/
394	public Set<MessageDestination> getMessageDestinations() throws ConfigurationException;
395
396	/**
397	* Retrieves message destinations configured on the target server instance.
398	*
399	* @return set of message destinations
400	*
401	* @throws ConfigurationException if there is some problem with message destination configuration
402	*
403	* @since 1.25
404	*/
405	public Set<MessageDestination> getServerMessageDestinations() throws ConfigurationException;
406
407	/**
408	* Tests whether a message destination creation is supported.
409	*
410	* @return true if message destination creation is supported, false otherwise.
411	*
412	* @since 1.25
413	*/
414	public boolean supportsCreateMessageDestination();
415
416	/**
417	* Creates and saves a message destination in the module if it does not exist in the module yet.
418	* Message destinations are considered to be equal if their JNDI names are equal.
419	*
420	* @param jndiName JNDI name of the message destination
421	* @param type message destination type; the value is of
422	* org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type type
423	* @return created message destination
424	*
425	* @throws UnsupportedOperationException if this opearation is not supported
426	* @throws ConfigurationException if there is some problem with message destination configuration
427	*
428	* @since 1.25
429	*/
430	public MessageDestination createMessageDestination(String jndiName, MessageDestination.Type type)
431	throws UnsupportedOperationException, ConfigurationException;
335	}	432	}
336		433
337	/**	434	/**

Lines 13-19 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java (-1 / +61 lines)
13	* "Portions Copyrighted [year] [name of copyright owner]"	13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*	14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original	15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun	16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.	17	* Microsystems, Inc. All Rights Reserved.
18	*/	18	*/
19		19
Lines 38-43 Link Here
38	import org.openide.filesystems.*;	38	import org.openide.filesystems.*;
39	import java.util.*;	39	import java.util.*;
40	import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;	40	import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
		41	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
41	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;	42	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
42	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;	43	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
43	import org.netbeans.modules.j2ee.deployment.impl.ui.ProgressUI;	44	import org.netbeans.modules.j2ee.deployment.impl.ui.ProgressUI;
Lines 52-57 Link Here
52	import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;	53	import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;
53	import org.netbeans.modules.j2ee.deployment.plugins.spi.IncrementalDeployment;	54	import org.netbeans.modules.j2ee.deployment.plugins.spi.IncrementalDeployment;
54	import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory;	55	import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory;
		56	import org.netbeans.modules.j2ee.deployment.plugins.spi.MessageDestinationDeployment;
55	import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;	57	import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;
56	import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerSupport;	58	import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerSupport;
57	import org.netbeans.modules.j2ee.deployment.profiler.spi.Profiler;	59	import org.netbeans.modules.j2ee.deployment.profiler.spi.Profiler;
Lines 103-108 Link Here
103	private FindJSPServlet findJSPServlet;	105	private FindJSPServlet findJSPServlet;
104	private DatasourceManager dsMgr;	106	private DatasourceManager dsMgr;
105	private DatasourceManager ddsMgr;	107	private DatasourceManager ddsMgr;
		108	private MessageDestinationDeployment msgDestDeploymentConnected;
		109	private MessageDestinationDeployment msgDestDeploymentDisconnected;
106	private final Set targetsStartedByIde = new HashSet(); // valued by target name	110	private final Set targetsStartedByIde = new HashSet(); // valued by target name
107	private Map targets; // keyed by target name, valued by ServerTarget	111	private Map targets; // keyed by target name, valued by ServerTarget
108	private boolean managerStartedByIde = false;	112	private boolean managerStartedByIde = false;
Lines 555-560 Link Here
555		559
556	if (dsMgr != null)	560	if (dsMgr != null)
557	dsMgr.deployDatasources(datasources);	561	dsMgr.deployDatasources(datasources);
		562	}
		563
		564	private synchronized MessageDestinationDeployment getMessageDestinationDeploymentConnected() {
		565	if (msgDestDeploymentConnected == null) {
		566	msgDestDeploymentConnected = server.getOptionalFactory().
		567	getMessageDestinationDeployment(getDeploymentManager());
		568	}
		569
		570	return msgDestDeploymentConnected;
		571	}
		572
		573	private MessageDestinationDeployment getMessageDestinationDeploymentDisconnected() {
		574	DeploymentManager dm = null;
		575	try {
		576	dm = getDisconnectedDeploymentManager();
		577	} catch (DeploymentManagerCreationException dmce) {
		578	throw new RuntimeException(dmce);
		579	}
		580	synchronized (this) {
		581	if (msgDestDeploymentDisconnected == null) {
		582	msgDestDeploymentDisconnected = server.getOptionalFactory().getMessageDestinationDeployment(dm);
		583	}
		584	return msgDestDeploymentDisconnected;
		585	}
		586	}
		587
		588	/**
		589	* Retrieves message destinations configured on the target server instance.
		590	*
		591	* @return set of message destinations
		592	*
		593	* @throws ConfigurationException if there is some problem with message destination configuration
		594	*/
		595	public Set<MessageDestination> getMessageDestinations() throws ConfigurationException {
		596
		597	MessageDestinationDeployment destDepl = getMessageDestinationDeploymentDisconnected();
		598	if (destDepl != null) {
		599	return destDepl.getMessageDestinations();
		600	}
		601
		602	return Collections.<MessageDestination>emptySet();
		603	}
		604
		605	/**
		606	* Deploys message destinations saved in the module.
		607	*
		608	* @param destinations set of message destinations
		609	*
		610	* @throws ConfigurationException if there is some problem with message destination configuration
		611	*/
		612	public void deployMessageDestinations(Set<MessageDestination> destinations) throws ConfigurationException {
		613
		614	MessageDestinationDeployment destDepl = getMessageDestinationDeploymentConnected();
		615	if (destDepl != null) {
		616	destDepl.deployMessageDestinations(destinations);
		617	}
558	}	618	}
559		619
560	//---------- State API's: running, debuggable, startedByIDE -----------	620	//---------- State API's: running, debuggable, startedByIDE -----------

Lines 13-19 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/plugins/spi/OptionalDeploymentManagerFactory.java (-3 / +17 lines)
13	* "Portions Copyrighted [year] [name of copyright owner]"	13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*	14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original	15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun	16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.	17	* Microsystems, Inc. All Rights Reserved.
18	*/	18	*/
19		19
Lines 21-28 Link Here
21	package org.netbeans.modules.j2ee.deployment.plugins.spi;	21	package org.netbeans.modules.j2ee.deployment.plugins.spi;
22		22
23	import javax.enterprise.deploy.spi.DeploymentManager;	23	import javax.enterprise.deploy.spi.DeploymentManager;
24	import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer;
25	import org.netbeans.modules.j2ee.deployment.plugins.spi.TargetModuleIDResolver;
26	import org.openide.WizardDescriptor;	24	import org.openide.WizardDescriptor;
27		25
28	/**	26	/**
Lines 93-96 Link Here
93	public DatasourceManager getDatasourceManager(DeploymentManager dm) {	91	public DatasourceManager getDatasourceManager(DeploymentManager dm) {
94	return null;	92	return null;
95	}	93	}
		94
		95	/**
		96	* Creates a <code>MessageDestinationDeployment</code> for the given deployment manager
		97	* or <code>null</code> if message destination deployment is not supported
		98	*
		99	* @param dm the deployment manager
		100	*
		101	* @return a message destination deployment or <code>null</code>
		102	* if message destination deployment is not supported
		103	*
		104	* @since 1.25
		105	*/
		106	public MessageDestinationDeployment getMessageDestinationDeployment(DeploymentManager dm) {
		107	return null;
		108	}
		109
96	}	110	}

Lines 71-74 Link Here

(-)src/org/netbeans/modules/j2ee/deployment/plugins/spi/config/DatasourceConfiguration.java (+56 lines)
71	*/	71	*/
72	Datasource createDatasource(String jndiName, String url, String username, String password, String driver)	72	Datasource createDatasource(String jndiName, String url, String username, String password, String driver)
73	throws UnsupportedOperationException, ConfigurationException, DatasourceAlreadyExistsException;	73	throws UnsupportedOperationException, ConfigurationException, DatasourceAlreadyExistsException;
		74
		75	/**
		76	* Binds the data source name used in the sources with the corresponding data source which is
		77	* identified the given JNDI name.
		78	*
		79	* @param referenceName name used to identify the data source
		80	* @param jndiName JNDI name of the data source
		81	* @throws ConfigurationException if there is some problem with data source configuration
		82	*
		83	* @since 1.25
		84	*/
		85	public void bindDatasourceReference(String dsReferenceName, String dsJNDIName) throws ConfigurationException;
		86
		87	/**
		88	* Binds the data source name used in the sources with the corresponding data source which is
		89	* identified the given JNDI name. The reference is used within the scope of the EJB.
		90	*
		91	* @param referenceName name used to identify the data source
		92	* @param jndiName JNDI name of the data source
		93	* @param ejbName EJB name
		94	* @param ejbType EJB type - the possible values are
		95	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION,
		96	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY and
		97	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN
		98
		99	* @throws ConfigurationException if there is some problem with data source configuration
		100	*
		101	* @since 1.25
		102	*/
		103	public void bindDatasourceReferenceEjb(String dsReferenceName, String dsJNDIName,
		104	String ejbName, String ejbType) throws ConfigurationException;
		105
		106	/**
		107	* Finds JNDI name of the data source which is mapped to the given reference name.
		108	*
		109	* @referenceName reference name
		110	* @return JNDI name of the data source if the mapping exists, null otherwise
		111	*
		112	* @throws ConfigurationException if there is some problem with data source configuration
		113	*
		114	* @since 1.25
		115	*/
		116	public String findDatasourceBinding(String dsReferenceName) throws ConfigurationException;
		117
		118	/**
		119	* Finds JNDI name of the data source which is mapped to the given reference name in the scope the EJB.
		120	*
		121	* @param referenceName reference name
		122	* @param ejbName EJB name
		123	* @return JNDI name of the data source if the mapping exists, null otherwise
		124	*
		125	* @throws ConfigurationException if there is some problem with data source configuration
		126	*
		127	* @since 1.25
		128	*/
		129	public String findDatasourceBindingEjb(String dsReferenceName, String ejbName) throws ConfigurationException;
74	}	130	}

Added Link Here

(-)src/org/netbeans/modules/j2ee/deployment/common/api/MessageDestination.java (+59 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.modules.j2ee.deployment.common.api;
21
22	/**
23	* Represents a message destination
24	*
25	* @author Libor Kotouc
26	*
27	* @since 1.25
28	*/
29	public interface MessageDestination {
30
31	/**
32	* Message destination type
33	*/
34	public enum Type {
35	/**
36	* Queue
37	*/
38	QUEUE,
39
40	/**
41	* Topic
42	*/
43	TOPIC
44	};
45
46	/**
47	* Returns the JNDI name
48	*
49	* @return the JNDI name
50	*/
51	public String getJndiName();
52
53	/**
54	* Returns the type
55	*
56	* @return the type
57	*/
58	public Type getType();
59	}