Attachment #40508 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




    <!-- ACTUAL CHANGES BEGIN HERE: -->

    <changes>
        <change id="ResourceApiRedesign">
            <api name="j2eeserver"/>
            <summary>
                Adding an API for working with data sources, message-driven beans and JMS messages
            </summary>
            <version major="1" minor="25"/>
            <date day="05" month="4" year="2007"/>
            <author login="lkotouc"/>
            <compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="yes"/>
            <description>
                <p>
                    API for working with data sources, message-driven beans and JMS messages.
            	</p>
            </description>
            <class package="org.netbeans.modules.j2ee.deployment.plugins.spi" name="JDBCDriverDeployer"/>
            <class package="org.netbeans.modules.j2ee.deployment.plugins.spi" name="OptionalDeploymentManagerFactory"/>
            <issue number="89439"/>
        </change>
        <change id="jdbcDriverDeployment">
            <api name="j2eeserver"/>
            <summary>

Lines 17-23 Link Here

(-)j2eeserver/nbproject/project.properties (-1 / +1 lines)
17		17
18	is.autoload=true	18	is.autoload=true
19	javac.source=1.5	19	javac.source=1.5
20	spec.version.base=1.24.0	20	spec.version.base=1.25.0
21		21
22	javadoc.overview=${basedir}/api/doc/overview.html	22	javadoc.overview=${basedir}/api/doc/overview.html
23	javadoc.arch=${basedir}/arch.xml	23	javadoc.arch=${basedir}/arch.xml




/*
 * 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 name
     *
     * @return the name
     */
    public String getName();
    
    /**
     * 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;
import org.openide.util.Parameters;

/**
 * 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 referenceName, String jndiName) throws ConfigurationException {

        Parameters.notNull("referenceName", referenceName);     // NOI18N
        Parameters.notNull("jndiName", jndiName);               // NOI18N
        
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    datasourceConfiguration.bindDatasourceReference(referenceName, jndiName);
                }
            }
        }
   }

    public void bindDatasourceReferenceForEjb(String ejbName, String ejbType, 
            String referenceName, String jndiName) throws ConfigurationException {
        
        Parameters.notNull("ejbName", ejbName);             // NOI18N
        Parameters.notNull("ejbType", ejbType);             // NOI18N
        Parameters.notNull("referenceName", referenceName); // NOI18N
        Parameters.notNull("jndiName", jndiName);           // NOI18N
        
        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.bindDatasourceReferenceForEjb(ejbName, ejbType, referenceName, jndiName);
                }
            }
        }
    }

    public String findDatasourceJndiName(String referenceName) throws ConfigurationException {
        
        Parameters.notNull("referenceName", referenceName); // NOI18N
        
        String jndiName = null;
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    jndiName = datasourceConfiguration.findDatasourceJndiName(referenceName);
                }
            }
        }
        
        return jndiName;
    }

    public String findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException {

        Parameters.notNull("ejbName", ejbName);             // NOI18N
        Parameters.notNull("referenceName", referenceName); // NOI18N

        String jndiName = null;
        if (server != null) {
            ModuleConfiguration config = getModuleConfiguration();
            if (config != null) {
                DatasourceConfiguration datasourceConfiguration = config.getLookup().lookup(DatasourceConfiguration.class);
                if (datasourceConfiguration != null) {
                    jndiName = datasourceConfiguration.findDatasourceJndiNameForEjb(ejbName, referenceName);
                }
            }
        }
        
        return jndiName;
    }

    public Datasource findDatasource(String jndiName) throws ConfigurationException {
        
        Parameters.notNull("jndiName", jndiName);           // NOI18N

        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;
    }

    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 name, MessageDestination.Type type) 
    throws UnsupportedOperationException, ConfigurationException {
        
        Parameters.notNull("name", name);           // NOI18N
        Parameters.notNull("type", type);           // NOI18N
        
        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(name, type);
        }

        return null;
    }
    
    public void bindMdbToMessageDestination(String mdbName, String name, MessageDestination.Type type) throws ConfigurationException {
        
        Parameters.notNull("mdbName", mdbName);     // NOI18N
        Parameters.notNull("name", name);           // NOI18N
        Parameters.notNull("type", type);           // NOI18N

        ModuleConfiguration config = getModuleConfiguration();
        if (server == null || config == null) {
            return;
        }
        
        MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
        if (msgConfig != null) {
            msgConfig.bindMdbToMessageDestination(mdbName, name, type);
        }
    }

    public String findMessageDestinationName(String mdbName) throws ConfigurationException {
        
        Parameters.notNull("mdbName", mdbName);     // NOI18N
        
        ModuleConfiguration config = getModuleConfiguration();
        if (server == null || config == null) {
            return null;
        }
        
        MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
        if (msgConfig != null) {
            return msgConfig.findMessageDestinationName(mdbName);
        }
        
        return null;
    }
    
    public MessageDestination findMessageDestination(String name) throws ConfigurationException {
        
        Parameters.notNull("name", name);     // NOI18N

        Set<MessageDestination> destinations = getMessageDestinations();
        for (MessageDestination dest : destinations) {
            if (name.equals(dest.getName())) {
                return dest;
            }
        }
        destinations = provider.getConfigSupport().getServerMessageDestinations();
        for (MessageDestination dest : destinations) {
            if (name.equals(dest.getName())) {
                return dest;
            }
        }
        
        return null;
    }

    public void bindMessageDestinationReference(String referenceName, String connectionFactoryName, 
            String destName, MessageDestination.Type type) throws ConfigurationException {
        
        Parameters.notNull("referenceName", referenceName);                 // NOI18N
        Parameters.notNull("connectionFactoryName", connectionFactoryName); // NOI18N
        Parameters.notNull("destName", destName);                           // NOI18N
        Parameters.notNull("type", type);                                   // NOI18N
        
        ModuleConfiguration config = getModuleConfiguration();
        if (server == null || config == null) {
            return;
        }
        
        MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
        if (msgConfig != null) {
            msgConfig.bindMessageDestinationReference(referenceName, connectionFactoryName, destName, type);
        }
    }

    public void bindMessageDestinationReferenceForEjb(String ejbName, String ejbType,
            String referenceName, String connectionFactoryName,
            String destName, MessageDestination.Type type) throws ConfigurationException {
        
        Parameters.notNull("ejbName", ejbName);             // NOI18N
        Parameters.notNull("ejbType", ejbType);             // NOI18N
        Parameters.notNull("referenceName", referenceName);                 // NOI18N
        Parameters.notNull("connectionFactoryName", connectionFactoryName); // NOI18N
        Parameters.notNull("destName", destName);                           // NOI18N
        Parameters.notNull("type", type);                                   // NOI18N
        
        ModuleConfiguration config = getModuleConfiguration();
        if (server == null || config == null) {
            return;
        }
        
        MessageDestinationConfiguration msgConfig = config.getLookup().lookup(MessageDestinationConfiguration.class);
        if (msgConfig != null) {
            msgConfig.bindMessageDestinationReferenceForEjb(ejbName, ejbType, referenceName, connectionFactoryName, destName, type);
        }
        
    }
    
    // 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 java.util.WeakHashMap;
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.status.ProgressObject;
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
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);
        }
        

         * 
         * @return created data source
         * 
         * @throws UnsupportedOperationException if operation is not supported
         * @throws DatasourceAlreadyExistsException if conflicting data source is found
         * @throws ConfigurationException reports errors in creating the data source.
         *
         * @since 1.15 
         */
        public Datasource createDatasource(String jndiName, String  url, String username, String password, String driver)
        throws UnsupportedOperationException, DatasourceAlreadyExistsException, ConfigurationException;
        
        /**
         * Binds the data source reference name with the corresponding data source which is
         * identified by the given JNDI name.
         * 
         * @param referenceName name used to identify the data source
         * @param jndiName JNDI name of the data source
         * 
         * @throws NullPointerException if any of parameters is null
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public void bindDatasourceReference(String referenceName, String jndiName) throws ConfigurationException;

        /**
         * Binds the data source reference name with the corresponding data source which is
         * identified by the given JNDI name. The reference is used within the scope of the EJB.
         * 
         * @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
         * @param referenceName name used to identify the data source
         * @param jndiName JNDI name of the data source

         * @throws NullPointerException if any of parameters is null
         * @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 bindDatasourceReferenceForEjb(String ejbName, String ejbType, 
                String referenceName, String jndiName) throws ConfigurationException;
        
        /**
         * Finds JNDI name of data source which is mapped to the given reference name of a data source
         * 
         * @param referenceName reference name of data source
         * @return JNDI name which is mapped to the given JNDI name
         * 
         * @throws NullPointerException if reference name is null
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public String findDatasourceJndiName(String referenceName) throws ConfigurationException;
        
        /**
         * Finds JNDI name of data source which is mapped to the given reference name in the scope of the EJB.
         * 
         * @param ejbName EJB name
         * @param referenceName reference name of data source
         * @return data source if it exists, null otherwise
         *
         * @throws NullPointerException if any of parameters is null
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public String findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException;
        
        /**
         * Finds data source with the given JNDI name.
         * 
         * @param jndiName JNDI name of a data source
         * @param return data source if it exists, null otherwise
         *
         * @throws NullPointerException if JNDI name is null
         * @throws ConfigurationException if there is some problem with data source configuration
         * 
         * @since 1.25
         */
        public Datasource findDatasource(String jndiName) 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 name name of the message destination
         * @param type message destination type
         * @return created message destination
         * 
         * @throws NullPointerException if any of parameters is null
         * @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 name, MessageDestination.Type type) 
        throws UnsupportedOperationException, ConfigurationException;
        
        /**
         * Binds the message destination name with message-driven bean.
         * 
         * @param mdbName MDB name
         * @param name name of the message destination
         * @param type message destination type
         * 
         * @throws NullPointerException if any of parameters is null
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25
         */
        public void bindMdbToMessageDestination(String mdbName, String name, MessageDestination.Type type) throws ConfigurationException;

        /**
         * Finds name of message destination which the given MDB listens to
         * 
         * @param mdbName MDB name
         * @return message destination name
         * 
         * @throws NullPointerException if MDB name is null
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25
         */
        public String findMessageDestinationName(String mdbName) throws ConfigurationException;

        /**
         * Finds message destination with the given name.
         * 
         * @param name message destination name
         * @param return message destination if it exists, null otherwise
         *
         * @throws NullPointerException if name is null
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25
         */
        public MessageDestination findMessageDestination(String name) throws ConfigurationException;

        /**
         * Binds the message destination reference name with the corresponding message destination which is
         * identified by the given name.
         * 
         * @param referenceName reference name used to identify the message destination
         * @param connectionFactoryName connection factory name
         * @param destName name of the message destination
         * @param type message destination type
         * 
         * @throws NullPointerException if any of parameters is null
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25
         */
        public void bindMessageDestinationReference(String referenceName, String connectionFactoryName, 
                String destName, MessageDestination.Type type) throws ConfigurationException;

        /**
         * Binds the message destination reference name with the corresponding message destination which is
         * identified by the given name. The reference is used within the EJB scope.
         * 
         * @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
         * @param referenceName reference name used to identify the message destination
         * @param connectionFactoryName connection factory name
         * @param destName name of the message destination
         * @param type message destination type
         * 
         * @throws NullPointerException if any of parameters is null
         * @throws ConfigurationException if there is some problem with message destination configuration
         * 
         * @since 1.25
         */
        public void bindMessageDestinationReferenceForEjb(String ejbName, String ejbType,
                String referenceName, String connectionFactoryName,
                String destName, MessageDestination.Type type) 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.
 */


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;

import org.openide.util.NbBundle;
import org.openide.NotifyDescriptor;
import org.openide.DialogDisplayer;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.windows.InputOutput;


    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 NullPointerException if destinations parameter is null
     * @throws ConfigurationException if there is some problem with message destination configuration
     */
    public void deployMessageDestinations(Set<MessageDestination> destinations) throws ConfigurationException {
    
        Parameters.notNull("destinations", destinations);
        
        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 JDBCDriverDeployer getJDBCDriverDeployer(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 reference name 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 referenceName, String jndiName) throws ConfigurationException;

    /**
     * Binds the data source reference name with the corresponding data source which is
     * identified the given JNDI name. The reference is used within the scope of the EJB.
     * 
     * @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
     * @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 bindDatasourceReferenceForEjb(String ejbName, String ejbType, 
            String referenceName, String jndiName) 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 findDatasourceJndiName(String referenceName) throws ConfigurationException;
    
    /**
     * Finds JNDI name of the data source which is mapped to the given reference name in the scope the EJB.
     * 
     * @param ejbName EJB name
     * @param 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 findDatasourceJndiNameForEjb(String ejbName, String referenceName) 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.List;
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 name 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 name, MessageDestination.Type type) 
    throws UnsupportedOperationException, ConfigurationException;
    
    /**
     * Binds the message destination name with message-driven bean.
     * 
     * @param mdbName MDB name
     * @param name name of the message destination
     * @param type message destination type; the value is of 
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     * 
     * @since 1.25
     */
    public void bindMdbToMessageDestination(String mdbName, String name, MessageDestination.Type type) throws ConfigurationException;
    
    /**
     * Finds name of message destination which the given MDB listens to
     * 
     * @param mdbName MDB name
     * @return message destination name
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     * 
     * @since 1.25
     */
    public String findMessageDestinationName(String mdbName) throws ConfigurationException;

    /**
     * Binds the message destination reference name with the corresponding message destination which is
     * identified by the given name.
     * 
     * @param referenceName reference name used to identify the message destination
     * @param connectionFactoryName connection factory name
     * @param destName name of the message destination
     * @param type message destination type
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     * 
     * @since 1.25
     */
    public void bindMessageDestinationReference(String referenceName, String connectionFactoryName, 
            String destName, MessageDestination.Type type) throws ConfigurationException;

    /**
     * Binds the message destination reference name with the corresponding message destination which is
     * identified by the given name. The reference is used within the EJB scope.
     * 
     * @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
     * @param referenceName reference name used to identify the message destination
     * @param connectionFactoryName connection factory name
     * @param destName name of the message destination
     * @param type message destination type
     * 
     * @throws ConfigurationException if there is some problem with message destination configuration
     * 
     * @since 1.25
     */
    public void bindMessageDestinationReferenceForEjb(String ejbName, String ejbType,
            String referenceName, String connectionFactoryName,
            String destName, MessageDestination.Type type) throws ConfigurationException;
    
}

Lines 39-45 Link Here

(-)j2eeserver/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.

Lines 67-72 Link Here

(-)serverplugins/jboss4/build.xml (+8 lines)
67	removeUnreferencedNodes="true"	67	removeUnreferencedNodes="true"
68	docroot="datasources"	68	docroot="datasources"
69	rootDir="src"/>	69	rootDir="src"/>
		70	<schema2beans schema="${jb_dir}/resources/jboss-service_4_0.dtd"
		71	package="org.netbeans.modules.j2ee.jboss4.config.gen"
		72	schemaType="dtd"
		73	validate="true"
		74	attrProp="true"
		75	removeUnreferencedNodes="true"
		76	docroot="server"
		77	rootDir="src"/>
70	<schema2beans schema="${jb_dir}/resources/jboss-client_4_0.dtd"	78	<schema2beans schema="${jb_dir}/resources/jboss-client_4_0.dtd"
71	package="org.netbeans.modules.j2ee.jboss4.config.gen"	79	package="org.netbeans.modules.j2ee.jboss4.config.gen"
72	schemaType="dtd"	80	schemaType="dtd"

Lines 60-62 Link Here

(-)serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/config/Bundle.properties (+2 lines)
60		60
61	ERR_CannotReadDSdotXml=Cannot read jboss-ds.xml file on the server	61	ERR_CannotReadDSdotXml=Cannot read jboss-ds.xml file on the server
62	ERR_CannotCreateDSdotXml=Cannot create jboss-ds.xml file on the server	62	ERR_CannotCreateDSdotXml=Cannot create jboss-ds.xml file on the server
		63
		64	MSG_NoPrefix=Message destination JNDI name {0} doesn't start with either 'queue/' or 'topic/' prefix

Lines 13-19 Link Here

(-)serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/config/CarDeploymentConfiguration.java (-2 / +6 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 111-117 Link Here
111	} else {	111	} else {
112	// create jboss-web.xml if it does not exist yet	112	// create jboss-web.xml if it does not exist yet
113	jbossClient = generateJbossClient();	113	jbossClient = generateJbossClient();
114	writefile(jbossClientFile, jbossClient);	114	writeFile(jbossClientFile, jbossClient);
115	}	115	}
116	} catch (ConfigurationException ce) {	116	} catch (ConfigurationException ce) {
117	ErrorManager.getDefault().notify(ce);	117	ErrorManager.getDefault().notify(ce);
Lines 419-424 Link Here
419		419
420	public boolean supportsCreateDatasource() {	420	public boolean supportsCreateDatasource() {
421	return true;	421	return true;
		422	}
		423
		424	public boolean supportsCreateMessageDestination() {
		425	return false;
422	}	426	}
423		427
424	// private helper interface -----------------------------------------------	428	// private helper interface -----------------------------------------------

Lines 13-19 Link Here

(-)serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/config/EarDeploymentConfiguration.java (-2 / +7 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 91-97 Link Here
91	} else {	91	} else {
92	// create jboss-app.xml if it does not exist yet	92	// create jboss-app.xml if it does not exist yet
93	jbossApp = genereatejbossApp();	93	jbossApp = genereatejbossApp();
94	writefile(jbossAppFile, jbossApp);	94	writeFile(jbossAppFile, jbossApp);
95	}	95	}
96	} catch (ConfigurationException ce) {	96	} catch (ConfigurationException ce) {
97	ErrorManager.getDefault().notify(ce);	97	ErrorManager.getDefault().notify(ce);
Lines 126-129 Link Here
126	public boolean supportsCreateDatasource() {	126	public boolean supportsCreateDatasource() {
127	return false;	127	return false;
128	}	128	}
		129
		130	public boolean supportsCreateMessageDestination() {
		131	return false;
		132	}
		133
129	}	134	}

Lines 13-19 Link Here

(-)serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/config/EjbDeploymentConfiguration.java (-26 / +184 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 27-32 Link Here
27	import java.io.OutputStream;	27	import java.io.OutputStream;
28	import java.util.HashMap;	28	import java.util.HashMap;
29	import java.util.HashSet;	29	import java.util.HashSet;
		30	import java.util.LinkedList;
		31	import java.util.List;
30	import java.util.Map;	32	import java.util.Map;
31	import java.util.Set;	33	import java.util.Set;
32	import javax.enterprise.deploy.model.DDBean;	34	import javax.enterprise.deploy.model.DDBean;
Lines 35-47 Link Here
35	import javax.swing.text.StyledDocument;	37	import javax.swing.text.StyledDocument;
36	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;	38	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
37	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;	39	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
		40	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
38	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;	41	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
39	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.DatasourceConfiguration;	42	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.DatasourceConfiguration;
40	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.DeploymentPlanConfiguration;	43	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.DeploymentPlanConfiguration;
41	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;	44	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
42	import org.netbeans.modules.j2ee.jboss4.config.gen.EnterpriseBeans;	45	import org.netbeans.modules.j2ee.jboss4.config.gen.EnterpriseBeans;
		46	import org.netbeans.modules.j2ee.jboss4.config.gen.Entity;
43	import org.netbeans.modules.j2ee.jboss4.config.gen.Jboss;	47	import org.netbeans.modules.j2ee.jboss4.config.gen.Jboss;
44	import org.netbeans.modules.j2ee.jboss4.config.gen.MessageDriven;	48	import org.netbeans.modules.j2ee.jboss4.config.gen.MessageDriven;
		49	import org.netbeans.modules.j2ee.jboss4.config.gen.ResourceRef;
		50	import org.netbeans.modules.j2ee.jboss4.config.gen.Session;
45	import org.openide.DialogDisplayer;	51	import org.openide.DialogDisplayer;
46	import org.openide.ErrorManager;	52	import org.openide.ErrorManager;
47	import org.openide.NotifyDescriptor;	53	import org.openide.NotifyDescriptor;
Lines 130-136 Link Here
130	public boolean supportsCreateDatasource() {	136	public boolean supportsCreateDatasource() {
131	return true;	137	return true;
132	}	138	}
133		139
		140	public boolean supportsCreateMessageDestination() {
		141	return true;
		142	}
		143
134	// //listen on the resource-ref element	144	// //listen on the resource-ref element
135	// deplObj.getDDBeanRoot().addXpathListener(SESSION_RESOURCE_REF, this);	145	// deplObj.getDDBeanRoot().addXpathListener(SESSION_RESOURCE_REF, this);
136	// deplObj.getDDBeanRoot().addXpathListener(ENTITY_RESOURCE_REF, this);	146	// deplObj.getDDBeanRoot().addXpathListener(ENTITY_RESOURCE_REF, this);
Lines 165-171 Link Here
165	} else {	175	} else {
166	// create jboss.xml if it does not exist yet	176	// create jboss.xml if it does not exist yet
167	jboss = generateJboss();	177	jboss = generateJboss();
168	writefile(jbossFile, jboss);	178	writeFile(jbossFile, jboss);
169	}	179	}
170	} catch (ConfigurationException ce) {	180	} catch (ConfigurationException ce) {
171	ErrorManager.getDefault().notify(ce);	181	ErrorManager.getDefault().notify(ce);
Lines 237-243 Link Here
237	// Set beanNames = null;	247	// Set beanNames = null;
238	// if (desc.length > 0 && "javax.sql.DataSource".equals(type[0])) { // NOI18N	248	// if (desc.length > 0 && "javax.sql.DataSource".equals(type[0])) { // NOI18N
239	// beanNames = getRelevantBeansDataRef(desc[0], name[0], eventDDBean.getRoot(), beanType);	249	// beanNames = getRelevantBeansDataRef(desc[0], name[0], eventDDBean.getRoot(), beanType);
240	// addResReference(desc[0], name[0], beanNames, beanType);	250	// String jndiName = JBDeploymentConfiguration.JBOSS4_DATASOURCE_JNDI_PREFIX + resRefName;
		251	// addResReference(jndiName, name[0], beanNames, beanType);
241	// }	252	// }
242	// else	253	// else
243	// if ("javax.mail.Session".equals(type[0])) { // NOI18N	254	// if ("javax.mail.Session".equals(type[0])) { // NOI18N
Lines 724-764 Link Here
724		735
725	return beanMap;	736	return beanMap;
726	}	737	}
		738
		739	public void bindDatasourceReferenceForEjb(String ejbName, String ejbType,
		740	String referenceName, String jndiName) throws ConfigurationException {
		741
		742	Set beanNames = new HashSet();
		743	beanNames.add(ejbName);
		744	if (org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION.equals(ejbType)) {
		745	addResReference(jndiName, referenceName, beanNames, BEAN_TYPE.SESSION);
		746	}
		747	else
		748	if (org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY.equals(ejbType)) {
		749	addResReference(jndiName, referenceName, beanNames, BEAN_TYPE.ENTITY);
		750	}
		751	else
		752	if (org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN.equals(ejbType)) {
		753	addMsgDrvResReference(jndiName, referenceName, ejbName);
		754	}
		755
		756	}
		757
		758	public String findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException {
		759
		760	EnterpriseBeans beans = getJboss().getEnterpriseBeans();
		761	if (beans == null) {
		762	return null;
		763	}
		764
		765	Session[] sessions = beans.getSession();
		766	for (Session session : sessions) {
		767	if (ejbName.equals(session.getEjbName())) {
		768	ResourceRef[] resourceRefs = session.getResourceRef();
		769	for (ResourceRef resourceRef : resourceRefs) {
		770	String rrn = resourceRef.getResRefName();
		771	if (referenceName.equals(rrn)) {
		772	return resourceRef.getJndiName();
		773	}
		774	}
		775	return null;
		776	}
		777	}
		778
		779	Entity[] entities = beans.getEntity();
		780	for (Entity entity : entities) {
		781	if (ejbName.equals(entity.getEjbName())) {
		782	ResourceRef[] resourceRefs = entity.getResourceRef();
		783	for (ResourceRef resourceRef : resourceRefs) {
		784	String rrn = resourceRef.getResRefName();
		785	if (referenceName.equals(rrn)) {
		786	return resourceRef.getJndiName();
		787	}
		788	}
		789	return null;
		790	}
		791	}
		792
		793	MessageDriven[] mdbs = beans.getMessageDriven();
		794	for (MessageDriven mdb : mdbs) {
		795	if (ejbName.equals(mdb.getEjbName())) {
		796	ResourceRef[] resourceRefs = mdb.getResourceRef();
		797	for (ResourceRef resourceRef : resourceRefs) {
		798	String rrn = resourceRef.getResRefName();
		799	if (referenceName.equals(rrn)) {
		800	return resourceRef.getJndiName();
		801	}
802	}
803	return null;
804	}
805	}
806
807	return null;
808	}
809
727		810
728	/**	811	/**
729	* Add a new data source reference to the beans of the given type without it.	812	* Add a new data source reference to the beans of the given type without it.
730	*	813	*
731	* @param desc data source description	814	* @param jndiName JNDI name of the resource
732	* @param resRefName data source reference name	815	* @param resRefName data source reference name
733	* @param beanNames the beans (ejb-name value) which might need to add data source reference specified by resRefName	816	* @param beanNames the beans (ejb-name value) which might need to add data source reference specified by resRefName
734	* @param beanType type of bean to add data source reference to	817	* @param beanType type of bean to add data source reference to
735	*/	818	*/
736	private void addResReference(String desc, final String resRefName, final Set beanNames, final BEAN_TYPE beanType)	819	private void addResReference(final String jndiName, final String resRefName, final Set beanNames, final BEAN_TYPE beanType)
737	throws ConfigurationException	820	throws ConfigurationException
738	{	821	{
739	modifyJboss(new JbossModifier() {	822	modifyJboss(new JbossModifier() {
740	public void modify(Jboss modifiedJboss) {	823	public void modify(Jboss modifiedJboss) {
741	String jndiName = JBDeploymentConfiguration.JBOSS4_DATASOURCE_JNDI_PREFIX + resRefName;
742	JbossDataSourceRefModifier.modify(modifiedJboss, resRefName, beanNames, beanType, jndiName);	824	JbossDataSourceRefModifier.modify(modifiedJboss, resRefName, beanNames, beanType, jndiName);
743	}	825	}
744	});	826	});
745	}	827	}
746		828
747	/**	829	/**
748	* Add a new resource reference to the message-driven beans without it.	830	* Add a new resource reference to the message-driven bean.
749	*	831	*
750	* @param desc data source description	832	* @param jndiName JNDI name of the resource
751	* @param resRefName resource reference name	833	* @param resRefName resource reference name
752	* @param beans the bean names (ejb-name) mapped to the message destinations (message-destination-link)	834	* @param mdbName the MDB (ejb-name) which might need to add resource reference specified by resRefName
753	* which might need to add resource reference specified by resRefName	835	* which might need to add resource reference specified by resRefName
754	*/	836	*/
755	private void addMsgDrvResReference(String desc, final String resRefName, final Map beans)	837	private void addMsgDrvResReference(final String jndiName, final String resRefName, final String mdbName)
756	throws ConfigurationException	838	throws ConfigurationException
757	{	839	{
758	modifyJboss(new JbossModifier() {	840	modifyJboss(new JbossModifier() {
759	public void modify(Jboss modifiedJboss) {	841	public void modify(Jboss modifiedJboss) {
760	String jndiName = JBDeploymentConfiguration.JBOSS4_DATASOURCE_JNDI_PREFIX + resRefName;	842	JbossDataSourceRefModifier.modifyMsgDrv(modifiedJboss, resRefName, mdbName, jndiName);
761	JbossDataSourceRefModifier.modifyMsgDrv(modifiedJboss, resRefName, beans, jndiName);
762	}	843	}
763	});	844	});
764	}	845	}
Lines 833-845 Link Here
833	});	914	});
834	}	915	}
835		916
		917	public void bindMdbToMessageDestination(String mdbName, String name, MessageDestination.Type type) throws ConfigurationException {
		918	addMDB(mdbName, name, type);
		919	}
		920
		921	public String findMessageDestinationName(String mdbName) throws ConfigurationException {
		922
		923	EnterpriseBeans beans = getJboss().getEnterpriseBeans();
		924	if (beans == null) {
		925	return null;
		926	}
		927
		928	MessageDriven[] mdbs = beans.getMessageDriven();
		929	for (MessageDriven mdb : mdbs) {
		930	if (mdbName.equals(mdb.getEjbName())) {
		931	String destJndiName = mdb.getDestinationJndiName();
		932	if (destJndiName != null) {
		933	if (destJndiName.startsWith("queue/") \|\| destJndiName.startsWith("topic/")) {
		934	return destJndiName.substring(6); // "queue/".length() == "topic/".length() == 6
		935	}
		936	else {
		937	ErrorManager.getDefault().log(
		938	ErrorManager.INFORMATIONAL,
		939	NbBundle.getMessage(EjbDeploymentConfiguration.class, "MSG_NoPrefix", destJndiName));
		940	}
		941	}
		942	return null;
		943	}
		944	}
		945
		946	return null;
		947	}
		948
836	/**	949	/**
837	* Add MDB record.	950	* Add MDB record.
838	*	951	*
839	* @param name MDB name (ejb-name)	952	* @param name MDB name (ejb-name)
840	* @param dest MDB destination (message-destination-link)	953	* @param dest MDB destination (message-destination-link)
841	*/	954	*/
842	private void addMDB(final String name, final String dest) throws ConfigurationException {	955	private void addMDB(final String name, final String destName, final MessageDestination.Type destType)
		956	throws ConfigurationException {
		957
843	modifyJboss(new JbossModifier() {	958	modifyJboss(new JbossModifier() {
844	public void modify(Jboss modifiedJboss) {	959	public void modify(Jboss modifiedJboss) {
845		960
Lines 862-868 Link Here
862	//if it doesn't exist yet, create a new one	977	//if it doesn't exist yet, create a new one
863	MessageDriven mdb = new MessageDriven();	978	MessageDriven mdb = new MessageDriven();
864	mdb.setEjbName(name);	979	mdb.setEjbName(name);
865	mdb.setDestinationJndiName(dest); // NOI18N	980	if (MessageDestination.Type.QUEUE.equals(destType)) {
		981	mdb.setDestinationJndiName("queue/" + destName); // NOI18N
		982	}
		983	else
		984	if (MessageDestination.Type.TOPIC.equals(destType)) {
		985	mdb.setDestinationJndiName("topic/" + destName); // NOI18N
		986	}
866	eb.addMessageDriven(mdb);	987	eb.addMessageDriven(mdb);
867	}	988	}
868	});	989	});
Lines 889-922 Link Here
889	/**	1010	/**
890	* Add a new connection factory reference to the message-driven beans without it.	1011	* Add a new connection factory reference to the message-driven beans without it.
891	*	1012	*
892	* @param resRefName connection factory reference name	1013	* @param connectionFactoryName connection factory reference name
893	* @param beans the bean names (ejb-name) mapped to the message destinations (message-destination-link)	1014	* @param mdbName the MDB (ejb-name) which might need to add connection factory reference specified by resRefName
894	* which might need to add connection factory reference specified by resRefName
895	*/	1015	*/
896	private void addMsgDrvConnectionFactoryReference(final String resRefName, final Map beans)	1016	private void addMsgDrvConnectionFactoryReference(final String connectionFactoryName, final String mdbName)
897	throws ConfigurationException	1017	throws ConfigurationException
898	{	1018	{
899	modifyJboss(new JbossModifier() {	1019	modifyJboss(new JbossModifier() {
900	public void modify(Jboss modifiedJboss) {	1020	public void modify(Jboss modifiedJboss) {
901	String jndiName = JBOSS4_CONN_FACTORY_JNDI_NAME;	1021	String jndiName = JBOSS4_CONN_FACTORY_JNDI_NAME;
902	JbossDataSourceRefModifier.modifyMsgDrv(modifiedJboss, resRefName, beans, jndiName);	1022	JbossDataSourceRefModifier.modifyMsgDrv(modifiedJboss, connectionFactoryName, mdbName, jndiName);
903	}	1023	}
904	});	1024	});
905	}	1025	}
906		1026
		1027	public void bindMessageDestinationReferenceForEjb(String ejbName, String ejbType,
		1028	String referenceName, String connectionFactoryName,
		1029	String destName, MessageDestination.Type type) throws ConfigurationException {
		1030
		1031	Set beanNames = new HashSet();
		1032	beanNames.add(ejbName);
		1033
		1034	String destPrefix = null;
		1035	if (MessageDestination.Type.QUEUE.equals(type)) {
		1036	destPrefix = "queue/";
		1037	}
		1038	else
		1039	if (MessageDestination.Type.TOPIC.equals(type)) {
		1040	destPrefix = "topic/";
		1041	}
		1042
		1043	if (org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION.equals(ejbType)) {
		1044	addConnectionFactoryReference(connectionFactoryName, beanNames, BEAN_TYPE.SESSION);
		1045	addMsgDestReference(referenceName, destPrefix, destName, beanNames, BEAN_TYPE.SESSION);
		1046	}
		1047	else
		1048	if (org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY.equals(ejbType)) {
		1049	addConnectionFactoryReference(connectionFactoryName, beanNames, BEAN_TYPE.ENTITY);
		1050	addMsgDestReference(referenceName, destPrefix, destName, beanNames, BEAN_TYPE.ENTITY);
		1051	}
		1052	else
		1053	if (org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN.equals(ejbType)) {
		1054	addMsgDrvConnectionFactoryReference(connectionFactoryName, ejbName);
		1055	addMsgDrvMsgDestReference(referenceName, destPrefix, destName, ejbName);
		1056	}
		1057
		1058	}
		1059
		1060
907	/**	1061	/**
908	* Add a new message destination reference to the beans of the given type without it.	1062	* Add a new message destination reference to the beans of the given type without it.
909	*	1063	*
910	* @param msgDestRefName message destination reference name	1064	* @param msgDestRefName message destination reference name
		1065	* @param destName message destination name
		1066	* @param detPrefix message destination prefix (queue/ ot topic/)
911	* @param beanNames the beans (ejb-name value) which might need to add message destination reference specified by msgDestRefName	1067	* @param beanNames the beans (ejb-name value) which might need to add message destination reference specified by msgDestRefName
912	* @param beanType type of bean to add message destination reference to	1068	* @param beanType type of bean to add message destination reference to
913	*/	1069	*/
914	private void addMsgDestReference(final String msgDestRefName, final String destPrefix,	1070	private void addMsgDestReference(final String msgDestRefName, final String destPrefix, final String destName,
915	final Set beanNames, final BEAN_TYPE beanType) throws ConfigurationException	1071	final Set beanNames, final BEAN_TYPE beanType) throws ConfigurationException
916	{	1072	{
917	modifyJboss(new JbossModifier() {	1073	modifyJboss(new JbossModifier() {
918	public void modify(Jboss modifiedJboss) {	1074	public void modify(Jboss modifiedJboss) {
919	JbossMsgDestRefModifier.modify(modifiedJboss, msgDestRefName, beanNames, beanType, destPrefix);	1075	JbossMsgDestRefModifier.modify(modifiedJboss, msgDestRefName, beanNames, beanType, destPrefix, destName);
920	}	1076	}
921	});	1077	});
922	}	1078	}
Lines 925-939 Link Here
925	* Add a new message destination reference to the message driven beans without it.	1081	* Add a new message destination reference to the message driven beans without it.
926	*	1082	*
927	* @param msgDestRefName message destination reference name	1083	* @param msgDestRefName message destination reference name
928	* @param beanNames the beans (ejb-name value) which might need to add message destination reference specified by msgDestRefName	1084	* @param destName message destination name
929	* @param beanType type of bean to add message destination reference to	1085	* @param destPrefix message destination prefix (queue/ ot topic/)
		1086	* @param mdbName the MDB (ejb-name value) which might need to add
		1087	* message destination reference specified by msgDestRefName
930	*/	1088	*/
931	private void addMsgDrvMsgDestReference(final String msgDestRefName, final String destPrefix,	1089	private void addMsgDrvMsgDestReference(final String msgDestRefName, final String destPrefix,
932	final Map beans) throws ConfigurationException	1090	final String destName, final String mdbName) throws ConfigurationException
933	{	1091	{
934	modifyJboss(new JbossModifier() {	1092	modifyJboss(new JbossModifier() {
935	public void modify(Jboss modifiedJboss) {	1093	public void modify(Jboss modifiedJboss) {
936	JbossMsgDestRefModifier.modifyMsgDrv(modifiedJboss, msgDestRefName, beans, destPrefix);	1094	JbossMsgDestRefModifier.modifyMsgDrv(modifiedJboss, msgDestRefName, mdbName, destPrefix, destName);
937	}	1095	}
938	});	1096	});
939	}	1097	}




 * "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 java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashSet;
import java.util.Set;
import javax.enterprise.deploy.model.DDBeanRoot;
import javax.enterprise.deploy.spi.DConfigBeanRoot;
import javax.enterprise.deploy.spi.exceptions.BeanNotFoundException;
import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
import javax.swing.text.BadLocationException;
import javax.swing.text.StyledDocument;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
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.MessageDestination;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.DatasourceConfiguration;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.MessageDestinationConfiguration;
import org.netbeans.modules.j2ee.jboss4.config.gen.Datasources;
import org.netbeans.modules.j2ee.jboss4.config.gen.LocalTxDatasource;
import org.netbeans.modules.j2ee.jboss4.config.mdb.MessageDestinationSupport;
import org.netbeans.modules.schema2beans.BaseBean;
import org.openide.DialogDisplayer;
import org.openide.ErrorManager;

/** 
 * Base for JBoss DeploymentConfiguration implementations.
 *
 * @author  Pavel Buzek, Libor Kotouc
 */
public abstract class JBDeploymentConfiguration 
        implements DatasourceConfiguration, MessageDestinationConfiguration {

    
    protected static final String JBOSS4_DATASOURCE_JNDI_PREFIX = "java:"; // NOI18N
    protected static final String JBOSS4_MAIL_SERVICE_JNDI_NAME = "java:Mail"; // NOI18N

    //cached data object for the data source file
    private DataObject datasourcesDO;
    
     //support for message destination resources
    private MessageDestinationSupport destSupport;
    
    /** Creates a new instance of JBDeploymentConfiguration */
    public JBDeploymentConfiguration (J2eeModule j2eeModule) {
        this.j2eeModule = j2eeModule;

    
    // helper methods -------------------------------------------------
    
    public static void writeFile(final File file, final BaseBean bean) throws ConfigurationException {
        try {
            FileObject cfolder = FileUtil.toFileObject(file.getParentFile());
            if (cfolder == null) {

            } else {
                // create jboss-ds.xml if it does not exist yet
                datasources = new Datasources();
                writeFile(datasourcesFile, datasources);
            }
        } catch (ConfigurationException ce) {
            ErrorManager.getDefault().notify(ce);

        });
    }
    
    public void bindDatasourceReference(String referenceName, String jndiName) throws ConfigurationException {}
    
    public void bindDatasourceReferenceForEjb(String ejbName, String ejbType, 
            String referenceName, String jndiName) throws ConfigurationException {}

    public String findDatasourceJndiName(String referenceName) throws ConfigurationException {
        return null;
    }
    
    public String findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException {
        return null;
    }
    
    private MessageDestinationSupport getMessageDestinationsSupport() {
        if (destSupport == null) {
            destSupport = new MessageDestinationSupport(resourceDir);
        }
        return destSupport;
    }
   
    public Set<MessageDestination> getMessageDestinations() throws ConfigurationException {
        return getMessageDestinationsSupport().getMessageDestinations();
    }

    public MessageDestination createMessageDestination(String name, MessageDestination.Type type) 
    throws UnsupportedOperationException, ConfigurationException {
        return getMessageDestinationsSupport().createMessageDestination(name, type);
    }
    
    public void bindMdbToMessageDestination(String mdbName, String name, MessageDestination.Type type) throws ConfigurationException {}

    public String findMessageDestinationName(String mdbName) throws ConfigurationException {
        return null;
    }

    public void bindMessageDestinationReference(String referenceName, String connectionFactoryName, 
            String destName, MessageDestination.Type type) throws ConfigurationException {}

    public void bindMessageDestinationReferenceForEjb(String ejbName, String ejbType,
            String referenceName, String connectionFactoryName,
            String destName, MessageDestination.Type type) 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.
 */


            FileObject dsFO = (FileObject)it.next();
            File dsFile = FileUtil.toFile(dsFO);
            try {
                Datasources ds = null;
                try {
                    ds = Datasources.createGraph(dsFile);
                } catch (RuntimeException re) {
                    // most likely not a data source (e.g. jms-ds.xml in JBoss 5.x)
                    String msg = NbBundle.getMessage(JBossDatasourceManager.class, "MSG_NotParseableDatasources", dsFile.getAbsolutePath());
                    ErrorManager.getDefault().log(ErrorManager.INFORMATIONAL, msg);
                    continue;
                }
                LocalTxDatasource ltxds[] = ds.getLocalTxDatasource();
                for (int i = 0; i < ltxds.length; i++) {
                    if (ltxds[i].getJndiName().length() > 0) {




        }

    }

    /**
     * Add a reference to the given resource to the message-driven bean if it does not exist yet.
     *
     * @param modifiedJboss Jboss graph instance being modified
     * @param resRefName resource reference name
     * @param mdbName the MDB (ejb-name) which might need to add resource reference specified by resRefName
     * @param jndiName JNDI name of the resource
     */
    static void modifyMsgDrv(Jboss modifiedJboss, String resRefName, String mdbName, String jndiName) {

        if (modifiedJboss.getEnterpriseBeans() == null)
            modifiedJboss.setEnterpriseBeans(new EnterpriseBeans());

        addMsgDrvResReference(modifiedJboss, resRefName, mdbName, jndiName);
    }
    
    private static void addMsgDrvResReference(Jboss modifiedJboss, String resRefName, String mdbName, String jndiName) {

        EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();

        for (MessageDriven mdb : eb.getMessageDriven()) {
            String ejbName = mdb.getEjbName();
            if (mdbName.equals(ejbName)) { // msgdrv found -> check whether it has the resource-ref
                ResourceRef[] resourceRefs = mdb.getResourceRef();
                int j = 0;
                for ( ; j < resourceRefs.length; j++) {
                    String rrn = resourceRefs[j].getResRefName();
                    if (resRefName.equals(rrn))
                        return; // resource-ref found
                }
                if (j == resourceRefs.length) {// resource-ref not found
                    ResourceRef newRR = new ResourceRef();
                    newRR.setResRefName(resRefName);
                    newRR.setJndiName(jndiName);
                    mdb.addResourceRef(newRR);
                }
            }
        }
    }
    
}




     * @param beanNames the beans (ejb-name value) which might need to add message destination reference specified by msgDestRefName
     * @param beanType type of bean to add message destination reference to
     * @param destPrefix prefix of the message destination
     * @param destName message destination name
     */
    static void modify(Jboss modifiedJboss, String msgDestRefName, Set beanNames, 
            BEAN_TYPE beanType, String destPrefix, String destName) {

        assert(beanNames.size() > 0);


            modifiedJboss.setEnterpriseBeans(new EnterpriseBeans());

        if (beanType == BEAN_TYPE.SESSION) {
            addSessionMsgDestReference(modifiedJboss, msgDestRefName, beanNames, destPrefix, destName);
        } else
        if (beanType == BEAN_TYPE.ENTITY) {
            addEntityMsgDestReference(modifiedJboss, msgDestRefName, beanNames, destPrefix, destName);
        }
    }
    

     * @param resRefName message destination reference name
     * @param sessionNames the sessions (ejb-name value) which might need to add message destination reference specified by msgDestRefName
     * @param destPrefix prefix of the message destination
     * @param destName message destination name
     */
    private static void addSessionMsgDestReference(Jboss modifiedJboss, String msgDestRefName, 
            Set sessionNames, String destPrefix, String destName) {

        List/*<Session>*/ sesssionsWithoutReference = new LinkedList();


        for (Iterator it = sesssionsWithoutReference.iterator(); it.hasNext(); ) {
            MessageDestinationRef mdr = new MessageDestinationRef();
            mdr.setMessageDestinationRefName(msgDestRefName);
            String jndiName = getJndiName(destName, destPrefix);
            mdr.setJndiName(jndiName);
            Session session = (Session)it.next();
            session.addMessageDestinationRef(mdr);

     * @param resRefName message destination reference name
     * @param sessionNames the entities (ejb-name value) which might need to add message destination reference specified by msgDestRefName
     * @param destPrefix prefix of the message destination
     * @param destName message destination name
     */
    private static void addEntityMsgDestReference(Jboss modifiedJboss, String msgDestRefName, 
            Set entityNames, String destPrefix, String destName) {

        List/*<Entity>*/ entitiesWithoutReference = new LinkedList();


        for (Iterator it = entitiesWithoutReference.iterator(); it.hasNext(); ) {
            MessageDestinationRef mdr = new MessageDestinationRef();
            mdr.setMessageDestinationRefName(msgDestRefName);
            String jndiName = getJndiName(destName, destPrefix);
            mdr.setJndiName(jndiName);
            Entity entity = (Entity)it.next();
            entity.addMessageDestinationRef(mdr);


    }
    
    /**
     * Add a reference to the given message destination to the message-driven beans if it does not exist yet.
     *
     * @param modifiedJboss Jboss graph instance being modified
     * @param msgDestRefName message destination reference name
     * @param mdbName the MDB (ejb-name value) which might need to add message 
     *        destination reference specified by msgDestRefName
     * @param destPrefix prefix of the message destination
     * @param destName message destination name
     */
    static void modifyMsgDrv(Jboss modifiedJboss, String msgDestRefName, 
            String mdbName, String destPrefix, String destName) {

        if (modifiedJboss.getEnterpriseBeans() == null)
            modifiedJboss.setEnterpriseBeans(new EnterpriseBeans());

        addMsgDrvMsgDestReference(modifiedJboss, msgDestRefName, mdbName, destPrefix, destName);
    }
    
    private static void addMsgDrvMsgDestReference(Jboss modifiedJboss, String msgDestRefName, 
            String mdbName, String destPrefix, String destName) {

        EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();

        for (MessageDriven mdb : eb.getMessageDriven()) {
            String ejbName = mdb.getEjbName();
            if (mdbName.equals(ejbName)) { // msgdrv found -> check whether it has the message-destination-ref
                MessageDestinationRef[] msgDestRefs = mdb.getMessageDestinationRef();
                int j = 0;
                for ( ; j < msgDestRefs.length; j++) {
                    String mdrn = msgDestRefs[j].getMessageDestinationRefName();
                    if (msgDestRefName.equals(mdrn))
                        return; // message-destination-ref found
                }
                if (j == msgDestRefs.length) { // message-destination-ref not found
                    MessageDestinationRef mdr = new MessageDestinationRef();
                    mdr.setMessageDestinationRefName(msgDestRefName);
                    String jndiName = getJndiName(destName, destPrefix);
                    mdr.setJndiName(jndiName);
                    mdb.addMessageDestinationRef(mdr);
                }
            }
        }
    }
    
    private static String getJndiName(String destName, String destPrefix) {
        return destPrefix + destName;
    }
    
}




 * "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 javax.swing.text.StyledDocument;
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ContextRootConfiguration;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.DatasourceConfiguration;

 * Web module deployment configuration handles creation and updating of the 
 * jboss-web.xml configuration file.
 *
 * @author Stepan Herold, Libor Kotouc
 */
public class WarDeploymentConfiguration extends JBDeploymentConfiguration 
implements ModuleConfiguration, ContextRootConfiguration, DatasourceConfiguration, 

        return true;
    }
    
    public boolean supportsCreateMessageDestination() {
        return true;
    }

    /**
     * Return context path.
     * 

                try {
                    String resType = resourceRef.getResType();
                    if ("javax.sql.DataSource".equals(resType)) { // NOI18N
                        addResReference(resourceRef.getResRefName(), JBOSS4_DATASOURCE_JNDI_PREFIX + resourceRef.getResRefName());
                    } else if ("javax.mail.Session".equals(resType)) { // NOI18N
                        addMailReference(resourceRef.getResRefName());
                    } else if ("javax.jms.ConnectionFactory".equals(resType)) { // NOI18N

        }
    }
    
    public void bindDatasourceReference(String referenceName, String jndiName) throws ConfigurationException {
        addResReference(referenceName, jndiName);
    }
    
    public String findDatasourceJndiName(String referenceName) throws ConfigurationException {
        
        ResourceRef resourceRefs[] = getJbossWeb().getResourceRef();
        for (ResourceRef resourceRef : resourceRefs) {
            String rrn = resourceRef.getResRefName();
            if (referenceName.equals(rrn)) {
                return resourceRef.getJndiName();
            }
        }
        
        return null;
    }

    /**
     * Add a new resource reference.
     * 
     * @param name resource reference name
     */
    private void addResReference(final String name, final String jndiName) throws ConfigurationException {
        modifyJbossWeb(new JbossWebModifier() {
            public void modify(JbossWeb modifiedJbossWeb) {


                //if it doesn't exist yet, create a new one
                ResourceRef newRR = new ResourceRef();
                newRR.setResRefName(name);
                newRR.setJndiName(jndiName);
                modifiedJbossWeb.addResourceRef(newRR);
            }
        });

        });
    }
    
    public void bindMessageDestinationReference(String referenceName, String connectionFactoryName, 
            String destName, MessageDestination.Type type) throws ConfigurationException {

        addConnectionFactoryReference(connectionFactoryName);
        
        String jndiName = null;
        if (MessageDestination.Type.QUEUE.equals(type)) {
            jndiName = "queue/" + destName;
        }
        else
        if (MessageDestination.Type.TOPIC.equals(type)) {
            jndiName = "topic/" + destName;
        }

        addMsgDestReference(referenceName, jndiName);
    }
    
    /**
     * Add a new connection factory reference.
     * 

     * @param name message destination name
     * @param destPrefix MDB destination prefix
     */
    private void addMsgDestReference(final String name, final String jndiName) throws ConfigurationException {
        modifyJbossWeb(new JbossWebModifier() {
            public void modify(JbossWeb modifiedJbossWeb) {


                //if it doesn't exist yet, create a new one
                MessageDestinationRef mdr = new MessageDestinationRef();
                mdr.setMessageDestinationRefName(name);
                String jndiName = name;
                if (name.startsWith("jms/")) // prefix automatically prepended to the selected message destination during 'Send JMS Message' action
                    jndiName = destPrefix + name.substring("jms/".length()); //replace 'jms/' with the correct prefix
                mdr.setJndiName(jndiName);
                modifiedJbossWeb.addMessageDestinationRef(mdr);
            }

                } else {
                    // create jboss-web.xml if it does not exist yet
                    jbossWeb = generateJbossWeb();
                    writeFile(jbossWebFile, jbossWeb);
                }
            } catch (ConfigurationException ce) {
                ErrorManager.getDefault().notify(ce);




/*
 * 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.jboss4.config.mdb;

import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;

/**
 *
 * @author Libor Kotouc
 */
public class JBossMessageDestination implements MessageDestination {
    
    private String name;
    private Type type;
    
    public JBossMessageDestination(String name, Type type) {
        this.name = name;
        this.type = type;
    }

    public String getName() {
        return name;
    }

    public Type getType() {
        return type;
    }
    
}




/*
 * 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.jboss4.config.mdb;

import java.io.BufferedOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.HashSet;
import java.util.Set;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
import org.netbeans.modules.j2ee.deployment.plugins.spi.MessageDestinationDeployment;
import org.netbeans.modules.j2ee.jboss4.ide.ui.JBPluginProperties;
import org.netbeans.modules.schema2beans.BaseBean;
import org.openide.filesystems.FileLock;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;

/**
 *
 * @author Libor Kotouc
 */
public final class JBossMessageDestinationDeployment implements MessageDestinationDeployment {
    
//    private static final String DSdotXML = "-ds.xml"; // NOI18N
//    private static final String JBossDSdotXML = "jboss-ds.xml"; // NOI18N
    
    // server's deploy dir
    private FileObject deployDir;
    
    public JBossMessageDestinationDeployment(String serverUrl) {
        String serverDirPath = InstanceProperties.getInstanceProperties(serverUrl).
                                        getProperty(JBPluginProperties.PROPERTY_DEPLOY_DIR);
        deployDir = FileUtil.toFileObject(new File(serverDirPath));
    }
    
    public Set<MessageDestination> getMessageDestinations() throws ConfigurationException {
        HashSet<MessageDestination> destinations = new HashSet<MessageDestination>();
        destinations.add(new JBossMessageDestination("SampleServerQueue", MessageDestination.Type.QUEUE));
        destinations.add(new JBossMessageDestination("SampleServerTopic", MessageDestination.Type.TOPIC));
        return destinations;
    }

    public void deployMessageDestinations(Set<MessageDestination> destinations) throws ConfigurationException {
    }
    
    
/*  
    public Set<Datasource> getDatasources() throws ConfigurationException {
        
        Set<Datasource> datasources = new HashSet<Datasource>();
        
        if (deployDir == null || !deployDir.isValid() || !deployDir.isFolder() || !deployDir.canRead()) {
            ErrorManager.getDefault().log(ErrorManager.USER, 
                    NbBundle.getMessage(JBossMessageDestinationDeployment.class, "ERR_WRONG_DEPLOY_DIR"));
            return datasources;
        }
        
        Enumeration files = deployDir.getChildren(true);
        List<FileObject> confs = new LinkedList<FileObject>();
        while (files.hasMoreElements()) { // searching for config files with DS
            FileObject file = (FileObject) files.nextElement();
            if (!file.isFolder() && file.getNameExt().endsWith(DSdotXML) && file.canRead())
                confs.add(file);
        }
        
        if (confs.size() == 0) // nowhere to search
            return datasources;

        for (Iterator it = confs.iterator(); it.hasNext();) {
            FileObject dsFO = (FileObject)it.next();
            File dsFile = FileUtil.toFile(dsFO);
            try {
                Datasources ds = null;
                try {
                    ds = Datasources.createGraph(dsFile);
                } catch (RuntimeException re) {
                    // most likely not a data source (e.g. jms-ds.xml in JBoss 5.x)
                    String msg = NbBundle.getMessage(JBossMessageDestinationDeployment.class, "MSG_NotParseableDatasources", dsFile.getAbsolutePath());
                    ErrorManager.getDefault().log(ErrorManager.INFORMATIONAL, msg);
                    continue;
                }
                LocalTxDatasource ltxds[] = ds.getLocalTxDatasource();
                for (int i = 0; i < ltxds.length; i++) {
                    if (ltxds[i].getJndiName().length() > 0) {
                        datasources.add(new JBossDatasource(
                                    ltxds[i].getJndiName(),
                                    ltxds[i].getConnectionUrl(),
                                    ltxds[i].getUserName(),
                                    ltxds[i].getPassword(),
                                    ltxds[i].getDriverClass()));
                    }
                }
            } catch (IOException ioe) {
                String msg = NbBundle.getMessage(JBossMessageDestinationDeployment.class, "MSG_CannotReadDatasources", dsFile.getAbsolutePath());
                throw new ConfigurationException(msg, ioe);
            } catch (RuntimeException re) {
                String msg = NbBundle.getMessage(JBossMessageDestinationDeployment.class, "MSG_NotParseableDatasources", dsFile.getAbsolutePath());
                throw new ConfigurationException(msg ,re);
            }
        }
        
        return datasources;
    }

    public void deployDatasources(Set<Datasource> datasources) 
    throws ConfigurationException, DatasourceAlreadyExistsException 
    {
        Set<Datasource> deployedDS = getDatasources();
        Map<String, Datasource> ddsMap = transform(deployedDS); // for faster searching
        
        HashMap<String, Datasource> newDS = new HashMap<String, Datasource>(); // will contain all ds which do not conflict with existing ones
        
        //resolve all conflicts
        LinkedList<Datasource> conflictDS = new LinkedList<Datasource>();
        for (Iterator<Datasource> it = datasources.iterator(); it.hasNext();) {
            Object o = it.next();
            if (!(o instanceof JBossDatasource))
                continue;
            JBossDatasource ds = (JBossDatasource)o;
            String jndiName = ds.getJndiName();
            if (ddsMap.keySet().contains(jndiName)) { // conflicting ds found
                if (!ddsMap.get(jndiName).equals(ds)) { // found ds is not equal
                    conflictDS.add(ddsMap.get(jndiName)); // NOI18N
                }
            }
            else if (jndiName != null) {
                newDS.put(jndiName, ds);
            }
        }
        
        if (conflictDS.size() > 0) { // conflict found -> exception
            throw new DatasourceAlreadyExistsException(conflictDS);
        }
        
        //write jboss-ds.xml
        FileObject dsXmlFo = serverDir.getFileObject(JBossDSdotXML);
        File dsXMLFile = (dsXmlFo != null ? FileUtil.toFile(dsXmlFo) : null);

        Datasources deployedDSGraph = null;
        try {
            deployedDSGraph = (dsXMLFile != null ? Datasources.createGraph(dsXMLFile) : new Datasources());
        }
        catch (IOException ioe) {
            ErrorManager.getDefault().annotate(ioe, NbBundle.getMessage(getClass(), "ERR_CannotReadDSdotXml"));
            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
            return;
        }

        //merge ds graph with newDS - remove conflicting ds from graph
        LocalTxDatasource ltxds[] = deployedDSGraph.getLocalTxDatasource();
        for (int i = 0; i < ltxds.length; i++) {
            String jndiName = ltxds[i].getJndiName();
            if (newDS.keySet().contains(jndiName)) //conflict, we must remove it from graph
                deployedDSGraph.removeLocalTxDatasource(ltxds[i]);
        }
        
        //add all ds from newDS
        for (Iterator it = newDS.values().iterator(); it.hasNext();) {
            JBossDatasource ds = (JBossDatasource) it.next();
            
            LocalTxDatasource lds = new LocalTxDatasource();
            lds.setJndiName(ds.getJndiName());
            lds.setConnectionUrl(ds.getUrl());
            lds.setDriverClass(ds.getDriverClassName());
            lds.setUserName(ds.getUsername());
            lds.setPassword(ds.getPassword());
            lds.setMinPoolSize(ds.getMinPoolSize());
            lds.setMaxPoolSize(ds.getMaxPoolSize());
            lds.setIdleTimeoutMinutes(ds.getIdleTimeoutMinutes());

            deployedDSGraph.addLocalTxDatasource(lds);
        }
        
        //write modified graph into jboss-ds.xml
        if (newDS.size() > 0) {
            if (dsXMLFile == null) {
                try {
                    dsXmlFo = serverDir.createData(JBossDSdotXML);
                }
                catch (IOException ioe) {
                    ErrorManager.getDefault().annotate(ioe, NbBundle.getMessage(getClass(), "ERR_CannotCreateDSdotXml"));
                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
                    return;
                }
                
                dsXMLFile = FileUtil.toFile(dsXmlFo);
            }
            
            writeFile(dsXMLFile, deployedDSGraph);            
        }        
        
    }
    
    private Map<String, Datasource> transform(Set<Datasource> datasources) {
        HashMap<String, Datasource> map = new HashMap<String, Datasource>();
        for (Iterator it = datasources.iterator(); it.hasNext();) {
            JBossDatasource ds = (JBossDatasource) it.next();
            if (ds.getJndiName() != null)
                map.put(ds.getJndiName(), ds);
        }
        return map;
    }
*/
    private void writeFile(final File file, final BaseBean bean) throws ConfigurationException {
        try {

            FileSystem fs = deployDir.getFileSystem();
            fs.runAtomicAction(new FileSystem.AtomicAction() {
                public void run() throws IOException {
                    OutputStream os = null;
                    FileLock lock = null;
                    try {
                        String name = file.getName();
                        FileObject configFO = deployDir.getFileObject(name);
                        if (configFO == null) {
                            configFO = deployDir.createData(name);
                        }
                        lock = configFO.lock();
                        os = new BufferedOutputStream (configFO.getOutputStream(lock), 4096);
                        // TODO notification needed
                        if (bean != null) {
                            bean.write(os);
                        }
                    } finally {
                        if (os != null) {
                            try { os.close(); } catch(IOException ioe) {}
                        }
                        if (lock != null) 
                            lock.releaseLock();
                    }
                }
            });
        } catch (IOException e) {
            throw new ConfigurationException (e.getLocalizedMessage ());
        }
    }

}




/*
 * 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.jboss4.config.mdb;

import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
import org.netbeans.modules.j2ee.jboss4.config.JBDeploymentConfiguration;
import org.netbeans.modules.j2ee.jboss4.config.gen.Mbean;
import org.netbeans.modules.j2ee.jboss4.config.gen.Server;
import org.openide.ErrorManager;
import org.openide.filesystems.FileChangeAdapter;
import org.openide.filesystems.FileEvent;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

/**
 *
 * @author Libor Kotouc
 */
public class MessageDestinationSupport {
    
    public static String MSG_DEST_RESOURCE_NAME_JB4 = "netbeans-destinations-service.xml"; // NOI18N
    
    //model of the destination service file
    private Server destinationServiceModel;
    
    //destination service file (placed in the resourceDir)
    private File destinationsFile;
    
    //destination service file object
    private FileObject destinationsFO;
    
    public MessageDestinationSupport(File resourceDir) {
        this.destinationsFile = destinationsFile;

        destinationsFile = new File(resourceDir, MSG_DEST_RESOURCE_NAME_JB4);
        ensureDestinationsFOExists();
    }
    
    /**
     * Listener of netbeans-destinations-service.xml document changes.
     */
    private class MessageDestinationFileListener extends FileChangeAdapter {
        
        public void fileChanged(FileEvent fe) {
            assert(fe.getSource() == destinationsFO);
            destinationServiceModel = null;
        }

        public void fileDeleted(FileEvent fe) {
            assert(fe.getSource() == destinationsFO);
            destinationServiceModel = null;
        }
    } 
    
    private void ensureDestinationsFOExists() {
        if (!destinationsFile.exists()) {
            return;
        }
        if (destinationsFO == null || !destinationsFO.isValid()) {
            destinationsFO = FileUtil.toFileObject(destinationsFile);
            assert(destinationsFO != null);
            destinationsFO.addFileChangeListener(new MessageDestinationFileListener());
        }
    }
    
    public Set<MessageDestination> getMessageDestinations() throws ConfigurationException {
        
        Server server = getMessageDestinationGraph();
        if (server == null) {
            return Collections.<MessageDestination>emptySet();
        }
        
        HashSet<MessageDestination> destinations = new HashSet<MessageDestination>();
        
        for (Mbean mbean : destinationServiceModel.getMbean()) {
            String mbeanNameAttribute = mbean.getName();
            if (mbeanNameAttribute == null) {
                continue;
            }
            
            MessageDestination.Type type = null;
            if (mbeanNameAttribute.indexOf("service=Queue") > -1) { // NOI18N
                type = MessageDestination.Type.QUEUE;
            }
            else
            if (mbeanNameAttribute.indexOf("service=Topic") > -1) { // NOI18N
                type = MessageDestination.Type.TOPIC;
            }
            if (type == null) {
                continue;
            }
            
            int nameIndex = mbeanNameAttribute.indexOf("name="); // NOI18N
            if (nameIndex == -1) {
                continue;
            }
            
            String name = mbeanNameAttribute.substring(nameIndex + 5); // "name=".length() == 5
            if (name.indexOf(",") > -1) {
                name = name.substring(0, name.indexOf(",")); // NOI18N
            }
                
            destinations.add(new JBossMessageDestination(name, type));
        }
        
        return destinations;
    }

    public MessageDestination createMessageDestination(String name, MessageDestination.Type type) 
    throws UnsupportedOperationException, ConfigurationException {
        // TODO write into file
        return new JBossMessageDestination(name, type);
    }
    
    /**
     * Return destination service graph. If it was not created yet, load it from the file
     * and cache it. If the file does not exist, generate it.
     *
     * @return Destination service graph or null if the netbeans-destinations-service.xml file is not parseable.
     */
    private synchronized Server getMessageDestinationGraph() {
        
        try {
            if (destinationsFile.exists()) {
                // load configuration if already exists
                try {
                    if (destinationServiceModel == null)
                        destinationServiceModel = Server.createGraph(destinationsFile);
                } catch (IOException ioe) {
                    ErrorManager.getDefault().notify(ioe);
                } catch (RuntimeException re) {
                    // netbeans-destinations-service.xml is not parseable, do nothing
                }
            } else {
                // create netbeans-destinations-service.xml if it does not exist yet
                destinationServiceModel = new Server();
                JBDeploymentConfiguration.writeFile(destinationsFile, destinationServiceModel);
                ensureDestinationsFOExists();
            }
        } catch (ConfigurationException ce) {
            ErrorManager.getDefault().notify(ce);
        }

        return destinationServiceModel;
    }
    
}




 * "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.jboss4.ide;

import org.netbeans.modules.j2ee.deployment.plugins.spi.MessageDestinationDeployment;
import org.netbeans.modules.j2ee.jboss4.JBDeploymentManager;
import org.netbeans.modules.j2ee.deployment.plugins.spi.DatasourceManager;
import org.netbeans.modules.j2ee.jboss4.config.JBossDatasourceManager;

import org.netbeans.modules.j2ee.deployment.plugins.spi.IncrementalDeployment;
import org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory;
import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer;
import org.netbeans.modules.j2ee.jboss4.config.mdb.JBossMessageDestinationDeployment;
import org.openide.WizardDescriptor.InstantiatingIterator;

/**

        
        return dsMgr;
    }

    public MessageDestinationDeployment getMessageDestinationDeployment(DeploymentManager dm) {
        if (!(dm instanceof JBDeploymentManager)) {
            throw new IllegalArgumentException("");
        }

        return new JBossMessageDestinationDeployment(((JBDeploymentManager)dm).getUrl());
    }
    
    
}




<?xml version='1.0' encoding='UTF-8' ?>

<!-- A skeleton JBoss MBean service descriptor DTD. This cannot be used in
general to validate a jboss-service.xml descriptor due to the fact that the
'attribute' element allows ANY content.

$Id: jboss-service_4_0.dtd,v 1.1.2.1 2007/03/26 09:55:00 lkotouc Exp $

DOCTYPE server
    PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
    "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd"
-->
<!-- The server element is the root element.
-->
<!ELEMENT server (loader-repository? , local-directory* , classpath* , mbean*)>

<!-- The loader-repository specifies the name of the UnifiedLoaderRepository
   MBean to use for the ear to provide ear level scoping of classes deployed
   in the ear. It is a unique JMX ObjectName string. It may also specify
   an arbitrary configuration by including a loader-repository-config element.

Examples:
   <loader-repository>jboss.test:loader=cts-cmp2v1-sar.ear</loader-repository>

   <loader-repository loaderRepositoryClass='dot.com.LoaderRepository'>
      dot.com:loader=unique-archive-name
      <loader-repository-config configParserClass='dot.com.LoaderParser'>
         java2ParentDelegaton=true
      </loader-repository-config>
   </loader-repository>
-->
<!ELEMENT loader-repository (#PCDATA | loader-repository-config)*>

<!-- The loaderRepositoryClass attribute gives the classname of the
org.jboss.mx.loading.LoaderRepository implementation.
-->
<!ATTLIST loader-repository loaderRepositoryClass CDATA  #IMPLIED>

<!-- The loader-repository-config element specifies any arbitrary configuration
fragment for use in configuring the loader-repository instance. The actual
content of this element is specific to the loaderRepositoryClass and the
code parsing the element.
-->
<!ELEMENT loader-repository-config (#PCDATA)>

<!-- The configParserClass attribute gives the classname of the
org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfigParser
implementation to use to parse the loader-repository-config content.
-->
<!ATTLIST loader-repository-config configParserClass CDATA  #IMPLIED>

<!-- A local-directory element specifies that portions of the sar are to be unjard into the data
directory of the server configuration.
-->
<!ELEMENT local-directory EMPTY>

<!-- The optional path attribute gives the prefix of the sar entries that should be copied
into the data directory. If it is not specified the entire sar contents will be placed into
the data directory.
-->
<!ATTLIST local-directory path CDATA  #IMPLIED>

<!-- A classpath element specifies a location which will be included in the services
deployment classpath.
-->
<!ELEMENT classpath EMPTY>

<!-- The codebase attribute specifies the base URL from which the jars or classes
are loaded from. If the codebase is '.' then it is equal to the mbean deployment URL.
Otherwise, it is resolved as a path spec relative to the serverHomeURL (e.g., file:/jboss-3.2.0)
using the URL ctor URL(serverHomeURL, codebase)

Examples:

   <classpath codebase='.' archives='util.jar' />
   <classpath codebase='http://classloader.dot.com' archives='*' />
   <classpath codebase="lib" archives="*"/>
-->
<!ATTLIST classpath codebase CDATA  #REQUIRED>

<!-- The archives attribute specifies either the '*' wildcard to indicate all contents of the
codebase should be included, or a comma seperated list of the jars to include.
-->
<!ATTLIST classpath archives CDATA  #IMPLIED>

<!-- The mbean element defines a JBoss MBean service. This includes the
mbean class, attributes and dependencies.
-->
<!ELEMENT mbean (constructor? , xmbean? , attribute* , depends* , depends-list*)>

<!-- The code attributes gives the fully qualified name of the MBean
implementation class.
-->
<!ATTLIST mbean code      CDATA  #REQUIRED>

<!-- The name attribute gives the JMX ObjectName string to use when registering
the MBean. This must be a unique and valid JMX name.
-->
<!ATTLIST mbean name      CDATA  #REQUIRED>

<!-- The optional interface attribute gives the full qualified name of the class
uses to construct the management interface of the mbean. In absence of it an interface
with the name ending by MBean will be looked in the implementation class. When used
this interface is defined explicitely.
-->
<!ATTLIST mbean interface CDATA  #IMPLIED>

<!-- The xmbean-dd attribute defines the path to the JBoss XMBean descriptor. This
is an xml document conforming to:

<!DOCTYPE mbean PUBLIC
      "-//JBoss//DTD JBOSS XMBEAN 1.0//EN"
      "http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_0.dtd">

If the descriptor is embedded via a nested xmbean element, the xmbean-dd attribute
must be given as an empty string.

Example:
	<mbean code="org.jboss.test.jmx.xmbean.User"
		name="jboss.test:service=xmbean-user"
		xmbean-dd="META-INF/org/jboss/test/jmx/xmbean/User.xml" />
-->
<!ATTLIST mbean xmbean-dd CDATA  #IMPLIED>

<!-- The optional xmbean-code attribute specifies the ModelMBean implementation class
to use. This defaults to org.jboss.mx.modelmbean.XMBean.
-->
<!ATTLIST mbean xmbean-code CDATA  #IMPLIED>

<!-- The xmbean element specifies a nested JBoss XMBean descriptor fragment. Its
supported content model is the same as the mbean element of the jboss_xmbean_1_0.dtd

Example:
	<mbean code="org.jboss.test.jmx.xmbean.User"
		name="jboss.test:service=xmbean-user"
		xmbean-dd="">
		<xmbean>
			...
		</xmbean>
	</mbean>
-->
<!ELEMENT xmbean ANY>

<!-- The constructor element defines a non-default constructor to use when
instantiating the mbean.
-->
<!ELEMENT constructor (arg*)>

<!-- The arg element specify the constructor arguments in the order of the
ctor signature. Each arg has a type and value attribute.
-->
<!ELEMENT arg EMPTY>

<!-- The type attribute gives the type of the argument as defined in the
ctor signature. If not defined java.lang.String is assumed.
-->
<!ATTLIST arg type  CDATA  #IMPLIED>

<!-- The value attribute provides the string representation of the ctor
argument. It is converted from a string to type using Java PropertyEditor or a
ctor taking a single string as its argument.
-->
<!ATTLIST arg value CDATA  #REQUIRED>

<!-- The attribute element specifies the initial value for a management attribute of
the enclosing mbean. Typically the value of the attribute element is the string
representation of the attribute, but it can be an arbitrary xml fragment that is
parsed by the mbean.
-->
<!ELEMENT attribute ANY>

<!-- The required name attribute gives the name of the attribute. This is the
name exposed by the mbean to the MBeanServer for the attribute.
-->
<!ATTLIST attribute name CDATA  #REQUIRED>

<!-- The optional replace attribute indicates whether references of the form ${x}
in the attribute element content should be replaced with the corresponding
System.getProperty(x) value.
-->
<!ATTLIST attribute replace (true | false) 'true'>
<!-- The optional trim attribute specifies whether the attribute element content should
be trimmed of whitespace.
-->
<!ATTLIST attribute trim (true | false) 'true'>

<!-- The attributeClass attribute specifies that type of object that
should be created. This is needed for non-concreate attribute types
like interfaces and abstract classes.
-->
<!ATTLIST attribute attributeClass CDATA  #IMPLIED>

<!-- The serialDataType defines the how the content of the attribute
element is interpretted by the ServiceConfigurator. The possible values
are:
   + text: the content is treated as the string representation of the
   attribute value. It will be mapped to the attribute using the PropertyEditor
   registered for the attribute type.
   + javaBean: the content is a collection of property elements.
   + jbxb: the content is an xml element from a namespace with an associated
      xml schema that can be unmarshalled using the JBossXB framework.
-->
<!ATTLIST attribute serialDataType (text | javaBean | jbxb) 'text'>

<!-- The property element is used to describe the JavaBean properties of
an attribute when the attribute element serialDataType is javaBean.
-->
<!ELEMENT property (#PCDATA)>
<!-- The required name attribute gives the name of the property. This is the
name of a JavaBean property for the attribute type.
-->
<!ATTLIST property name CDATA #REQUIRED>

<!-- The depends element specifies a JMX ObjectName string for an mbean
on which the enclosing mbean depends.

Example:
   <mbean code="myBean" name="domain:name=x">
      <depends optional-attribute-name="yName">domain:name=y</depends>
   </mbean>

   <mbean code="myBean" name="domain:name=x">
      <depends optional-attribute-name="anonName">
         <mbean code="nestedBean" name="domain:name=x.y">
         ...
         </mbean>
      </depends>
   </mbean>
-->
<!ELEMENT depends (#PCDATA | mbean)*>

<!-- The optional-attribute-name attribute specifies the attribute name
which should be populated with the JMX ObjectName of the depends element.
This allows an mbean to have access to the name of the mbean on which
it depends.
-->
<!ATTLIST depends optional-attribute-name CDATA  #IMPLIED>

<!-- The proxy-type attribute specifies the interface name
that should be exposed on an MBeanProxy pointing at the dependent
MBean, specified by the JMX ObjectName.

The special value proxy-type="attribute" will use the
class declared in the MBeanAttributeInfo as the interface
for the MBeanProxy.

Example:
   <mbean code="org.jboss.example.Helper" name="domain:name=helper"/>

   <mbean code="myBean" name="domain:name=x">
      <depends optional-attribute-name="Helper"
               proxy-type="org.jboss.example.HelperMBean"
      >domain:name=helper</depends>
   </mbean>

   <mbean code="myBean" name="domain:name=x">
      <depends optional-attribute-name="Helper"
               proxy-type="attribute"
      >domain:name=helper</depends>
   </mbean>
-->
<!ATTLIST depends proxy-type CDATA  #IMPLIED>

<!-- The depends-list element specifies a series of JMX ObjectName
strings of mbeans on which the enclosing mbean depends.

Example:
   <mbean code="myBean" name="domain:name=x">
      <depends-list optional-attribute-name="myObjectNameList">
         <depends-list-element>domain:name=y</depends-list-element>
         <depends-list-element>domain:name=z</depends-list-element>
      </depends-list>
   </mbean>
-->
<!ELEMENT depends-list (depends-list-element)+>

<!-- The optional-attribute-name attribute specifies the attribute name
which should be populated with a java.util.List that contains the JMX
ObjectName(s) of the depends-list elements. This allows an mbean to have
access to the names of the mbeans on which it depends.
-->
<!ATTLIST depends-list optional-attribute-name CDATA  #IMPLIED>

<!-- The depends-list-element element specifies a JMX ObjectName string
for an mbean on which the enclosing mbean depends.
-->
<!ELEMENT depends-list-element (#PCDATA | mbean)*>

Lines 148-153 Link Here

(-)serverplugins/sun/appsrv81/nbproject/project.xml (+1 lines)
148	<compile-dependency/>	148	<compile-dependency/>
149	<run-dependency>	149	<run-dependency>
150	<release-version>4</release-version>	150	<release-version>4</release-version>
		151	<specification-version>1.25</specification-version>
151	</run-dependency>	152	</run-dependency>
152	</dependency>	153	</dependency>
153	<dependency>	154	<dependency>




                new UnsupportedOperationException());
    }

    public void bindDatasourceReference(String jndiName, String dsJNDIName) throws ConfigurationException {
    }

    public void bindDatasourceReferenceForEjb(String ejbName, String ejbType, String jndiName, String dsJNDIName) throws ConfigurationException {
    }

    public String findDatasourceJndiName(String jndiName) throws ConfigurationException {
        return null;
    }

    public String findDatasourceJndiNameForEjb(String ejbName, String jndiName) throws ConfigurationException {
        return null;
    }

}


Lines 112-118 Link Here

(-)tomcatint/tomcat5/nbproject/project.xml (-1 / +1 lines)
112	<compile-dependency/>	112	<compile-dependency/>
113	<run-dependency>	113	<run-dependency>
114	<release-version>4</release-version>	114	<release-version>4</release-version>
115	<specification-version>1.24</specification-version>	115	<specification-version>1.25</specification-version>
116	</run-dependency>	116	</run-dependency>
117	</dependency>	117	</dependency>
118	<dependency>	118	<dependency>




        else if (contextPath.indexOf("//")>=0) correct=false; //NOI18N
        return correct;
    }

    public void bindDatasourceReference(String referenceName, String jndiName) throws ConfigurationException {
        // TODO implement
    }

    public void bindDatasourceReferenceForEjb(String ejbName, String ejbType, String referenceName, String jndiName) throws ConfigurationException {
        // TODO implement
    }

    public String findDatasourceJndiName(String referenceName) throws ConfigurationException {
        // TODO implement
        return null;
    }

    public String findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException {
        // TODO implement
        return null;
    }
    
    // private helper interface -----------------------------------------------
     




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>4</release-version>
                        <specification-version>1.25</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.api.web.webmodule</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.8</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>

Lines 40-45 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java (-1 / +109 lines)
40	import org.netbeans.modules.j2ee.common.source.AbstractTask;	40	import org.netbeans.modules.j2ee.common.source.AbstractTask;
41	import org.netbeans.modules.j2ee.dd.api.common.MessageDestinationRef;	41	import org.netbeans.modules.j2ee.dd.api.common.MessageDestinationRef;
42	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;	42	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
		43	import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
		44	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
		45	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
		46	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
		47	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
		48	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
		49	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
		50	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
43	import org.netbeans.modules.j2ee.ejbcore.Utils;	51	import org.netbeans.modules.j2ee.ejbcore.Utils;
44	import org.netbeans.modules.j2ee.ejbcore._RetoucheUtil;	52	import org.netbeans.modules.j2ee.ejbcore._RetoucheUtil;
45	import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entres.JMSDestination;	53	import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entres.JMSDestination;
Lines 61-67 Link Here
61	this.jmsDestination = jmsDestination;	69	this.jmsDestination = jmsDestination;
62	}	70	}
63		71
64	public void genMethods(EnterpriseReferenceContainer container, final String className, FileObject fileObject, ServiceLocatorStrategy slStrategy) throws IOException {	72	public void genMethods(
		73	EnterpriseReferenceContainer container,
		74	final String className,
		75	FileObject fileObject,
		76	ServiceLocatorStrategy slStrategy,
		77	J2eeModuleProvider j2eeModuleProvider,
		78	MessageDestination dest) throws IOException {
		79
65	JavaSource javaSource = JavaSource.forFileObject(fileObject);	80	JavaSource javaSource = JavaSource.forFileObject(fileObject);
66	final boolean[] isInjectionTarget = new boolean[1];	81	final boolean[] isInjectionTarget = new boolean[1];
67	javaSource.runUserActionTask(new AbstractTask<CompilationController>() {	82	javaSource.runUserActionTask(new AbstractTask<CompilationController>() {
Lines 89-95 Link Here
89	String sendMethodName = createSendMethod(fileObject, className, jmsDestination.getDestination());	104	String sendMethodName = createSendMethod(fileObject, className, jmsDestination.getDestination());
90	createJMSProducer(fileObject, className, factoryName, connectionFactoryFieldName, destinationName,	105	createJMSProducer(fileObject, className, factoryName, connectionFactoryFieldName, destinationName,
91	destinationFieldName,sendMethodName, slStrategy);	106	destinationFieldName,sendMethodName, slStrategy);
		107
		108	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		109
		110	if (dest != null) {
		111	try {
		112	if (j2eeModuleProvider.getJ2eeModule().getModuleType().equals(J2eeModule.WAR)) {
		113	//in the current implementation, reference name is the same as the destination name...
		114	j2eeModuleProvider.getConfigSupport().bindMessageDestinationReference(
		115	dest.getName(), factoryName, dest.getName(), dest.getType());
		116	}
		117	else
		118	if (j2eeModuleProvider.getJ2eeModule().getModuleType().equals(J2eeModule.EJB)) {
		119	//in the current implementation, reference name is the same as the destination name...
		120	bindMessageDestinationReferenceForEjb(j2eeModuleProvider, fileObject, className,
		121	dest.getName(), factoryName, dest.getName(), dest.getType());
		122	}
		123	}
		124	catch (ConfigurationException ce) {
		125	}
		126	}
		127	}
		128
		129	}
		130
		131	private void bindMessageDestinationReferenceForEjb(J2eeModuleProvider j2eeModuleProvider,
		132	FileObject fileObject, String className,
		133	String referenceName, String connectionFactoryName,
		134	String destName, MessageDestination.Type destType) throws ConfigurationException {
		135
		136	EjbJar dd = null;
		137	try {
		138	dd = findDDRoot(fileObject);
		139	}
		140	catch (IOException ioe) {
		141	// TODO
		142	}
		143	if (dd == null) {
		144	return;
		145	}
		146
		147	EnterpriseBeans beans = dd.getEnterpriseBeans();
		148	if (beans == null) {
		149	return;
92	}	150	}
		151
		152	String ejbName = getEjbName(beans, className);
		153	if (ejbName == null) {
		154	return;
		155	}
		156
		157	String ejbType = getEjbType(beans, className);
		158	if (ejbType == null) {
		159	return;
		160	}
		161
		162	j2eeModuleProvider.getConfigSupport().bindMessageDestinationReferenceForEjb(
		163	ejbName, ejbType, referenceName, connectionFactoryName, destName, destType);
		164	}
		165
		166	private EjbJar findDDRoot(FileObject fileObject) throws IOException {
		167	org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbJar = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJar(fileObject);
		168	assert ejbJar != null;
		169	return DDProvider.getDefault().getMergedDDRoot(ejbJar.getMetadataUnit());
		170	}
		171
		172	private String getEjbName(EnterpriseBeans beans, String className) {
		173	Ejb ejb = (Ejb) beans.findBeanByName(EnterpriseBeans.SESSION, Ejb.EJB_CLASS, className);
		174	if (ejb == null) {
		175	ejb = (Ejb) beans.findBeanByName(EnterpriseBeans.ENTITY, Ejb.EJB_CLASS, className);
		176	}
		177	if (ejb == null) {
		178	ejb = (Ejb) beans.findBeanByName(EnterpriseBeans.MESSAGE_DRIVEN, Ejb.EJB_CLASS, className);
		179	}
		180
		181	return ejb.getEjbName();
		182	}
		183
		184	private String getEjbType(EnterpriseBeans beans, String className) {
		185	String type = null;
		186
		187	if (beans.findBeanByName(EnterpriseBeans.SESSION, Ejb.EJB_CLASS, className) != null) {
		188	type = EnterpriseBeans.SESSION;
		189	}
		190	else
		191	if (beans.findBeanByName(EnterpriseBeans.ENTITY, Ejb.EJB_CLASS, className) != null) {
		192	type = EnterpriseBeans.ENTITY;
		193	}
		194	else
		195	if (beans.findBeanByName(EnterpriseBeans.MESSAGE_DRIVEN, Ejb.EJB_CLASS, className) != null) {
		196	type = EnterpriseBeans.MESSAGE_DRIVEN;
		197	}
		198
		199	return type;
		200	}
93		201
94	private String generateConnectionFactoryReference(EnterpriseReferenceContainer container, FileObject referencingFile, String referencingClass) throws IOException {	202	private String generateConnectionFactoryReference(EnterpriseReferenceContainer container, FileObject referencingFile, String referencingClass) throws IOException {
95	ResourceRef ref = container.createResourceRef(referencingClass);	203	ResourceRef ref = container.createResourceRef(referencingClass);

Lines 13-19 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java (-3 / +109 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 37-43 Link Here
37	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;	37	import org.netbeans.modules.j2ee.common.queries.api.InjectionTargetQuery;
38	import org.netbeans.modules.j2ee.common.source.AbstractTask;	38	import org.netbeans.modules.j2ee.common.source.AbstractTask;
39	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;	39	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
		40	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
		41	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
		42	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
		43	import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
		44	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
40	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;	45	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
		46	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
		47	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
41	import org.netbeans.modules.j2ee.ejbcore.Utils;	48	import org.netbeans.modules.j2ee.ejbcore.Utils;
42	import org.netbeans.modules.j2ee.ejbcore._RetoucheUtil;	49	import org.netbeans.modules.j2ee.ejbcore._RetoucheUtil;
43	import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entres.ServiceLocatorStrategy;	50	import org.netbeans.modules.j2ee.ejbcore.ui.logicalview.entres.ServiceLocatorStrategy;
Lines 52-59 Link Here
52	public UseDatabaseGenerator() {	59	public UseDatabaseGenerator() {
53	}	60	}
54		61
55	public void generate(final FileObject fileObject, final ElementHandle<TypeElement> elementHandle, final Datasource datasource,	62	public void generate(final FileObject fileObject, final ElementHandle<TypeElement> elementHandle,
56	final boolean createServerResources, String serviceLocator) throws IOException {	63	final J2eeModuleProvider j2eeModuleProvider, final String datasourceReferenceName,
		64	final Datasource datasource, final boolean createServerResources, String serviceLocator)
		65	throws IOException, ConfigurationException
		66	{
57	Project project = FileOwnerQuery.getOwner(fileObject);	67	Project project = FileOwnerQuery.getOwner(fileObject);
58	ServiceLocatorStrategy serviceLocatorStrategy = (serviceLocator == null) ? null :	68	ServiceLocatorStrategy serviceLocatorStrategy = (serviceLocator == null) ? null :
59	ServiceLocatorStrategy.create(project, fileObject, serviceLocator);	69	ServiceLocatorStrategy.create(project, fileObject, serviceLocator);
Lines 73-81 Link Here
73	generateLookupMethod(fileObject, className, jndiName, serviceLocatorStrategy);	83	generateLookupMethod(fileObject, className, jndiName, serviceLocatorStrategy);
74	}	84	}
75	}	85	}
		86
		87	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		88	J2eeModule module = j2eeModuleProvider.getJ2eeModule();
		89	if (isWebModule(module)) {
		90	bindDataSourceReference(j2eeModuleProvider, datasourceReferenceName, datasource);
		91	}
		92	else if (isEjbModule(module)) {
		93	bindDataSourceReferenceForEjb(j2eeModuleProvider, datasourceReferenceName, datasource, fileObject, elementHandle);
		94	}
		95	}
		96
76	if (serviceLocator != null) {	97	if (serviceLocator != null) {
77	erc.setServiceLocatorName(serviceLocator);	98	erc.setServiceLocatorName(serviceLocator);
78	}	99	}
		100	}
		101
		102	private void bindDataSourceReference(J2eeModuleProvider j2eeModuleProvider, String dsRefName, Datasource datasource)
		103	throws ConfigurationException {
		104
		105	String dsJndiName = datasource.getJndiName();
		106	j2eeModuleProvider.getConfigSupport().bindDatasourceReference(dsRefName, dsJndiName);
		107	}
		108
		109	private void bindDataSourceReferenceForEjb(J2eeModuleProvider j2eeModuleProvider, String dsRefName, Datasource datasource,
		110	FileObject fileObject, ElementHandle<TypeElement> elementHandle) throws ConfigurationException {
		111
		112	String dsJndiName = datasource.getJndiName();
		113
		114	EjbJar dd = null;
		115	try {
		116	dd = findDDRoot(fileObject);
		117	}
		118	catch (IOException ioe) {
		119	// TODO
		120	}
		121	if (dd == null) {
		122	return;
		123	}
		124
		125	EnterpriseBeans beans = dd.getEnterpriseBeans();
		126	if (beans == null) {
		127	return;
		128	}
		129
		130	String ejbName = getEjbName(beans, elementHandle.getQualifiedName());
		131	if (ejbName == null) {
		132	return;
		133	}
		134
		135	String ejbType = getEjbType(beans, elementHandle.getQualifiedName());
		136	if (ejbType == null) {
		137	return;
		138	}
		139
		140	j2eeModuleProvider.getConfigSupport().bindDatasourceReferenceForEjb(ejbName, ejbType, dsRefName, dsJndiName);
		141	}
		142
		143	private EjbJar findDDRoot(FileObject fileObject) throws IOException {
		144	org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbJar = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJar(fileObject);
		145	assert ejbJar != null;
		146	return DDProvider.getDefault().getMergedDDRoot(ejbJar.getMetadataUnit());
		147	}
		148
		149	private boolean isWebModule(J2eeModule module) {
		150	return module.getModuleType().equals(J2eeModule.WAR);
		151	}
		152
		153	private boolean isEjbModule(J2eeModule module) {
		154	return module.getModuleType().equals(J2eeModule.EJB);
		155	}
		156
		157	private String getEjbName(EnterpriseBeans beans, String className) {
		158	Ejb ejb = (Ejb) beans.findBeanByName(EnterpriseBeans.SESSION, Ejb.EJB_CLASS, className);
		159	if (ejb == null) {
		160	ejb = (Ejb) beans.findBeanByName(EnterpriseBeans.ENTITY, Ejb.EJB_CLASS, className);
		161	}
		162	if (ejb == null) {
		163	ejb = (Ejb) beans.findBeanByName(EnterpriseBeans.MESSAGE_DRIVEN, Ejb.EJB_CLASS, className);
164	}
165
166	return ejb.getEjbName();
167	}
168
169	private String getEjbType(EnterpriseBeans beans, String className) {
170	String type = null;
171
172	if (beans.findBeanByName(EnterpriseBeans.SESSION, Ejb.EJB_CLASS, className) != null) {
173	type = EnterpriseBeans.SESSION;
174	}
175	else
176	if (beans.findBeanByName(EnterpriseBeans.ENTITY, Ejb.EJB_CLASS, className) != null) {
177	type = EnterpriseBeans.ENTITY;
178	}
179	else
180	if (beans.findBeanByName(EnterpriseBeans.MESSAGE_DRIVEN, Ejb.EJB_CLASS, className) != null) {
181	type = EnterpriseBeans.MESSAGE_DRIVEN;
182	}
183
184	return type;
79	}	185	}
80		186
81	private String generateJNDILookup(String jndiName, EnterpriseReferenceContainer enterpriseReferenceContainer,	187	private String generateJNDILookup(String jndiName, EnterpriseReferenceContainer enterpriseReferenceContainer,




                    ErrorManager.getDefault().notify(ex);
                }
            }

if (System.getProperties().getProperty("resource-api-redesign") != null) {
    try {
        Project project = FileOwnerQuery.getOwner(pkg);
        J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class);
        if (isQueue) {
            j2eeModuleProvider.getConfigSupport().bindMdbToMessageDestination(ejbName, "MyQueue", org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type.QUEUE);
        }
        else {
            j2eeModuleProvider.getConfigSupport().bindMdbToMessageDestination(ejbName, "MyTopic", org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type.TOPIC);
        }
    }
    catch (ConfigurationException ce) {
        // TODO inform user
    }
}        
            
        }
        return resultFileObject;
    }

Lines 13-25 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageEJBWizard.java (-1 / +25 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.ejbcore.ejb.wizard.mdb;	20	package org.netbeans.modules.j2ee.ejbcore.ejb.wizard.mdb;
21		21
22	import java.io.IOException;	22	import java.io.IOException;
		23	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
23	import org.netbeans.modules.j2ee.ejbcore.api.codegeneration.MessageGenerator;	24	import org.netbeans.modules.j2ee.ejbcore.api.codegeneration.MessageGenerator;
24	import java.util.Collections;	25	import java.util.Collections;
25	import java.util.NoSuchElementException;	26	import java.util.NoSuchElementException;
Lines 34-39 Link Here
34	import org.netbeans.spi.project.ui.templates.support.Templates;	35	import org.netbeans.spi.project.ui.templates.support.Templates;
35	import org.openide.filesystems.FileObject;	36	import org.openide.filesystems.FileObject;
36	import org.netbeans.modules.j2ee.common.Util;	37	import org.netbeans.modules.j2ee.common.Util;
		38	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
		39	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
37	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;	40	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
38	import org.netbeans.modules.j2ee.ejbcore.Utils;	41	import org.netbeans.modules.j2ee.ejbcore.Utils;
39	import org.openide.WizardDescriptor;	42	import org.openide.WizardDescriptor;
Lines 73-78 Link Here
73	Util.hideLabelAndLabelFor(jComponent, NbBundle.getMessage(MessageEJBWizard.class, "LBL_JavaTargetChooserPanelGUI_CreatedFile_Label"));	76	Util.hideLabelAndLabelFor(jComponent, NbBundle.getMessage(MessageEJBWizard.class, "LBL_JavaTargetChooserPanelGUI_CreatedFile_Label"));
74	panels = new WizardDescriptor.Panel[] {wizardPanel};	77	panels = new WizardDescriptor.Panel[] {wizardPanel};
75	Utils.mergeSteps(wiz, panels, SESSION_STEPS);	78	Utils.mergeSteps(wiz, panels, SESSION_STEPS);
		79
		80	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		81	J2eeModuleProvider provider = project.getLookup().lookup(J2eeModuleProvider.class);
		82	try {
		83	Set<MessageDestination> moduleDestinations = provider.getConfigSupport().getMessageDestinations();
		84	for (MessageDestination md : moduleDestinations) {
		85	System.out.println(md.getName() + " ~ " + md.getType());
		86	}
		87	if (provider.getConfigSupport().supportsCreateMessageDestination()) {
		88	MessageDestination dest = provider.getConfigSupport().createMessageDestination("TestMsgDest01", MessageDestination.Type.TOPIC);
		89	}
		90	Set<MessageDestination> serverDestinations = provider.getConfigSupport().getServerMessageDestinations();
		91	for (MessageDestination md : serverDestinations) {
		92	System.out.println(md.getName() + " ~ " + md.getType());
		93	}
		94	}
		95	catch (ConfigurationException ce) {
		96
		97	}
		98	}
		99
76	}	100	}
77		101
78	public Set instantiate() throws IOException {	102	public Set instantiate() throws IOException {

Lines 26-35 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entres/MessageDestinationPanel.java (+56 lines)
26	import java.beans.PropertyChangeListener;	26	import java.beans.PropertyChangeListener;
27	import java.io.IOException;	27	import java.io.IOException;
28	import java.util.Iterator;	28	import java.util.Iterator;
		29	import java.util.LinkedList;
29	import java.util.List;	30	import java.util.List;
30	import javax.swing.DefaultComboBoxModel;	31	import javax.swing.DefaultComboBoxModel;
31	import javax.swing.JButton;	32	import javax.swing.JButton;
32	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;	33	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
		34	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
		35	import org.netbeans.modules.j2ee.dd.api.ejb.MessageDriven;
		36	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
		37	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
		38	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
33	import org.openide.DialogDisplayer;	39	import org.openide.DialogDisplayer;
34	import org.openide.NotifyDescriptor;	40	import org.openide.NotifyDescriptor;
35		41
Lines 45-50 Link Here
45	private DefaultComboBoxModel destinationModel;	51	private DefaultComboBoxModel destinationModel;
46	private final ServiceLocatorStrategyPanel slPanel;	52	private final ServiceLocatorStrategyPanel slPanel;
47		53
		54	private MessageDestination dest = null;
		55
		56	public MessageDestination getDestination() {
		57	return dest;
		58	}
		59
48	/** Creates new form MessageDestinationPanel */	60	/** Creates new form MessageDestinationPanel */
49	public MessageDestinationPanel(final JButton okButton, String lastLocator) {	61	public MessageDestinationPanel(final JButton okButton, String lastLocator) {
50	initComponents();	62	initComponents();
Lines 103-108 Link Here
103	}	115	}
104		116
105	private void populateEjbDestinationCombo(Object selectedItem) throws IOException {	117	private void populateEjbDestinationCombo(Object selectedItem) throws IOException {
		118
		119	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		120	List<String> names = getMdbNames(selectedItem);
		121	for (String name : names) {
		122	System.out.println(name);
		123	}
		124	if (names.size() > 0) {
		125	String mdbName = names.get(0);
		126	J2eeModuleProvider j2eeModuleProvider = controller.getJ2eeModuleProvider(selectedItem);
		127	try {
		128	String destName = j2eeModuleProvider.getConfigSupport().findMessageDestinationName(mdbName);
		129	if (destName != null) {
		130	dest = j2eeModuleProvider.getConfigSupport().findMessageDestination(destName);
		131	}
		132	}
		133	catch (ConfigurationException ce) {}
		134	}
		135	}
		136
106	EjbJar ejbJar = controller.getEjbJar(selectedItem);	137	EjbJar ejbJar = controller.getEjbJar(selectedItem);
107	if (ejbJar != null) {	138	if (ejbJar != null) {
108	List list = controller.extractEjbProjectDestinations(ejbJar, selectedItem);	139	List list = controller.extractEjbProjectDestinations(ejbJar, selectedItem);
Lines 112-117 Link Here
112	}	143	}
113	}	144	}
114	}	145	}
		146
		147	private List<String> getMdbNames(Object projectItem) throws IOException {
		148
		149	List<String> names = new LinkedList<String>();
		150
		151	EjbJar ejbJar = controller.getEjbJar(projectItem);
		152	if (ejbJar == null) {
		153	return names;
		154	}
		155
		156	EnterpriseBeans eb = ejbJar.getEnterpriseBeans();
		157	if (eb == null) {
		158	return names;
		159	}
		160
		161	MessageDriven[] mdbs = eb.getMessageDriven();
		162	for (MessageDriven mdb : mdbs) {
		163	if (mdb.getEjbName() != null) {
		164	names.add(mdb.getEjbName());
		165	}
		166	}
		167
		168	return names;
		169	}
		170
115	/** This method is called from within the constructor to	171	/** This method is called from within the constructor to
116	* initialize the form.	172	* initialize the form.
117	* WARNING: Do NOT modify this code. The content of this method is	173	* WARNING: Do NOT modify this code. The content of this method is

Lines 31-36 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entres/MessageDestinationPanelController.java (+6 lines)
31	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;	31	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
32	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;	32	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
33	import org.netbeans.modules.j2ee.dd.api.ejb.MessageDriven;	33	import org.netbeans.modules.j2ee.dd.api.ejb.MessageDriven;
		34	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
34	import org.openide.ErrorManager;	35	import org.openide.ErrorManager;
35		36
36	/**	37	/**
Lines 49-54 Link Here
49	}	50	}
50	}	51	}
51	return projectViews.toArray(new ProjectView[projectViews.size()]);	52	return projectViews.toArray(new ProjectView[projectViews.size()]);
		53	}
		54
		55	public J2eeModuleProvider getJ2eeModuleProvider(Object item) {
		56	Project project = ((ProjectView) item).getProject();
		57	return project.getLookup().lookup(J2eeModuleProvider.class);
52	}	58	}
53		59
54	public EjbJar getEjbJar(Object item) throws IOException {	60	public EjbJar getEjbJar(Object item) throws IOException {

Lines 34-41 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entres/SendJMSMessageAction.java (-1 / +12 lines)
34	import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;	34	import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
35	import org.netbeans.modules.j2ee.common.Util;	35	import org.netbeans.modules.j2ee.common.Util;
36	import org.netbeans.modules.j2ee.common.source.AbstractTask;	36	import org.netbeans.modules.j2ee.common.source.AbstractTask;
		37	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
37	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;	38	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
		39	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
38	import org.netbeans.modules.j2ee.dd.api.web.WebApp;	40	import org.netbeans.modules.j2ee.dd.api.web.WebApp;
		41	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
		42	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
39	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;	43	import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
40	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;	44	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
41	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;	45	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
Lines 111-118 Link Here
111	ServiceLocatorStrategy.create(enterpriseProject, srcFile,	115	ServiceLocatorStrategy.create(enterpriseProject, srcFile,
112	serviceLocator);	116	serviceLocator);
113	}	117	}
		118
114	SendJMSGenerator generator = new SendJMSGenerator(destination);	119	SendJMSGenerator generator = new SendJMSGenerator(destination);
115	generator.genMethods(erc, beanClass.getQualifiedName().toString(), srcFile, serviceLocatorStrategy);	120	generator.genMethods(
		121	erc,
		122	beanClass.getQualifiedName().toString(),
		123	srcFile,
		124	serviceLocatorStrategy,
		125	enterpriseProject.getLookup().lookup(J2eeModuleProvider.class),
		126	panel.getDestination());
116	if (serviceLocator != null) {	127	if (serviceLocator != null) {
117	erc.setServiceLocatorName(serviceLocator);	128	erc.setServiceLocatorName(serviceLocator);
118	}	129	}

Lines 13-19 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entres/UseDatabaseAction.java (-8 / +125 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 22-27 Link Here
22	import java.beans.PropertyChangeEvent;	22	import java.beans.PropertyChangeEvent;
23	import java.beans.PropertyChangeListener;	23	import java.beans.PropertyChangeListener;
24	import java.io.IOException;	24	import java.io.IOException;
		25	import java.util.HashMap;
		26	import java.util.Map;
25	import javax.lang.model.element.ElementKind;	27	import javax.lang.model.element.ElementKind;
26	import javax.lang.model.element.TypeElement;	28	import javax.lang.model.element.TypeElement;
27	import javax.swing.Action;	29	import javax.swing.Action;
Lines 33-41 Link Here
33	import org.netbeans.api.project.Project;	35	import org.netbeans.api.project.Project;
34	import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;	36	import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer;
35	import org.netbeans.modules.j2ee.common.source.AbstractTask;	37	import org.netbeans.modules.j2ee.common.source.AbstractTask;
		38	import org.netbeans.modules.j2ee.dd.api.common.ResourceRef;
		39	import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
		40	import org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans;
		41	import org.netbeans.modules.j2ee.dd.api.ejb.Ejb;
		42	import org.netbeans.modules.j2ee.dd.api.web.WebApp;
		43	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
		44	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
		45	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
36	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;	46	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider;
37	import org.netbeans.modules.j2ee.ejbcore._RetoucheUtil;	47	import org.netbeans.modules.j2ee.ejbcore._RetoucheUtil;
38	import org.netbeans.modules.j2ee.ejbcore.action.UseDatabaseGenerator;	48	import org.netbeans.modules.j2ee.ejbcore.action.UseDatabaseGenerator;
		49	import org.netbeans.modules.web.api.webmodule.WebModule;
39	import org.openide.DialogDescriptor;	50	import org.openide.DialogDescriptor;
40	import org.openide.DialogDisplayer;	51	import org.openide.DialogDisplayer;
41	import org.openide.ErrorManager;	52	import org.openide.ErrorManager;
Lines 97-116 Link Here
97	}	108	}
98	});	109	});
99	selectDatabasePanel.checkDatasource();	110	selectDatabasePanel.checkDatasource();
		111
		112	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		113	try {
		114	Map<String, Datasource> refs = getDataSourceReferences(j2eeModuleProvider, fileObject);
		115	}
		116	catch (ConfigurationException ce) {
		117	//TODO notify user
		118	}
		119	}
		120	String refName = "NameOfSelectedReference";
		121
100	Object option = DialogDisplayer.getDefault().notify(dialogDescriptor);	122	Object option = DialogDisplayer.getDefault().notify(dialogDescriptor);
101	if (option == NotifyDescriptor.OK_OPTION) {	123	if (option == NotifyDescriptor.OK_OPTION) {
		124
102	UseDatabaseGenerator generator = new UseDatabaseGenerator();	125	UseDatabaseGenerator generator = new UseDatabaseGenerator();
103	generator.generate(	126	try {
104	fileObject,	127	generator.generate(
105	elementHandle,	128	fileObject,
106	selectDatabasePanel.getDatasource(),	129	elementHandle,
107	selectDatabasePanel.createServerResources(),	130	j2eeModuleProvider,
108	selectDatabasePanel.getServiceLocator()	131	refName,
109	);	132	selectDatabasePanel.getDatasource(),
		133	selectDatabasePanel.createServerResources(),
		134	selectDatabasePanel.getServiceLocator()
		135	);
		136	}
		137	catch (ConfigurationException ex) {
		138	//TODO
		139	}
110	}	140	}
111	return false;	141	return false;
112	}	142	}
		143
		144	private Map<String, Datasource> getDataSourceReferences(J2eeModuleProvider j2eeModuleProvider, FileObject fileObject)
		145	throws ConfigurationException {
		146
		147	HashMap<String, Datasource> references = new HashMap<String, Datasource>();
		148
		149	if (j2eeModuleProvider.getJ2eeModule().getModuleType().equals(J2eeModule.EJB)) {
		150	EjbJar dd = findEjbDDRoot(fileObject);
		151	if (dd == null) {
		152	return references;
		153	}
		154	EnterpriseBeans beans = dd.getEnterpriseBeans();
		155	if (beans == null) {
		156	return references;
		157	}
		158
		159	Ejb[] ejbs = beans.getEjbs();
		160	for (Ejb ejb : ejbs) {
		161	ResourceRef[] refs = ejb.getResourceRef();
		162	for (ResourceRef ref : refs) {
		163	String refName = ref.getResRefName();
		164	Datasource ds = findDatasourceForReferenceForEjb(j2eeModuleProvider, refName, ejb.getEjbName());
		165	if (ds != null) {
		166	references.put(refName, ds);
		167	System.out.println(refName + " ~ " + ds.getUrl());
		168	}
		169	}
		170	}
		171	}
		172	else
		173	if (j2eeModuleProvider.getJ2eeModule().getModuleType().equals(J2eeModule.WAR)) {
		174	WebApp dd = findWebDDRoot(fileObject);
		175	if (dd == null) {
		176	return references;
		177	}
		178	ResourceRef[] refs = dd.getResourceRef();
		179	for (ResourceRef ref : refs) {
		180	String refName = ref.getResRefName();
		181	Datasource ds = findDatasourceForReference(j2eeModuleProvider, refName);
		182	if (ds != null) {
		183	references.put(refName, ds);
		184	System.out.println(refName + " ~ " + ds.getUrl());
		185	}
		186	}
		187	}
		188
		189	return references;
		190	}
		191
		192	private Datasource findDatasourceForReference(J2eeModuleProvider j2eeModuleProvider, String referenceName) throws ConfigurationException {
		193	String jndiName = j2eeModuleProvider.getConfigSupport().findDatasourceJndiName(referenceName);
		194	if (jndiName == null) {
		195	return null;
		196	}
		197	return j2eeModuleProvider.getConfigSupport().findDatasource(jndiName);
		198	}
		199
		200	public Datasource findDatasourceForReferenceForEjb(J2eeModuleProvider j2eeModuleProvider, String referenceName, String ejbName) throws ConfigurationException {
		201	String jndiName = j2eeModuleProvider.getConfigSupport().findDatasourceJndiNameForEjb(ejbName, referenceName);
		202	if (jndiName == null) {
		203	return null;
		204	}
		205	return j2eeModuleProvider.getConfigSupport().findDatasource(jndiName);
		206	}
113		207
		208	private EjbJar findEjbDDRoot(FileObject fileObject) throws ConfigurationException {
		209	org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbJar = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJar(fileObject);
		210	assert ejbJar != null;
		211	try {
		212	return org.netbeans.modules.j2ee.dd.api.ejb.DDProvider.getDefault().getMergedDDRoot(ejbJar.getMetadataUnit());
		213	}
		214	catch (IOException ioe) {
		215	String msg = NbBundle.getMessage(UseDatabaseAction.class, "ERR_CannotReadEjbDD");
		216	throw new ConfigurationException(msg, ioe);
		217	}
		218	}
		219
		220	private WebApp findWebDDRoot(FileObject fileObject) throws ConfigurationException {
		221	WebModule mod = WebModule.getWebModule(fileObject);
		222	try {
		223	return org.netbeans.modules.j2ee.dd.api.web.DDProvider.getDefault().getMergedDDRoot(mod);
		224	}
		225	catch (IOException ioe) {
		226	String msg = NbBundle.getMessage(UseDatabaseAction.class, "ERR_CannotReadWebDD");
		227	throw new ConfigurationException(msg, ioe);
		228	}
		229	}
		230
114	protected boolean enable(Node[] nodes) {	231	protected boolean enable(Node[] nodes) {
115	if (nodes == null \|\| nodes.length != 1) {	232	if (nodes == null \|\| nodes.length != 1) {
116	return false;	233	return false;

Return to bug 93815

Lines 259-263 Link Here

(-)serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/config/JbossDataSourceRefModifier.java (+40 lines)
259	}	259	}
260		260
261	}	261	}
		262
		263	/**
		264	* Add a reference to the given resource to the message-driven bean if it does not exist yet.
		265	*
		266	* @param modifiedJboss Jboss graph instance being modified
		267	* @param resRefName resource reference name
		268	* @param mdbName the MDB (ejb-name) which might need to add resource reference specified by resRefName
		269	* @param jndiName JNDI name of the resource
		270	*/
		271	static void modifyMsgDrv(Jboss modifiedJboss, String resRefName, String mdbName, String jndiName) {
		272
		273	if (modifiedJboss.getEnterpriseBeans() == null)
		274	modifiedJboss.setEnterpriseBeans(new EnterpriseBeans());
		275
		276	addMsgDrvResReference(modifiedJboss, resRefName, mdbName, jndiName);
		277	}
		278
		279	private static void addMsgDrvResReference(Jboss modifiedJboss, String resRefName, String mdbName, String jndiName) {
		280
		281	EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();
		282
		283	for (MessageDriven mdb : eb.getMessageDriven()) {
		284	String ejbName = mdb.getEjbName();
		285	if (mdbName.equals(ejbName)) { // msgdrv found -> check whether it has the resource-ref
		286	ResourceRef[] resourceRefs = mdb.getResourceRef();
		287	int j = 0;
		288	for ( ; j < resourceRefs.length; j++) {
		289	String rrn = resourceRefs[j].getResRefName();
		290	if (resRefName.equals(rrn))
		291	return; // resource-ref found
		292	}
		293	if (j == resourceRefs.length) {// resource-ref not found
		294	ResourceRef newRR = new ResourceRef();
		295	newRR.setResRefName(resRefName);
		296	newRR.setJndiName(jndiName);
		297	mdb.addResourceRef(newRR);
		298	}
		299	}
		300	}
		301	}
262		302
263	}	303	}

Lines 612-617 Link Here

(-)tomcatint/tomcat5/src/org/netbeans/modules/tomcat5/config/TomcatModuleConfiguration.java (+18 lines)
612	else if (contextPath.indexOf("//")>=0) correct=false; //NOI18N	612	else if (contextPath.indexOf("//")>=0) correct=false; //NOI18N
613	return correct;	613	return correct;
614	}	614	}
		615
		616	public void bindDatasourceReference(String referenceName, String jndiName) throws ConfigurationException {
		617	// TODO implement
		618	}
		619
		620	public void bindDatasourceReferenceForEjb(String ejbName, String ejbType, String referenceName, String jndiName) throws ConfigurationException {
		621	// TODO implement
		622	}
		623
		624	public String findDatasourceJndiName(String referenceName) throws ConfigurationException {
		625	// TODO implement
		626	return null;
		627	}
		628
		629	public String findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException {
		630	// TODO implement
		631	return null;
		632	}
615		633
616	// private helper interface -----------------------------------------------	634	// private helper interface -----------------------------------------------
617		635

Lines 86-91 Link Here

(-)j2eeserver/apichanges.xml (+18 lines)
86	<!-- ACTUAL CHANGES BEGIN HERE: -->	86	<!-- ACTUAL CHANGES BEGIN HERE: -->
87		87
88	<changes>	88	<changes>
		89	<change id="ResourceApiRedesign">
		90	<api name="j2eeserver"/>
		91	<summary>
		92	Adding an API for working with data sources, message-driven beans and JMS messages
		93	</summary>
		94	<version major="1" minor="25"/>
		95	<date day="05" month="4" year="2007"/>
		96	<author login="lkotouc"/>
		97	<compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="yes"/>
		98	<description>
		99	<p>
		100	API for working with data sources, message-driven beans and JMS messages.
		101	</p>
		102	</description>
		103	<class package="org.netbeans.modules.j2ee.deployment.plugins.spi" name="JDBCDriverDeployer"/>
		104	<class package="org.netbeans.modules.j2ee.deployment.plugins.spi" name="OptionalDeploymentManagerFactory"/>
		105	<issue number="89439"/>
		106	</change>
89	<change id="jdbcDriverDeployment">	107	<change id="jdbcDriverDeployment">
90	<api name="j2eeserver"/>	108	<api name="j2eeserver"/>
91	<summary>	109	<summary>

Added Link Here

(-)j2eeserver/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 name
48	*
49	* @return the name
50	*/
51	public String getName();
52
53	/**
54	* Returns the type
55	*
56	* @return the type
57	*/
58	public Type getType();
59	}

Lines 71-74 Link Here

(-)j2eeserver/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 reference name 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 referenceName, String jndiName) throws ConfigurationException;
		86
		87	/**
		88	* Binds the data source reference name 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 ejbName EJB name
		92	* @param ejbType EJB type - the possible values are
		93	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.SESSION,
		94	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.ENTITY and
		95	* org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans.MESSAGE_DRIVEN
		96	* @param referenceName name used to identify the data source
		97	* @param jndiName JNDI name of the data source
		98	*
		99	* @throws ConfigurationException if there is some problem with data source configuration
		100	*
		101	* @since 1.25
		102	*/
		103	public void bindDatasourceReferenceForEjb(String ejbName, String ejbType,
		104	String referenceName, String jndiName) 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 findDatasourceJndiName(String referenceName) 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 ejbName EJB name
		122	* @param referenceName reference 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 findDatasourceJndiNameForEjb(String ejbName, String referenceName) throws ConfigurationException;
74	}	130	}

Added Link Here

(-)serverplugins/jboss4/src/org/netbeans/modules/j2ee/jboss4/resources/jboss-service_4_0.dtd (+287 lines)
1	<?xml version='1.0' encoding='UTF-8' ?>
2
3	<!-- A skeleton JBoss MBean service descriptor DTD. This cannot be used in
4	general to validate a jboss-service.xml descriptor due to the fact that the
5	'attribute' element allows ANY content.
6
7	$Id: jboss-service_4_0.dtd,v 1.1.2.1 2007/03/26 09:55:00 lkotouc Exp $
8
9	DOCTYPE server
10	PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
11	"http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd"
12	-->
13	<!-- The server element is the root element.
14	-->
15	<!ELEMENT server (loader-repository? , local-directory* , classpath* , mbean*)>
16
17	<!-- The loader-repository specifies the name of the UnifiedLoaderRepository
18	MBean to use for the ear to provide ear level scoping of classes deployed
19	in the ear. It is a unique JMX ObjectName string. It may also specify
20	an arbitrary configuration by including a loader-repository-config element.
21
22	Examples:
23	<loader-repository>jboss.test:loader=cts-cmp2v1-sar.ear</loader-repository>
24
25	<loader-repository loaderRepositoryClass='dot.com.LoaderRepository'>
26	dot.com:loader=unique-archive-name
27	<loader-repository-config configParserClass='dot.com.LoaderParser'>
28	java2ParentDelegaton=true
29	</loader-repository-config>
30	</loader-repository>
31	-->
32	<!ELEMENT loader-repository (#PCDATA \| loader-repository-config)*>
33
34	<!-- The loaderRepositoryClass attribute gives the classname of the
35	org.jboss.mx.loading.LoaderRepository implementation.
36	-->
37	<!ATTLIST loader-repository loaderRepositoryClass CDATA #IMPLIED>
38
39	<!-- The loader-repository-config element specifies any arbitrary configuration
40	fragment for use in configuring the loader-repository instance. The actual
41	content of this element is specific to the loaderRepositoryClass and the
42	code parsing the element.
43	-->
44	<!ELEMENT loader-repository-config (#PCDATA)>
45
46	<!-- The configParserClass attribute gives the classname of the
47	org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfigParser
48	implementation to use to parse the loader-repository-config content.
49	-->
50	<!ATTLIST loader-repository-config configParserClass CDATA #IMPLIED>
51
52	<!-- A local-directory element specifies that portions of the sar are to be unjard into the data
53	directory of the server configuration.
54	-->
55	<!ELEMENT local-directory EMPTY>
56
57	<!-- The optional path attribute gives the prefix of the sar entries that should be copied
58	into the data directory. If it is not specified the entire sar contents will be placed into
59	the data directory.
60	-->
61	<!ATTLIST local-directory path CDATA #IMPLIED>
62
63	<!-- A classpath element specifies a location which will be included in the services
64	deployment classpath.
65	-->
66	<!ELEMENT classpath EMPTY>
67
68	<!-- The codebase attribute specifies the base URL from which the jars or classes
69	are loaded from. If the codebase is '.' then it is equal to the mbean deployment URL.
70	Otherwise, it is resolved as a path spec relative to the serverHomeURL (e.g., file:/jboss-3.2.0)
71	using the URL ctor URL(serverHomeURL, codebase)
72
73	Examples:
74
75	<classpath codebase='.' archives='util.jar' />
76	<classpath codebase='http://classloader.dot.com' archives='*' />
77	<classpath codebase="lib" archives="*"/>
78	-->
79	<!ATTLIST classpath codebase CDATA #REQUIRED>
80
81	<!-- The archives attribute specifies either the '*' wildcard to indicate all contents of the
82	codebase should be included, or a comma seperated list of the jars to include.
83	-->
84	<!ATTLIST classpath archives CDATA #IMPLIED>
85
86	<!-- The mbean element defines a JBoss MBean service. This includes the
87	mbean class, attributes and dependencies.
88	-->
89	<!ELEMENT mbean (constructor? , xmbean? , attribute* , depends* , depends-list*)>
90
91	<!-- The code attributes gives the fully qualified name of the MBean
92	implementation class.
93	-->
94	<!ATTLIST mbean code CDATA #REQUIRED>
95
96	<!-- The name attribute gives the JMX ObjectName string to use when registering
97	the MBean. This must be a unique and valid JMX name.
98	-->
99	<!ATTLIST mbean name CDATA #REQUIRED>
100
101	<!-- The optional interface attribute gives the full qualified name of the class
102	uses to construct the management interface of the mbean. In absence of it an interface
103	with the name ending by MBean will be looked in the implementation class. When used
104	this interface is defined explicitely.
105	-->
106	<!ATTLIST mbean interface CDATA #IMPLIED>
107
108	<!-- The xmbean-dd attribute defines the path to the JBoss XMBean descriptor. This
109	is an xml document conforming to:
110
111	<!DOCTYPE mbean PUBLIC
112	"-//JBoss//DTD JBOSS XMBEAN 1.0//EN"
113	"http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_0.dtd">
114
115	If the descriptor is embedded via a nested xmbean element, the xmbean-dd attribute
116	must be given as an empty string.
117
118	Example:
119	<mbean code="org.jboss.test.jmx.xmbean.User"
120	name="jboss.test:service=xmbean-user"
121	xmbean-dd="META-INF/org/jboss/test/jmx/xmbean/User.xml" />
122	-->
123	<!ATTLIST mbean xmbean-dd CDATA #IMPLIED>
124
125	<!-- The optional xmbean-code attribute specifies the ModelMBean implementation class
126	to use. This defaults to org.jboss.mx.modelmbean.XMBean.
127	-->
128	<!ATTLIST mbean xmbean-code CDATA #IMPLIED>
129
130	<!-- The xmbean element specifies a nested JBoss XMBean descriptor fragment. Its
131	supported content model is the same as the mbean element of the jboss_xmbean_1_0.dtd
132
133	Example:
134	<mbean code="org.jboss.test.jmx.xmbean.User"
135	name="jboss.test:service=xmbean-user"
136	xmbean-dd="">
137	<xmbean>
138	...
139	</xmbean>
140	</mbean>
141	-->
142	<!ELEMENT xmbean ANY>
143
144	<!-- The constructor element defines a non-default constructor to use when
145	instantiating the mbean.
146	-->
147	<!ELEMENT constructor (arg*)>
148
149	<!-- The arg element specify the constructor arguments in the order of the
150	ctor signature. Each arg has a type and value attribute.
151	-->
152	<!ELEMENT arg EMPTY>
153
154	<!-- The type attribute gives the type of the argument as defined in the
155	ctor signature. If not defined java.lang.String is assumed.
156	-->
157	<!ATTLIST arg type CDATA #IMPLIED>
158
159	<!-- The value attribute provides the string representation of the ctor
160	argument. It is converted from a string to type using Java PropertyEditor or a
161	ctor taking a single string as its argument.
162	-->
163	<!ATTLIST arg value CDATA #REQUIRED>
164
165	<!-- The attribute element specifies the initial value for a management attribute of
166	the enclosing mbean. Typically the value of the attribute element is the string
167	representation of the attribute, but it can be an arbitrary xml fragment that is
168	parsed by the mbean.
169	-->
170	<!ELEMENT attribute ANY>
171
172	<!-- The required name attribute gives the name of the attribute. This is the
173	name exposed by the mbean to the MBeanServer for the attribute.
174	-->
175	<!ATTLIST attribute name CDATA #REQUIRED>
176
177	<!-- The optional replace attribute indicates whether references of the form ${x}
178	in the attribute element content should be replaced with the corresponding
179	System.getProperty(x) value.
180	-->
181	<!ATTLIST attribute replace (true \| false) 'true'>
182	<!-- The optional trim attribute specifies whether the attribute element content should
183	be trimmed of whitespace.
184	-->
185	<!ATTLIST attribute trim (true \| false) 'true'>
186
187	<!-- The attributeClass attribute specifies that type of object that
188	should be created. This is needed for non-concreate attribute types
189	like interfaces and abstract classes.
190	-->
191	<!ATTLIST attribute attributeClass CDATA #IMPLIED>
192
193	<!-- The serialDataType defines the how the content of the attribute
194	element is interpretted by the ServiceConfigurator. The possible values
195	are:
196	+ text: the content is treated as the string representation of the
197	attribute value. It will be mapped to the attribute using the PropertyEditor
198	registered for the attribute type.
199	+ javaBean: the content is a collection of property elements.
200	+ jbxb: the content is an xml element from a namespace with an associated
201	xml schema that can be unmarshalled using the JBossXB framework.
202	-->
203	<!ATTLIST attribute serialDataType (text \| javaBean \| jbxb) 'text'>
204
205	<!-- The property element is used to describe the JavaBean properties of
206	an attribute when the attribute element serialDataType is javaBean.
207	-->
208	<!ELEMENT property (#PCDATA)>
209	<!-- The required name attribute gives the name of the property. This is the
210	name of a JavaBean property for the attribute type.
211	-->
212	<!ATTLIST property name CDATA #REQUIRED>
213
214	<!-- The depends element specifies a JMX ObjectName string for an mbean
215	on which the enclosing mbean depends.
216
217	Example:
218	<mbean code="myBean" name="domain:name=x">
219	<depends optional-attribute-name="yName">domain:name=y</depends>
220	</mbean>
221
222	<mbean code="myBean" name="domain:name=x">
223	<depends optional-attribute-name="anonName">
224	<mbean code="nestedBean" name="domain:name=x.y">
225	...
226	</mbean>
227	</depends>
228	</mbean>
229	-->
230	<!ELEMENT depends (#PCDATA \| mbean)*>
231
232	<!-- The optional-attribute-name attribute specifies the attribute name
233	which should be populated with the JMX ObjectName of the depends element.
234	This allows an mbean to have access to the name of the mbean on which
235	it depends.
236	-->
237	<!ATTLIST depends optional-attribute-name CDATA #IMPLIED>
238
239	<!-- The proxy-type attribute specifies the interface name
240	that should be exposed on an MBeanProxy pointing at the dependent
241	MBean, specified by the JMX ObjectName.
242
243	The special value proxy-type="attribute" will use the
244	class declared in the MBeanAttributeInfo as the interface
245	for the MBeanProxy.
246
247	Example:
248	<mbean code="org.jboss.example.Helper" name="domain:name=helper"/>
249
250	<mbean code="myBean" name="domain:name=x">
251	<depends optional-attribute-name="Helper"
252	proxy-type="org.jboss.example.HelperMBean"
253	>domain:name=helper</depends>
254	</mbean>
255
256	<mbean code="myBean" name="domain:name=x">
257	<depends optional-attribute-name="Helper"
258	proxy-type="attribute"
259	>domain:name=helper</depends>
260	</mbean>
261	-->
262	<!ATTLIST depends proxy-type CDATA #IMPLIED>
263
264	<!-- The depends-list element specifies a series of JMX ObjectName
265	strings of mbeans on which the enclosing mbean depends.
266
267	Example:
268	<mbean code="myBean" name="domain:name=x">
269	<depends-list optional-attribute-name="myObjectNameList">
270	<depends-list-element>domain:name=y</depends-list-element>
271	<depends-list-element>domain:name=z</depends-list-element>
272	</depends-list>
273	</mbean>
274	-->
275	<!ELEMENT depends-list (depends-list-element)+>
276
277	<!-- The optional-attribute-name attribute specifies the attribute name
278	which should be populated with a java.util.List that contains the JMX
279	ObjectName(s) of the depends-list elements. This allows an mbean to have
280	access to the names of the mbeans on which it depends.
281	-->
282	<!ATTLIST depends-list optional-attribute-name CDATA #IMPLIED>
283
284	<!-- The depends-list-element element specifies a JMX ObjectName string
285	for an mbean on which the enclosing mbean depends.
286	-->
287	<!ELEMENT depends-list-element (#PCDATA \| mbean)*>

Lines 210-214 Link Here

(-)serverplugins/sun/appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/ModuleConfigurationImpl.java (+14 lines)
210	new UnsupportedOperationException());	210	new UnsupportedOperationException());
211	}	211	}
212		212
		213	public void bindDatasourceReference(String jndiName, String dsJNDIName) throws ConfigurationException {
		214	}
		215
		216	public void bindDatasourceReferenceForEjb(String ejbName, String ejbType, String jndiName, String dsJNDIName) throws ConfigurationException {
		217	}
		218
		219	public String findDatasourceJndiName(String jndiName) throws ConfigurationException {
		220	return null;
		221	}
		222
		223	public String findDatasourceJndiNameForEjb(String ejbName, String jndiName) throws ConfigurationException {
		224	return null;
		225	}
		226
213	}	227	}
214		228

Lines 176-182 Link Here

(-)j2ee/ejbcore/nbproject/project.xml (-1 / +9 lines)
176	<compile-dependency/>	176	<compile-dependency/>
177	<run-dependency>	177	<run-dependency>
178	<release-version>4</release-version>	178	<release-version>4</release-version>
179	<specification-version>1.23</specification-version>	179	<specification-version>1.25</specification-version>
180	</run-dependency>	180	</run-dependency>
181	</dependency>	181	</dependency>
182	<dependency>	182	<dependency>
Lines 366-371 Link Here
366	<compile-dependency/>	366	<compile-dependency/>
367	<run-dependency>	367	<run-dependency>
368	<specification-version>6.2</specification-version>	368	<specification-version>6.2</specification-version>
		369	</run-dependency>
		370	</dependency>
		371	<dependency>
		372	<code-name-base>org.netbeans.api.web.webmodule</code-name-base>
		373	<build-prerequisite/>
		374	<compile-dependency/>
		375	<run-dependency>
		376	<specification-version>1.8</specification-version>
369	</run-dependency>	377	</run-dependency>
370	</dependency>	378	</dependency>
371	</module-dependencies>	379	</module-dependencies>

Lines 106-111 Link Here

(-)j2ee/ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java (+17 lines)
106	ErrorManager.getDefault().notify(ex);	106	ErrorManager.getDefault().notify(ex);
107	}	107	}
108	}	108	}
		109
		110	if (System.getProperties().getProperty("resource-api-redesign") != null) {
		111	try {
		112	Project project = FileOwnerQuery.getOwner(pkg);
		113	J2eeModuleProvider j2eeModuleProvider = (J2eeModuleProvider) project.getLookup().lookup(J2eeModuleProvider.class);
		114	if (isQueue) {
		115	j2eeModuleProvider.getConfigSupport().bindMdbToMessageDestination(ejbName, "MyQueue", org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type.QUEUE);
		116	}
		117	else {
		118	j2eeModuleProvider.getConfigSupport().bindMdbToMessageDestination(ejbName, "MyTopic", org.netbeans.modules.j2ee.deployment.common.api.MessageDestination.Type.TOPIC);
		119	}
		120	}
		121	catch (ConfigurationException ce) {
		122	// TODO inform user
		123	}
		124	}
		125
109	}	126	}
110	return resultFileObject;	127	return resultFileObject;
111	}	128	}