Attachment #152680 for bug #233481

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 233481
Collapse All | Expand All




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2009-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

import org.openide.filesystems.FileUtil;

/**
 * Utilities.
 * <p/>
 * @author Vince Kraemer
 */
public class Utils {



    /** 
     * Use the server instance id for a project to decide whether the server specific DD/resource
     * file should use the {@code glassfish-} prefix.
     * 
     * @param serverInstanceID
     * @return

Lines 219-224 Link Here

(-)a/glassfish.eecommon/nbproject/project.xml (+7 lines)
219	<test-dependency>	219	<test-dependency>
220	<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>	220	<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
221	</test-dependency>	221	</test-dependency>
		222	<test-dependency>
		223	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
		224	<compile-dependency/>
		225	</test-dependency>
		226	<test-dependency>
		227	<code-name-base>org.netbeans.insane</code-name-base>
		228	</test-dependency>
222	</test-type>	229	</test-type>
223	</test-dependencies>	230	</test-dependencies>
224	<friend-packages>	231	<friend-packages>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.


package org.netbeans.modules.glassfish.eecommon.api.config;

import org.netbeans.modules.glassfish.eecommon.api.*;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;

import java.util.logging.Logger;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.modules.glassfish.eecommon.api.Utils;
import org.netbeans.modules.glassfish.eecommon.api.XmlFileCreator;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
import org.netbeans.modules.glassfish.tooling.utils.OsUtils;
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.openide.util.RequestProcessor;

/**
 * Basic Java EE server configuration API support for V2, V3 and V4 plugins.
 * <p/>
 * @author Peter Williams, Tomas Kraus
 */
public abstract class GlassfishConfiguration implements
        ContextRootConfiguration,
        EjbResourceConfiguration,
        MessageDestinationConfiguration,
        DatasourceConfiguration {

    ////////////////////////////////////////////////////////////////////////////
    // Class attributes                                                       //
    ////////////////////////////////////////////////////////////////////////////

    /** GlassFish Java EE common module Logger. */
    private static final Logger LOGGER = Logger.getLogger("glassfish-eecommon");

    /** GlassFish resource file suffix is {@code .xml}. */
    private static final String RESOURCE_FILES_SUFFIX = ".xml";

   /** List of base file names containing server resources:<ul>
      * <li><i>[0]</i> points to current name used since GlassFich v3.</li>
      * <li><i>[1]</i> points to old name used before GlassFich v3.</li>
      * <ul>*/
    static final String[] RESOURCE_FILES = {
        "glassfish-resources" + RESOURCE_FILES_SUFFIX,
        "sun-resources" + RESOURCE_FILES_SUFFIX
    };

    ////////////////////////////////////////////////////////////////////////////
    // Static methods                                                         //
    ////////////////////////////////////////////////////////////////////////////

    /**
     * Create resource file path fragment for given Java EE module.
     * <i>Internal helper method.</i>
     * <p/>
     * @param module   Java EE module (project).
     * @param fileName Resources file name.
     * @return Resource file path fragment for given Java EE module.
     */
    private static String resourceFilePath(final J2eeModule module,final String fileName) {
        String configDir = JavaEEModule.getConfigDir(module.getType());
        if (configDir == null) {
            throw new IllegalArgumentException("Unknown Java EE module type.");
        }
        return OsUtils.joinPaths(configDir, fileName);
    }

    /**
     * Get existing {@code RESOURCE_FILES} array indexes for provided GlassFish
     * server version.
     * <br/>
     * <i>Internal {@link #getExistingResourceFile(J2eeModule, GlassFishVersion)
     * helper method.</i>
     * <p/>
     * @param version GlassFish server version.
     * @return An array of {@code RESOURCE_FILES} array indexes pointing
     *         to resource files to search for.
     */
    private static int[] versionToResourceFilesIndexes(
            final GlassFishVersion version) {
        // All files for unknown version.
        if (version == null) {
            return new int[]{0,1};
        }
        // glassfish-resources.xml for v4
        if (GlassFishVersion.ge(version, GlassFishVersion.GF_4)) {
            return new int[]{0};
        }
        // glassfish-resources.xml and sun-resources.xml for v3
        if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
            return new int[]{0,1};
        // sun-resources.xml for older
        } else {
            return new int[]{1};
        }
    }

    /**
     * Get new {@code RESOURCE_FILES} array index for provided GlassFish
     * server version.
     * <p/>
     * @param version GlassFish server version.
     * @return An {@code RESOURCE_FILES} array index pointing
     *         to resource file to be created.
     */
    private static int versionToNewResourceFilesIndex(
            final GlassFishVersion version) {
        // glassfish-resources.xml is returned for versions 3.1 and higher
        // or as default for unknown version.
        if (version == null
                || GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
            return 0;
        // sun-resources.xml is returned for versions before 3.1
        } else {
            return 1;
        }
    }

    /**
     * Get existing GlassFish resources file name.
     * GlassFish resources file depends on server version and used storage.
     * GlassFish v3 supports old {@code sun-resources.xml} together with new
     * {@code glassfish-resources.xml}. GlassFish v4 supports only
     * new {@code glassfish-resources.xml} file.
     * Those files can be found in server configuration directory (to be included
     * into target project archive) or in server resources directory (won't be
     * included into target project archive).
     * Search works with following priorities:<ul>
     * <li><i>GlassFish v2:</i> Only {@code sun-resources.xml} is checked.</li>
     * <li><i>GlassFish v3:</i> {@code glassfish-resources.xml} is checked first,
     *                          {@code sun-resources.xml} as fallback.</li>
     * <li><i>GlassFish v4:</i> Only {@code glassfish-resources.xml} is checked.</li>
     * <li><i>Configuration directory</i> is checked first, <i>resources directory</i>
     *        as fallback.</li>
     * </ul>
     * 
     * @param module  Java EE module (project).
     * @param version Resources file names depend on GlassFish server version.
     * @return Existing GlassFish resources file or {@code null} when no resources
     *         file was found.
     */
    public static final File getExistingResourceFile(
            final J2eeModule module, final GlassFishVersion version) {
        // RESOURCE_FILES indexes to search for.
        final int[] indexes = versionToResourceFilesIndexes(version);
        for (int index : indexes) {
            // Check configuration directory first.
            final String name = resourceFilePath(module, RESOURCE_FILES[index]);
            File file = module.getDeploymentConfigurationFile(name);
            if (file != null && file.isFile() && file.canRead()) {
                return file;
            }
            // Check resiources directory as a fallback.
            file = new File(module.getResourceDirectory(), RESOURCE_FILES[index]);
            if (file.isFile() && file.canRead()) {
                return file;
            }
        }
        return null;
    }

    /**
     * Get new GlassFish resources file name for creation.
     * <p/>
     * @param module  Java EE module (project).
     * @param version Resources file names depend on GlassFish server version.
     * @return GlassFish resources file to be created.
     */
    public static final File getNewResourceFile(
            final J2eeModule module, final GlassFishVersion version) {
        final int index = versionToNewResourceFilesIndex(version);
        final String name = resourceFilePath(module, RESOURCE_FILES[index]);
        return module.getDeploymentConfigurationFile(name);
    }

    ////////////////////////////////////////////////////////////////////////////
    // Instance attributes                                                    //
    ////////////////////////////////////////////////////////////////////////////

    protected final J2eeModule module;
    protected final J2eeModuleHelper moduleHelper;
    protected final File primarySunDD;
    protected final File secondarySunDD;
    protected DescriptorListener descriptorListener;
    /** GlassFish server version. */
    protected GlassFishVersion version;
    private ASDDVersion appServerVersion;
    private ASDDVersion minASVersion;
    private ASDDVersion maxASVersion;
    private boolean deferredAppServerChange;
    private final String defaultcr;

    ////////////////////////////////////////////////////////////////////////////
    // Constructors                                                           //
    ////////////////////////////////////////////////////////////////////////////

    /**
     * Creates an instance of Java EE server configuration API support.
     * {@link J2eeModuleHelper} instance is added depending on Java EE module type.
     * <p/>
     * @param module  Java EE module (project).
     * @param version GlassFish server version.
     * @throws ConfigurationException when there is a problem with Java EE server
     *         configuration initialization.
     */
    protected GlassfishConfiguration(
            final J2eeModule module, final GlassFishVersion version
    ) throws ConfigurationException {
        this(module, J2eeModuleHelper.getSunDDModuleHelper(module.getType()), version);
    }

    /**
     * Creates an instance of Java EE server configuration API support with existing
     * {@link J2eeModuleHelper} instance.
     * <p/>
     * @param module       Java EE module (project).
     * @param moduleHelper Already existing {@link J2eeModuleHelper} instance.
     * @param version      GlassFish server version.
     * @throws ConfigurationException when there is a problem with Java EE server
     *         configuration initialization.
     */
    @SuppressWarnings("LeakingThisInConstructor")
    protected GlassfishConfiguration(
            final J2eeModule module, final J2eeModuleHelper moduleHelper,
            final GlassFishVersion version
    ) throws ConfigurationException {
        this.module = module;
        this.moduleHelper = moduleHelper;
        this.version = version;
        if(moduleHelper != null) {
            this.primarySunDD = moduleHelper.getPrimarySunDDFile(module);
            this.secondarySunDD = moduleHelper.getSecondarySunDDFile(module);

        throw new UnsupportedOperationException("JSR-88 configuration not supported.");
    }

    ////////////////////////////////////////////////////////////////////////////
    // Methods                                                                //
    ////////////////////////////////////////////////////////////////////////////

    public void dispose() {
        if(descriptorListener != null) {
            descriptorListener.removeListeners();


        GlassfishConfiguration storedCfg = getConfiguration(primarySunDD);
        if (storedCfg != this) {
            LOGGER.log(Level.INFO, 
                    "Stored DeploymentConfiguration ({0}) instance not the one being disposed of ({1}).",
                    new Object[]{storedCfg, this});
        }

    // Appserver version support
    // ------------------------------------------------------------------------
    private ASDDVersion computeMinASVersion(String j2eeModuleVersion) {
        return moduleHelper.getMinASVersion(
                j2eeModuleVersion, ASDDVersion.SUN_APPSERVER_7_0);
    }

    private ASDDVersion computeMaxASVersion() {

                result = ASDDVersion.SUN_APPSERVER_10_1;
            else
                result = ASDDVersion.SUN_APPSERVER_10_0;
            LOGGER.log(Level.WARNING,
                    NbBundle.getMessage(GlassfishConfiguration.class,
                    "ERR_UnidentifiedTargetServer", result.toString())); // NOI18N
        }
        return result;
    }

                    }
                } catch (IndexOutOfBoundsException ex) {
                    // Can't identify server install folder.
                    LOGGER.log(Level.WARNING, NbBundle.getMessage(
                            GlassfishConfiguration.class, "ERR_NoServerInstallLocation", instance)); // NOI18N
                } catch (NullPointerException ex) {
                    LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
                }
            }
        } else if ("SUNWebserver7".equals(serverType)) {

                    }
                }
            } catch (IOException ex) {
                LOGGER.log(Level.WARNING, ex.getLocalizedMessage(), ex);
                String defaultMessage = " retrieving context-root from sun-web.xml";
                displayError(ex, defaultMessage);
            }
        } else {
            LOGGER.log(Level.WARNING,
                    "GlassfishConfiguration.getContextRoot() invoked on incorrect module type: {0}",
                    module.getType());
        }

                                        }
                                    }
                                } catch (IOException ex) {
                                    LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
                                    String defaultMessage = " trying set context-root in sun-web.xml";
                                    displayError(ex, defaultMessage);
                                } catch (Exception ex) {
                                    LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
                                    String defaultMessage = " trying set context-root in sun-web.xml";
                                    displayError(ex, defaultMessage);
                                }

                                    }
                                }
                            } catch (IOException ex) {
                                LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
                                String defaultMessage = " trying set context-root in sun-web.xml";
                                displayError(ex, defaultMessage);
                            } catch (Exception ex) {
                                LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
                                String defaultMessage = " trying set context-root in sun-web.xml";
                                displayError(ex, defaultMessage);
                            }

                    });
                }
            } else {
                LOGGER.log(Level.WARNING,  // NOI18N
                        "GlassfishConfiguration.setContextRoot() invoked on incorrect module type: {0}",  // NOI18N
                        module.getType());
            }

                return;
            }
        } catch(NumberFormatException ex) {
            LOGGER.log(Level.WARNING, ex.getLocalizedMessage(), ex);
        }

        try {

                return;
            }
        } catch(NumberFormatException ex) {
            LOGGER.log(Level.WARNING, ex.getLocalizedMessage(), ex);
        }

        try {

                    rootDD.write(outputStream);
                }
            } else {
                LOGGER.log(Level.WARNING,
                        "Deployment plan not supported in GlassfishConfiguration.save()");
            }
        } catch(Exception ex) {

        // writing the changed descriptor to disk.
        // !PW FIXME notify user
        // RR = could do handleEventRelatedException(ex) instead
        LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
    }

    protected void handleEventRelatedException(Exception ex) {

        // must trap it here so it doesn't cause trouble upstream.
        // We handle it the same as above for now.
        // !PW FIXME should we notify here, or just log?
        LOGGER.log(Level.INFO, ex.getLocalizedMessage(), ex);
    }

    // ------------------------------------------------------------------------




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

import org.openide.filesystems.FileUtil;

/**
 * Java EE module helper.
 * <p/>
 * @author Peter Williams, Tomas Kraus
 */
public abstract class J2eeModuleHelper {

    /** Web application meta data directory. */
    public static final String WEB_INF = JavaEEModule.WEB_INF;

    /** GlassFish specific meta data file for version since version 3.1. */
    public static final String GF_WEB_XML_V2
            = WEB_INF + File.separatorChar + GlassfishConfiguration.RESOURCE_FILES[0];

    /** GlassFish specific meta data file for version 1, 2 and 3.0. */
    public static final String GF_WEB_XML_V1
            = WEB_INF + File.separatorChar + GlassfishConfiguration.RESOURCE_FILES[1];
    
    /** GlassFish specific meta data file for version 3 and 4. */
    public static final String GF_WEB_XML_V2
            = WEB_INF + File.separatorChar + "glassfish-web.xml";

    private static final Map<Object, J2eeModuleHelper> helperMap;
    private static final Map<Object, J2eeModuleHelper> gfhelperMap;




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.eecommon.api.config;

import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
import javax.enterprise.deploy.shared.ModuleType;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;

// This is J2eeModule.Type rewritten as Enum. I could not modify original class
// because it's API.
/**
 * Java EE module types.
 * <p/>
 * @author Tomas Kraus
 */
public enum JavaEEModule {
    
    ////////////////////////////////////////////////////////////////////////////
    // Enum values                                                            //
    ////////////////////////////////////////////////////////////////////////////

    /** Client application archive. */
    CAR(ModuleType.CAR),
    /** Enterprise application archive */
    EAR(ModuleType.EAR),
    /** Enterprise Java bean archive. */
    EJB(ModuleType.EJB),
    /** Connector archive. */
    RAR(ModuleType.RAR),
    /** Web application archive. */
    WAR(ModuleType.WAR);

    ////////////////////////////////////////////////////////////////////////////
    // Class attributes                                                       //
    ////////////////////////////////////////////////////////////////////////////

    /** GlassFish Java EE common module Logger. */
    private static final Logger LOGGER = Logger.getLogger("glassfish-eecommon");

    /** JavaEEModule version enumeration length. */
    public static final int length = JavaEEModule.values().length;

    /** Name of web application configuration directory. */
    public static final String WEB_INF = "WEB-INF";

    /** Name of java archive manifest directory. */
    public static final String META_INF = "META-INF";

    /** {@link J2eeModule.Type} to {@link JavaEEModule} conversion map. */
    private static final Map<J2eeModule.Type, JavaEEModule> j2eeModuleTypeToValue
            = new HashMap<J2eeModule.Type, JavaEEModule>(2*length);

    // Initialize J2eeModule.Type to JavaEEModule conversion map.
    static {
        j2eeModuleTypeToValue.put(J2eeModule.Type.CAR, CAR);
        j2eeModuleTypeToValue.put(J2eeModule.Type.EAR, EAR);
        j2eeModuleTypeToValue.put(J2eeModule.Type.EJB, EJB);
        j2eeModuleTypeToValue.put(J2eeModule.Type.RAR, RAR);
        j2eeModuleTypeToValue.put(J2eeModule.Type.WAR, WAR);
    }

    ////////////////////////////////////////////////////////////////////////////
    // Static methods                                                         //
    ////////////////////////////////////////////////////////////////////////////

   /**
     * Get Java EE module configuration directory (e.g. {@code "META-INF"}).
     * This is just {@link J2eeModule.Type} shortcut.
     * <p/>
     * @param type {@link J2eeModule.Type} instance of Java EE module type.
     * @return Java EE module configuration directory for known Java EE
     *         module type or {@code null} when provided Java EE module type
     *         is not known.
     */
    public static final String getConfigDir(J2eeModule.Type type) {
        JavaEEModule configDir = JavaEEModule.toValue(type);
        return type != null ? configDir.getConfigDir() : null;
    }

    /**
     * Convert {@link J2eeModule.Type} to {@link JavaEEModule}.
     * <p/>
     * @param type {@link ModuleType} value to be converted.
     * @return {@link J2eeModule.Type} value corresponding to provided
     *         {@link ModuleType} value.
     */
    @SuppressWarnings("deprecation")
    public static JavaEEModule toValue(final J2eeModule.Type type) {
        return j2eeModuleTypeToValue.get(type);
    }

    ////////////////////////////////////////////////////////////////////////////
    // Instance attributes                                                    //
    ////////////////////////////////////////////////////////////////////////////

    /** Java EE module type. */
    private final ModuleType moduleType;

    ////////////////////////////////////////////////////////////////////////////
    // Constructors                                                           //
    ////////////////////////////////////////////////////////////////////////////

    /**
     * Creates an instance of Java EE module type.
     * <p/>
     * @param moduleType Java EE module type.
     */
    private JavaEEModule(final ModuleType moduleType) {
        this.moduleType = moduleType;
    }

    ////////////////////////////////////////////////////////////////////////////
    // Methods                                                                //
    ////////////////////////////////////////////////////////////////////////////

    /**
     * Get stored {@link ModuleType} value.
     * <p/>
     * @return Stored {@link ModuleType} value.
     */
    private ModuleType getModuleType() {
        return moduleType;
    }

    /**
     * Get Java EE module configuration directory (e.g. {@code "META-INF"}).
     * <p/>
     * @return Java EE module configuration directory.
     */
    public String getConfigDir() {
        switch (this) {
            case CAR:
            case EAR:
            case EJB:
            case RAR:
                return META_INF;
            case WAR:
                return WEB_INF;
            default:
                throw new IllegalArgumentException("Unknown Java EE module type.");
        }
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.eecommon.api.config;

import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.Collections;
import java.util.Iterator;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation2;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

/**
 * Java EE module for GlassFish features tests.
 * <p/>
 * @author Tomas Kraus
 */
public class GFTestEEModuleImpl implements J2eeModuleImplementation2 {
    
    private final FileObject appRoot;
    private final File srcDir;
    private final File configDir;
    private final J2eeModule.Type moduleType;
    private final String moduleVersion;

    /** Creates a new instance of TestJ2eeModule
     * @param appRoot Application root directory.
     * @param moduleType Java EE module type.
     * @param moduleVersion Java EE version.
     */
    public GFTestEEModuleImpl(
            final FileObject appRoot, final J2eeModule.Type moduleType,
            final String moduleVersion
    ) {
        this.appRoot = appRoot;
        this.srcDir = new File(FileUtil.toFile(appRoot), "src");
        this.configDir = new File(srcDir, "conf");
        this.moduleType = moduleType;
        this.moduleVersion = moduleVersion;
    }

    @Override
    public FileObject getArchive() {
        return null;
    }
    
    @Override
    public Iterator<J2eeModule.RootedEntry> getArchiveContents() {
        return Collections.<J2eeModule.RootedEntry>emptySet().iterator();
    }
    
    @Override
    public FileObject getContentDirectory() {
        return appRoot;
    }
    
    @Override
    public J2eeModule.Type getModuleType() {
        return moduleType;
    }
    
    @Override
    public String getModuleVersion() {
        return moduleVersion;
    }
    
    @Override
    public String getUrl() {
        throw new UnsupportedOperationException("Not implemented.");
    }
    
    @Override
    public File getResourceDirectory() {
        return new File(FileUtil.toFile(appRoot), "setup");
    }

    @Override
    public File getDeploymentConfigurationFile(String name) {
        return new File(configDir, name);
    }

    @Override
    public void addPropertyChangeListener(PropertyChangeListener listener) {
        throw new UnsupportedOperationException("Not implemented.");
    }

    @Override
    public void removePropertyChangeListener(PropertyChangeListener listener) {
        throw new UnsupportedOperationException("Not implemented.");
    }
    
    @Override
    public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
        throw new UnsupportedOperationException("Not implemented.");
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.eecommon.api.config;

import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Set;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.netbeans.api.j2ee.core.Profile;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
import org.netbeans.modules.glassfish.tooling.utils.OsUtils;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleFactory;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

/**
 * GlassFish Java EE server configuration API support tests.
 * <p/>
 * @author Tomas Kraus
 */
public class GlassfishConfigurationTest extends NbTestCase {
    
    private GFTestEEModuleImpl moduleImplCar;
    private J2eeModule moduleCar;
    private GFTestEEModuleImpl moduleImplEjb;
    private J2eeModule moduleEjb;
    private GFTestEEModuleImpl moduleImplEar;
    private J2eeModule moduleEar;
    private GFTestEEModuleImpl moduleImplWar;
    private J2eeModule moduleWar;
    private GFTestEEModuleImpl moduleImplRar;
    private J2eeModule moduleRar;

    public GlassfishConfigurationTest(final String testName) {
        super(testName);
    }

   @BeforeClass
    public static void setUpClass() throws Exception {
    }

    @AfterClass
    public static void tearDownClass() throws Exception {
    }

    @Before
    @Override
    public void setUp() throws Exception {
        final File dataDir = getDataDir();
        final File rootFolder = new File(dataDir, "gfsample");
        rootFolder.mkdirs();
        final FileObject rootFolderFO = FileUtil.toFileObject(rootFolder);
        moduleImplCar = new GFTestEEModuleImpl(
                rootFolderFO, J2eeModule.Type.CAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
        moduleCar = J2eeModuleFactory.createJ2eeModule(moduleImplCar);
        moduleImplEjb = new GFTestEEModuleImpl(
                rootFolderFO, J2eeModule.Type.EJB, Profile.JAVA_EE_7_FULL.toPropertiesString());
        moduleEjb = J2eeModuleFactory.createJ2eeModule(moduleImplEjb);
        moduleImplEar = new GFTestEEModuleImpl(
                rootFolderFO, J2eeModule.Type.EAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
        moduleEar = J2eeModuleFactory.createJ2eeModule(moduleImplEar);
        moduleImplRar = new GFTestEEModuleImpl(
                rootFolderFO, J2eeModule.Type.RAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
        moduleRar = J2eeModuleFactory.createJ2eeModule(moduleImplRar);
        moduleImplWar = new GFTestEEModuleImpl(
                rootFolderFO, J2eeModule.Type.WAR, Profile.JAVA_EE_7_WEB.toPropertiesString());
        moduleWar = J2eeModuleFactory.createJ2eeModule(moduleImplWar);
    }

    @After
    @Override
    public void tearDown() {
        // Pass everything to GC.
        moduleImplCar = null;
        moduleCar = null;
        moduleImplEjb = null;
        moduleEjb = null;
        moduleImplEar = null;
        moduleEar = null;
        moduleImplRar = null;
        moduleRar = null;
        moduleImplWar = null;
        moduleWar = null;
    }

    /**
     * Test Java EE module directory structure for resource file.
     * @throws NoSuchMethodException when there is a problem with reflection.
     * @throws IllegalAccessException when there is a problem with reflection.
     * @throws IllegalArgumentException when there is a problem with reflection.
     * @throws InvocationTargetException  when there is a problem with reflection.
     */
    @Test
    public void testResourceFilePath()
            throws NoSuchMethodException, IllegalAccessException,
            IllegalArgumentException, InvocationTargetException {
        final Method resourceFilePath = GlassfishConfiguration.class.getDeclaredMethod(
                "resourceFilePath", J2eeModule.class, String.class);
        resourceFilePath.setAccessible(true);
        
        final String pathFragment = "myDirectory";
        final String verifyConfigDirCar = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
        final String verifyConfigDirEjb = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
        final String verifyConfigDirEar = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
        final String verifyConfigDirRar = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
        final String verifyConfigDirWar = OsUtils.joinPaths(JavaEEModule.WEB_INF, pathFragment);
        final String configDirCar = (String)resourceFilePath.invoke(null, moduleCar, pathFragment);
        final String configDirEjb = (String)resourceFilePath.invoke(null, moduleEjb, pathFragment);
        final String configDirEar = (String)resourceFilePath.invoke(null, moduleEar, pathFragment);
        final String configDirRar = (String)resourceFilePath.invoke(null, moduleRar, pathFragment);
        final String configDirWar = (String)resourceFilePath.invoke(null, moduleWar, pathFragment);
        assertEquals("Expected resource file path for CAR is: " + verifyConfigDirCar,
                verifyConfigDirCar, configDirCar);
        assertEquals("Expected resource file path for EJB is: " + verifyConfigDirEjb,
                verifyConfigDirEjb, configDirEjb);
        assertEquals("Expected resource file path for EAR is: " + verifyConfigDirEar,
                verifyConfigDirEar, configDirEar);
        assertEquals("Expected resource file path for RAR is: " + verifyConfigDirRar,
                verifyConfigDirRar, configDirRar);
        assertEquals("Expected resource file path for WAR is: " + verifyConfigDirWar,
                verifyConfigDirWar, configDirWar);
    }

    /**
     * Test new GlassFish resources file name generation depending on passed {@link GlassFishVersion}.
     * Expected values are:<ul>
     * <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
     *     on GlassFish older than 3.1</li\>
     * <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
     *     on GlassFish 3.1 and later</li\>
     * <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish older than 3.1</li\>
     * <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish 3.1 and later</li\></ul>
     */
    @Test 
    public void testGetNewResourceFile() {
        for (GlassFishVersion version : GlassFishVersion.values()) {
            final File resourceFileCar = GlassfishConfiguration.getNewResourceFile(moduleCar, version);
            final File resourceFileEar = GlassfishConfiguration.getNewResourceFile(moduleEar, version);
            final File resourceFileEjb = GlassfishConfiguration.getNewResourceFile(moduleEjb, version);
            final File resourceFileRar = GlassfishConfiguration.getNewResourceFile(moduleRar, version);
            final File resourceFileWar = GlassfishConfiguration.getNewResourceFile(moduleWar, version);
            final File verifyPrefixCar = moduleCar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleCar.getType()));
            final File verifyPrefixEar = moduleEar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleEar.getType()));
            final File verifyPrefixEjb = moduleEjb.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleEjb.getType()));
            final File verifyPrefixRar = moduleRar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleRar.getType()));
            final File verifyPrefixWar = moduleWar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleWar.getType()));
            final String fileName = GlassFishVersion.lt(version, GlassFishVersion.GF_3_1)
                    ? "sun-resources.xml"
                    : "glassfish-resources.xml";
            final File verifyFileCar = new File(verifyPrefixCar, fileName);
            final File verifyFileEar = new File(verifyPrefixEar, fileName);
            final File verifyFileEjb = new File(verifyPrefixEjb, fileName);
            final File verifyFileRar = new File(verifyPrefixRar, fileName);
            final File verifyFileWar = new File(verifyPrefixWar, fileName);
            assertTrue("New resource file for " + version.toString() + " CAR: " + verifyFileCar.toString(),
                    verifyFileCar.equals(resourceFileCar));
            assertTrue("New resource file for " + version.toString() + " EAR: " + verifyFileEar.toString(),
                    verifyFileEar.equals(resourceFileEar));
            assertTrue("New resource file for " + version.toString() + " EJB: " + verifyFileEjb.toString(),
                    verifyFileEjb.equals(resourceFileEjb));
            assertTrue("New resource file for " + version.toString() + " RAR: " + verifyFileRar.toString(),
                    verifyFileRar.equals(resourceFileRar));
            assertTrue("New resource file for " + version.toString() + " WAR: " + verifyFileWar.toString(),
                    verifyFileWar.equals(resourceFileWar));
        }
    }


    /**
     * Verify that proper resource file from Java EE module is returned.
     * Both {@code sun-resources.xml} and {@code glassfish-resources.xml} are available
     * in Java EE module configuration directory on the disk.
     * Expected values are:<ul>
     * <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
     *     on GlassFish older than 3.1</li\>
     * <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
     *     on GlassFish 3.1 and later</li\>
     * <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish older than 3.1</li\>
     * <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish 3.1 and later</li\></ul>
     */
    @Test 
    public void testGetExistingResourceFile() throws IOException {
        final File prefixCar = moduleCar.getDeploymentConfigurationFile(
                JavaEEModule.getConfigDir(moduleCar.getType()));
        final File prefixEar = moduleEar.getDeploymentConfigurationFile(
                JavaEEModule.getConfigDir(moduleEar.getType()));
        final File prefixEjb = moduleEjb.getDeploymentConfigurationFile(
                JavaEEModule.getConfigDir(moduleEjb.getType()));
        final File prefixRar = moduleRar.getDeploymentConfigurationFile(
                JavaEEModule.getConfigDir(moduleRar.getType()));
        final File prefixWar = moduleWar.getDeploymentConfigurationFile(
                JavaEEModule.getConfigDir(moduleWar.getType()));
        final Set<File> prefixes = new HashSet<File>(5);
        prefixes.add(prefixCar);
        prefixes.add(prefixEar);
        prefixes.add(prefixEjb);
        prefixes.add(prefixRar);
        prefixes.add(prefixWar);
        // Create all resource files (they are empty but it's enough for this test).
        for (File prefix : prefixes) {
            final File sunResource = new File(prefix, "sun-resources.xml");
            final File gfResource = new File(prefix, "glassfish-resources.xml");
            prefix.mkdirs();
            sunResource.createNewFile();
            gfResource.createNewFile();
        }
        for (GlassFishVersion version : GlassFishVersion.values()) {
            File resourcesCar = GlassfishConfiguration.getExistingResourceFile(moduleCar, version);
            File resourcesEar = GlassfishConfiguration.getExistingResourceFile(moduleEar, version);
            File resourcesEjb = GlassfishConfiguration.getExistingResourceFile(moduleEjb, version);
            File resourcesRar = GlassfishConfiguration.getExistingResourceFile(moduleRar, version);
            File resourcesWar = GlassfishConfiguration.getExistingResourceFile(moduleWar, version);
            final File verifyPrefixCar = moduleCar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleCar.getType()));
            final File verifyPrefixEar = moduleEar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleEar.getType()));
            final File verifyPrefixEjb = moduleEjb.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleEjb.getType()));
            final File verifyPrefixRar = moduleRar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleRar.getType()));
            final File verifyPrefixWar = moduleWar.getDeploymentConfigurationFile(
                    JavaEEModule.getConfigDir(moduleWar.getType()));
            final String fileName = GlassFishVersion.lt(version, GlassFishVersion.GF_3_1)
                    ? "sun-resources.xml"
                    : "glassfish-resources.xml";
            final File verifyFileCar = new File(verifyPrefixCar, fileName);
            final File verifyFileEar = new File(verifyPrefixEar, fileName);
            final File verifyFileEjb = new File(verifyPrefixEjb, fileName);
            final File verifyFileRar = new File(verifyPrefixRar, fileName);
            final File verifyFileWar = new File(verifyPrefixWar, fileName);
            assertTrue("Existing resource file for " + version.toString() + " CAR: " + verifyFileCar.toString(),
                    verifyFileCar.equals(resourcesCar));
            assertTrue("Existing resource file for " + version.toString() + " EAR: " + verifyFileEar.toString(),
                    verifyFileEar.equals(resourcesEar));
            assertTrue("Existing resource file for " + version.toString() + " EJB: " + verifyFileEjb.toString(),
                    verifyFileEjb.equals(resourcesEjb));
            assertTrue("Existing resource file for " + version.toString() + " RAR: " + verifyFileRar.toString(),
                    verifyFileRar.equals(resourcesRar));
            assertTrue("Existing resource file for " + version.toString() + " WAR: " + verifyFileWar.toString(),
                    verifyFileWar.equals(resourcesWar));
        }
        // Delete all resource files.
        for (File prefix : prefixes) {
            final File sunResource = new File(prefix, "sun-resources.xml");
            final File gfResource = new File(prefix, "glassfish-resources.xml");
            sunResource.delete();
            gfResource.delete();
        }
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.javaee;

import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.glassfish.common.GlassfishInstance;
import org.netbeans.modules.glassfish.common.GlassfishInstanceProvider;
import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory2;

/**
 * Abstract factory to construct Java EE server configuration API support object.
 * <p/>
 * @author Vince Kraemer, Tomas Kraus
 */
abstract class AbstractHk2ConfigurationFactory implements ModuleConfigurationFactory2 {
    /** Deployment manager. */
    private final Hk2DeploymentManager hk2dm;

    /**
     * Creates a new instance of {@link GlassFishConfigurationFactory
     */
    AbstractHk2ConfigurationFactory(final Hk2DeploymentManager hk2dm) {
        this.hk2dm = hk2dm;
    }

    /**
     * Constructs proper module configuration object without having
     * GlassFish server.
     * <p/>
     * Proper configuration object is selected depending on GlassFish specific
     * web application meta data file (<code>WEB-INFsun-web.xml</code>
     * or <code>WEB-INF/glassfish-web.xml</code>) existence.
     * GlassFish version 3.0 is passed to old module configuration object
     * to rely on {@code sun-resources.xml} resource file.
     * GlassFish version 3.1 is passed to new module configuration object
     * to rely on {@code glassfish-resources.xml} resource file.
     * <p/>
     * @param module Java EE module.
     * @return Module configuration object.
     * @throws ConfigurationException if there is a problem with the server-specific
     *         configuration.
     */
    @Override
    public ModuleConfiguration create(final J2eeModule module)
            throws ConfigurationException {
        ModuleConfiguration retVal = null;
        try {
            if (J2eeModuleHelper.isGlassFishWeb(module)) {
                retVal = new ModuleConfigurationImpl(
                        module, new Three1Configuration(module, GlassFishVersion.GF_3_1), hk2dm);
            } else {
                retVal = new ModuleConfigurationImpl(
                        module, new Hk2Configuration(module, GlassFishVersion.GF_3), hk2dm);
            }
        } catch (ConfigurationException ce) {
            throw ce;
        } catch (Exception ex) {
            throw new ConfigurationException(module.toString(), ex);
        }
        return retVal;
    }

    /**
     * Constructs proper module configuration object depending on
     * GlassFish server.
     * <p/>
     * Proper configuration object is selected depending on GlassFish version.
     * Old module configuration object is created for server before version 3.1
     * and new module configuration object for server version 3.1 and later.
     * <p/>
     * @param module      Java EE module.
     * @param instanceUrl GlassFish server internal URL.
     * @return Module configuration object.
     * @throws ConfigurationException if there is a problem with the server-specific
     *         configuration.
     */
    @Override
    @SuppressWarnings("UseSpecificCatch")
    public ModuleConfiguration create(final @NonNull J2eeModule module,
            final @NonNull String instanceUrl) throws ConfigurationException {
        ModuleConfiguration retVal = null;
        final GlassfishInstance instance
                = GlassfishInstanceProvider.getProvider()
                .getGlassfishInstance(instanceUrl);
        final GlassFishVersion version = instance != null
                ? instance.getVersion() : null;
        try {
            final Hk2DeploymentManager dm = hk2dm != null
                    ? hk2dm
                    : (Hk2DeploymentManager) Hk2DeploymentFactory.createEe6()
                            .getDisconnectedDeploymentManager(instanceUrl);
            if (version != null
                    && GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
                retVal = new ModuleConfigurationImpl(
                        module, new Three1Configuration(module, version), dm);
            } else {
                retVal = new ModuleConfigurationImpl(
                        module, new Hk2Configuration(module, version), dm);
            }
        } catch (ConfigurationException ce) {
            throw ce;
        } catch (Exception ex) {
            throw new ConfigurationException(module.toString(), ex);
        }
        return retVal;
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;
import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
import org.netbeans.modules.glassfish.javaee.db.Hk2DatasourceManager;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
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.openide.util.NbBundle;

/**
 * Java EE server configuration API support for GlassFish servers before 3.1.
 * Covers GlassFish servers before 3.1. Old {@code sun-resources.xml} files are used.
 * <p/>
 * @author Ludovic Champenois, Peter Williams, Tomas Kraus
 */
public class Hk2Configuration extends GlassfishConfiguration implements DeploymentConfiguration {

    /**
     * Creates an instance of Java EE server configuration API support
     * for GlassFish servers before 3.1.
     * <p/>
     * @param module  Java EE module (project).
     * @param version GlassFish server version.
     * @throws ConfigurationException when there is a problem with Java EE server
     *         configuration initialization.
     */
    public Hk2Configuration(
            final J2eeModule module, final GlassFishVersion version
    ) throws ConfigurationException {
        super(module, version);
    }

    /**
     * Creates an instance of Java EE server configuration API support
     * for GlassFish servers before 3.1 with existing {@link J2eeModuleHelper} instance.
     * <p/>
     * @param module       Java EE module (project).
     * @param moduleHelper Already existing {@link J2eeModuleHelper} instance.
     * @param version      GlassFish server version.
     * @throws ConfigurationException when there is a problem with Java EE server
     *         configuration initialization.
     */
    public Hk2Configuration(
            final J2eeModule module, final J2eeModuleHelper jmh,
            final GlassFishVersion version
    ) throws ConfigurationException {
        super(module, jmh, version);
    }

    @Deprecated

    // DatasourceConfiguration support
    // ------------------------------------------------------------------------
    @Override
    public Set<Datasource> getDatasources() throws ConfigurationException {
        return Hk2DatasourceManager.getDatasources(module, version);
    }

    @Override

    }

    @Override
    public Datasource createDatasource(
            final String jndiName, final String url, final String username,
            final String password, final String driver
    ) throws UnsupportedOperationException, ConfigurationException, DatasourceAlreadyExistsException {
        return Hk2DatasourceManager.createDataSource(
                jndiName, url, username, password, driver, module, version);
            Logger.getLogger("glassfish-javaee").log(Level.WARNING, "Null Resource Folder");
            throw new ConfigurationException(NbBundle.getMessage(
                    ModuleConfigurationImpl.class, "ERR_NoRefJdbcDataSource", jndiName)); // NOI18N
        }

        return Hk2DatasourceManager.createDataSource(jndiName, url, username, password, driver, resourceDir,"sun-resources");
    }

    // ------------------------------------------------------------------------
    // MessageDestinationConfiguration support
    // ------------------------------------------------------------------------
    @Override
    public Set<MessageDestination> getMessageDestinations()
            throws ConfigurationException {
        return Hk2MessageDestinationManager.getMessageDestinations(module.getResourceDirectory(),"sun-resources");
    }





/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

 * 
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.glassfish.javaee;

import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.glassfish.common.GlassfishInstance;
import org.netbeans.modules.glassfish.common.GlassfishInstanceProvider;
import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory2;

/**

 * <p/>
 * @author Vince Kraemer, Tomas Kraus
 */
public class Hk2ModuleConfigFactory extends AbstractHk2ConfigurationFactory
implements ModuleConfigurationFactory2 {
    
    /**
     * Creates a new instance of {@link Hk2ModuleConfigFactory}
     */
    public Hk2ModuleConfigFactory() {
        super(null);
    }

    /**
     * Constructs proper module configuration object without having
     * GlassFish server.
     * <p/>
     * Proper configuration object is selected depending on GlassFish specific
     * web application meta data file (<code>WEB-INFsun-web.xml</code>
     * or <code>WEB-INF/glassfish-web.xml</code>) existence.
     * <p/>
     * @param module Java EE module.
     * @return Module configuration object.
     * @throws ConfigurationException if there is a problem with
     *         the server-specific configuration.
     */
    @Override
    public ModuleConfiguration create(final J2eeModule module)
            throws ConfigurationException {
        ModuleConfiguration retVal = null;
        try {
            if (J2eeModuleHelper.isGlassFishWeb(module)) {
                retVal = new ModuleConfigurationImpl(
                        module, new Three1Configuration(module), null);
            } else {
                retVal = new ModuleConfigurationImpl(
                        module, new Hk2Configuration(module), null);
            }
        } catch (ConfigurationException ce) {
            throw ce;
        } catch (Exception ex) {
            throw new ConfigurationException(module.toString(), ex);
        }
        return retVal;
    }

    /**
     * Constructs proper module configuration object depending on
     * GlassFish server.
     * <p/>
     * Proper configuration object is selected depending on GlassFish version.
     * Old module configuration object is created for server before version 3.1
     * and new module configuration object for server version 3.1 and later.
     * 
     * @param module Java EE module.
     * @param instanceUrl GlassFish server internal URL.
     * @return Module configuration object.
     * @throws ConfigurationException if there is a problem with
     *         the server-specific configuration.
     */
    @Override
    public ModuleConfiguration create(final @NonNull J2eeModule module,
            final @NonNull String instanceUrl) throws ConfigurationException {
        ModuleConfiguration retVal = null;
        GlassfishInstance instance
                = GlassfishInstanceProvider.getProvider()
                .getGlassfishInstance(instanceUrl);
        GlassFishVersion version = instance != null
                ? instance.getVersion() : null;
        try {
            Hk2DeploymentManager hk2Dm =
                    (Hk2DeploymentManager) Hk2DeploymentFactory.createEe6()
                    .getDisconnectedDeploymentManager(instanceUrl);
            if (version != null
                    && version.ordinal() >= GlassFishVersion.GF_3_1.ordinal()) {
                retVal = new ModuleConfigurationImpl(
                        module, new Three1Configuration(module), hk2Dm);
            } else {
                retVal = new ModuleConfigurationImpl(
                        module, new Hk2Configuration(module), hk2Dm);
            }
        } catch (ConfigurationException ce) {
            throw ce;
        } catch (Exception ex) {
            throw new ConfigurationException(module.toString(), ex);
        }
        return retVal;
    }
    
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

import javax.enterprise.deploy.spi.exceptions.BeanNotFoundException;
import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
import org.netbeans.modules.glassfish.javaee.db.Hk2DatasourceManager;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
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.openide.util.NbBundle;

/**
 * Java EE server configuration API support for GlassFish servers 3.1 and later.
 * <p/>
 * @author Ludovic Champenois, Peter Williams, Tomas Kraus
 */
public class Three1Configuration extends Hk2Configuration implements DeploymentConfiguration {

    /**
     * Creates an instance of Java EE server configuration API support
     * for GlassFish servers 3.1 and later.
     * <p/>
     * @param module  Java EE module (project).
     * @param version GlassFish server version.
     * @throws ConfigurationException when there is a problem with Java EE server
     *         configuration initialization.
     */
    public Three1Configuration(
            final J2eeModule module, final GlassFishVersion version
    ) throws ConfigurationException {
        super(module, J2eeModuleHelper.getGlassfishDDModuleHelper(module.getType()), version);
    }

    @Deprecated

    // ------------------------------------------------------------------------
    @Override
    public Set<Datasource> getDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException {
        return Hk2DatasourceManager.getDatasources(module, version);
    }

    @Override


    @Override
    public Datasource createDatasource(String jndiName, String url, String username, String password, String driver) throws UnsupportedOperationException, org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException, DatasourceAlreadyExistsException {
        return Hk2DatasourceManager.createDataSource(
                jndiName, url, username, password, driver, module, version);
            // Unable to create JDBC data source for resource ref.
//            postResourceError(NbBundle.getMessage(ModuleConfigurationImpl.class,
//                    "ERR_NoRefJdbcDataSource", jndiName)); // NOI18N
            Logger.getLogger("glassfish-javaee").log(Level.WARNING,
                    "Resource Folder " + resourceDir + " does not exist.");
            throw new ConfigurationException(NbBundle.getMessage(
                    ModuleConfigurationImpl.class, "ERR_NoRefJdbcDataSource", jndiName)); // NOI18N
        }

        return Hk2DatasourceManager.createDataSource(jndiName, url, username, password, driver, resourceDir,"glassfish-resources");
    }

    // ------------------------------------------------------------------------




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.


package org.netbeans.modules.glassfish.javaee;

import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory2;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory;

/**
 * Factory to construct proper module configuration object.
 * <p/>
 * @author Vince Kraemer, Tomas Kraus
 */
public class Three1ModuleConfigFactory extends AbstractHk2ConfigurationFactory
implements ModuleConfigurationFactory2 {
    
    /**
     * Creates a new instance of {@link Three1ModuleConfigFactory}.
     * <p/>
     * @param hk2dm Deployment manager.
     */
    public Three1ModuleConfigFactory(final Hk2DeploymentManager hk2dm) {
        super(hk2dm);
    }

    @Override
    public ModuleConfiguration create(J2eeModule module) throws ConfigurationException {
        ModuleConfiguration retVal = null;
        try {
            retVal = new ModuleConfigurationImpl(module, new Three1Configuration(module), hk2Dm);
        } catch (ConfigurationException ce) {
            throw ce;
        } catch (Exception ex) {
            ConfigurationException ce = new ConfigurationException(module.toString());
            ce.initCause(ex);
            throw ce;
        }
        return retVal;
    }
    
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2008-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.netbeans.modules.glassfish.common.GlassFishState;
import org.netbeans.modules.glassfish.common.parser.TreeParser;
import org.netbeans.modules.glassfish.eecommon.api.UrlData;
import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;
import org.netbeans.modules.glassfish.javaee.Hk2DeploymentManager;
import org.netbeans.modules.glassfish.tooling.data.GlassFishServer;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
import org.netbeans.modules.glassfish.tooling.utils.OsUtils;
import org.netbeans.modules.glassfish.tooling.utils.ServerUtils;
import org.netbeans.modules.glassfish.common.GlassFishState;
import org.netbeans.modules.glassfish.eecommon.api.UrlData;
import org.netbeans.modules.glassfish.javaee.*;
import org.netbeans.modules.glassfish.common.parser.TreeParser;
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.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.DatasourceManager;
import org.netbeans.modules.j2ee.sun.dd.api.RootInterface;
import org.openide.filesystems.FileLock;

            ServerUtils.GF_DOMAIN_CONFIG_DIR_NAME,
            ServerUtils.GF_DOMAIN_CONFIG_FILE_NAME);
    
    /** List of base file names containing server resources. */
    public static final String[] RESOURCE_FILES = {
        "glassfish-resources",
        "sun-resources"
    };

    ////////////////////////////////////////////////////////////////////////////
    // Instance attributes                                                    //
    ////////////////////////////////////////////////////////////////////////////

        if (!server.isRemote() && null != domainsDir) {
            File domainXml = new File(domainsDir, domainName + File.separatorChar + DOMAIN_XML_PATH);
            return readDatasources(
                    domainXml, "/domain/", server.getVersion());
        } else {
            return Collections.EMPTY_SET;
        }


    /**
     * Deploys the given set of data sources.
     * <p/>
     * @param Set of datasources to deploy.
     * @throws ConfigurationException if there is some problem with data source
     *         configuration.

    @Override
    public void deployDatasources(Set<Datasource> datasources) 
            throws ConfigurationException, DatasourceAlreadyExistsException {
        // Since a connection pool is not a Datasource, the deploy has to
        // happen in a different part of the deploy processing...
    }
 

    
    // ------------------------------------------------------------------------
    //  Used by ModuleConfigurationImpl since 
    // ------------------------------------------------------------------------

    // Making this method private because there is no reason to provide resources
    // file base names manually.
    /**
     * Get {@link Datasource} objects from first available resources file.
     * <p/>
     * @param version Resources file names depend on GlassFish server version.
     * @param module  Java EE module (project).
     * @return {@link Datasource} objects found in first available file.
     */
    public static Set<Datasource> getDatasources(
            final J2eeModule module, final GlassFishVersion version) {
        File file = GlassfishConfiguration.getExistingResourceFile(module, version);
        if (file != null) {
            return readDatasources(file, "/", version);
        } else {
            return new HashSet<>();
                return readDatasources(file, "/", resourceDir, version);
        }
        // Return empty set when no resource file was found.
        return new HashSet<>();
    }

    /**
     * Get <code>Datasource</code> objects from first available resources file.
     * Default resource base names list is used.
     *
     * @param resourceDir Directory containing resource files.
     * @return <code>Datasource</code> objects found in first available file.
     */
    public static Set<Datasource> getDatasources(File resourceDir) {
        return getDatasources(resourceDir, RESOURCE_FILES, null);
    }

//    public Datasource createDataSource(String jndiName, String url, String username,
//            String password, String driver, File resourceDir) throws DatasourceAlreadyExistsException {
//        SunDatasource result = null;
//        try {
//            // Throw an exception if the data source already exists.
//            for(Datasource ds: getDatasources(resourceDir)) {
//                if(jndiName.equals(ds.getJndiName())) {
//                    throw new DatasourceAlreadyExistsException(new SunDatasource(
//                            jndiName, url, username, password, driver));
//                }
//            }
//            
//            if(url != null) {
////                String vendorName = convertToValidName(url);
////                if(vendorName == null) {
////                    vendorName = jndiName;
////                }else{
////                    if(vendorName.equals("derby_embedded")){ //NOI18N
////                        NotifyDescriptor d = new NotifyDescriptor.Message(bundle.getString("Err_UnSupportedDerby"), NotifyDescriptor.WARNING_MESSAGE); // NOI18N
////                        DialogDisplayer.getDefault().notify(d);
////                        return null;
////                    }
////                }
//                if(resourceDir.exists()) {
//                    FileUtil.createFolder(resourceDir);
//                }
//                
//                // Create connection pool if needed.
//                String poolName = createCheckForConnectionPool(vendorName, url, username, password, driver, resourceDir);
//                boolean jdbcExists = requiredResourceExists(jndiName, resourceDir, JDBC_RESOURCE);
//                if (jdbcExists) {
//                    result = null;
//                } else {
//                    createJDBCResource(jndiName, poolName, resourceDir);
//                    result = new SunDatasource(jndiName, url, username, password, driver);
//                }
//            }
//        } catch(IOException ex) {
//            Logger.getLogger("glassfish-javaee").log(Level.WARNING, ex.getLocalizedMessage(), ex);
//        }
//        return result;
//    }    
    
    
    // ------------------------------------------------------------------------
    //  Internal logic
    // ------------------------------------------------------------------------

    /** 
     * Get resource file for new data source creation and verify it.
     * Verifies existing resource file syntax and data sources or provides
     * a new file when no resource file exists.
     * <br/>
     * <i>Internal {@link #createDataSource(String, String, String,
     * String, String, J2eeModule, GlassFishVersion)} helper method.</i>
     * <p/>
     * @param jndiName Data source JNDI name.
     * @param url      Database URL.
     * @param username Database user name.
     * @param password Database user password.
     * @param driver   Database JDBC driver.
     * @param module   Java EE module (project).
     * @param version  GlassFish server version.
     * @param cpFinder Connection pool finder.
     * @return Resource file for new data source creation.
     * @throws ConfigurationException if there is a problem with resource
     *         file parsing.
     * @throws DatasourceAlreadyExistsException if the required data source
     *         already exists in resource file.
     */
    private static File resourceFileForDSCreation(
            final String jndiName, final String url, final String username,
            final String password, final String driver, final J2eeModule module,
            final GlassFishVersion version,final ConnectionPoolFinder cpFinder
    ) throws ConfigurationException, DatasourceAlreadyExistsException {
        final DuplicateJdbcResourceFinder jdbcFinder
                = new DuplicateJdbcResourceFinder(jndiName);
        File file = GlassfishConfiguration.getExistingResourceFile(module, version);
        if (file.exists()) {
            List<TreeParser.Path> pathList = new ArrayList<>();
            pathList.add(new TreeParser.Path("/resources/jdbc-resource", jdbcFinder));
            pathList.add(new TreeParser.Path("/resources/jdbc-connection-pool", cpFinder));
            try {
                TreeParser.readXml(file, pathList);
                if(jdbcFinder.isDuplicate()) {
                    throw new DatasourceAlreadyExistsException(new SunDatasource(
                            jndiName, url, username, password, driver));
                }
            } catch(IllegalStateException ex) {
                Logger.getLogger("glassfish-javaee").log(
                        Level.INFO, ex.getLocalizedMessage(), ex);
                throw new ConfigurationException(ex.getLocalizedMessage(), ex);
            }
        }
        return file != null
                ? file : GlassfishConfiguration.getNewResourceFile(module, version);
    }
    
    /**
     * Create a data source (jdbc-resource and jdbc-connection-pool) and add it
     * to sun-resources.xml in the specified resource folder.
     * 
     * @param jndiName Data source JNDI name.
     * @param url      Database URL.
     * @param username Database user name.
     * @param password Database user password.
     * @param driver   Database JDBC driver.
     * @param module   Java EE module (project).
     * @param version  GlassFish server version.
     * @return New {@link Datasource} object.
     * @throws ConfigurationException if there is a problem with resource
     *         file parsing.
     * @throws DatasourceAlreadyExistsException if the required data source
     *         already exists in resource file.
     */
    public static Datasource createDataSource(
            final String jndiName, final String url, final String username,
            final String password, final String driver,
            final J2eeModule module, final GlassFishVersion version
    ) throws ConfigurationException, DatasourceAlreadyExistsException {
        SunDatasource ds;
        ConnectionPoolFinder cpFinder = new ConnectionPoolFinder();
        
        File xmlFile = resourceFileForDSCreation(
                jndiName, url, username, password, driver, module, version, cpFinder);

        try {
            String vendorName = VendorNameMgr.vendorNameFromDbUrl(url);
            if(vendorName == null) {
                vendorName = jndiName;
            } else {
                if("derby_embedded".equals(vendorName)) {
                    // !PW FIXME display as dialog warning?
                    Logger.getLogger("glassfish-javaee").log(Level.WARNING, 
                            "Embedded derby not supported as a datasource");
                    return null;
                }
            }

            // Is there a connection pool we can reuse, or do we need to create one?
            String defaultPoolName = computePoolName(url, vendorName, username);
            Map<String, CPool> pools = cpFinder.getPoolData();
            CPool defaultPool = pools.get(defaultPoolName);
            
            String poolName = null;
            if(defaultPool != null && isSameDatabaseConnection(defaultPool, url, username, password)) {
                poolName = defaultPoolName;
            } else {
                for(CPool pool: pools.values()) {
                    if(isSameDatabaseConnection(pool, url, username, password)) {
                        poolName = pool.getPoolName();
                        break;
                    }
                }
            }
            
            if(poolName == null) {
                poolName = defaultPool == null ? defaultPoolName : generateUniqueName(defaultPoolName, pools.keySet());
                createConnectionPool(xmlFile, poolName, url, username, password, driver);
            }
            
            // create jdbc resource
            createJdbcResource(xmlFile, jndiName, poolName);

            ds = new SunDatasource(jndiName, url, username, password, driver);
        } catch(IOException ex) {
            Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
            throw new ConfigurationException(ex.getLocalizedMessage(), ex);
        }
        
        return ds;
    }

    /**
     * Parse resource file and build <code>Datasource</code> objects from it.
     * <p/>

     */
    private static Set<Datasource> readDatasources(
            final File xmlFile, final String xPathPrefix,
            final GlassFishVersion version) {
        final Set<Datasource> dataSources = new HashSet<>();

        if (xmlFile.canRead()) {
            final Map<String, JdbcResource> jdbcResourceMap = new HashMap<>();
            final Map<String, ConnectionPool> connectionPoolMap = new HashMap<>();

            final List<TreeParser.Path> pathList = new ArrayList<>();
            pathList.add(new TreeParser.Path(xPathPrefix + "resources/jdbc-resource", new JdbcReader(jdbcResourceMap)));
            pathList.add(new TreeParser.Path(xPathPrefix + "resources/jdbc-connection-pool", new ConnectionPoolReader(connectionPoolMap)));


            }

            for (JdbcResource jdbc : jdbcResourceMap.values()) {
                final ConnectionPool pool = connectionPoolMap.get(jdbc.getPoolName());
                if (pool != null) {
                    try {
                        pool.normalize();

                        // add to sun datasource list
                        final String url = pool.getProperty("URL"); //NOI18N
                        final String username = pool.getProperty("User"); //NOI18N
                        final String password = pool.getProperty("Password"); //NOI18N
                        final String driverClassName = pool.getProperty("driverClass"); //NOI18N
                        final SunDatasource dataSource = new SunDatasource(
                                jdbc.getJndiName(), url, username,
                                password, driverClassName);
                        dataSources.add(dataSource);
                        // Add Java EE 7 comp/DefaultDataSource data source
                        // as jdbc/__default clone (since GF 4).

            }
        }
    }    
   
    /**
     * Create a data source (jdbc-resource and jdbc-connection-pool) and add it
     * to sun-resources.xml in the specified resource folder.
     * 
     * @param jndiName
     * @param url
     * @param username
     * @param password
     * @param driver
     * @param resourceDir
     * @return
     * @throws DatasourceAlreadyExistsException if the required resources already
     *         exist.
     */
    public static Datasource createDataSource(String jndiName, String url, 
            String username, String password, String driver, File resourceDir, String baseName)
            throws ConfigurationException, DatasourceAlreadyExistsException {
        SunDatasource ds;
        DuplicateJdbcResourceFinder jdbcFinder = new DuplicateJdbcResourceFinder(jndiName);
        ConnectionPoolFinder cpFinder = new ConnectionPoolFinder();
        
        File xmlFile = new File(resourceDir, baseName+".xml");
        if(xmlFile.exists()) {
            List<TreeParser.Path> pathList = new ArrayList<>();
            pathList.add(new TreeParser.Path("/resources/jdbc-resource", jdbcFinder));
            pathList.add(new TreeParser.Path("/resources/jdbc-connection-pool", cpFinder));
            
            try {
                TreeParser.readXml(xmlFile, pathList);
                if(jdbcFinder.isDuplicate()) {
                    throw new DatasourceAlreadyExistsException(new SunDatasource(
                            jndiName, url, username, password, driver));
                }
            } catch(IllegalStateException ex) {
                Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
                throw new ConfigurationException(ex.getLocalizedMessage(), ex);
            }
        }

        try {
            String vendorName = VendorNameMgr.vendorNameFromDbUrl(url);
            if(vendorName == null) {
                vendorName = jndiName;
            } else {
                if("derby_embedded".equals(vendorName)) {
                    // !PW FIXME display as dialog warning?
                    Logger.getLogger("glassfish-javaee").log(Level.WARNING, 
                            "Embedded derby not supported as a datasource");
                    return null;
                }
            }

            // Is there a connection pool we can reuse, or do we need to create one?
            String defaultPoolName = computePoolName(url, vendorName, username);
            Map<String, CPool> pools = cpFinder.getPoolData();
            CPool defaultPool = pools.get(defaultPoolName);
            
            String poolName = null;
            if(defaultPool != null && isSameDatabaseConnection(defaultPool, url, username, password)) {
                poolName = defaultPoolName;
            } else {
                for(CPool pool: pools.values()) {
                    if(isSameDatabaseConnection(pool, url, username, password)) {
                        poolName = pool.getPoolName();
                        break;
                    }
                }
            }
            
            if(poolName == null) {
                poolName = defaultPool == null ? defaultPoolName : generateUniqueName(defaultPoolName, pools.keySet());
                createConnectionPool(xmlFile, poolName, url, username, password, driver);
            }
            
            // create jdbc resource
            createJdbcResource(xmlFile, jndiName, poolName);

            ds = new SunDatasource(jndiName, url, username, password, driver, resourceDir);
        } catch(IOException ex) {
            Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
            throw new ConfigurationException(ex.getLocalizedMessage(), ex);
        }
        
        return ds;
    }
    
    private static String generateUniqueName(String prefix, Set<String> keys) {
        for(int i = 1; ; i++) {
            String candidate = prefix + "_" + i; // NOI18N




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.


package org.netbeans.modules.glassfish.javaee.db;

import java.io.File;
import org.netbeans.modules.j2ee.deployment.common.api.Datasource;

/**

    private final String username;
    private final String password;
    private final String driverClassName;
    private File resourceDir;
    
    public SunDatasource(String jndiName, String url, String username, 
            String password, String driverClassName/*, File resourceDir*/) {
        this(jndiName, url, username, password, driverClassName, null);
    }
    
    public SunDatasource(String jndiName, String url, String username, 
            String password, String driverClassName, File resourceDir) {
        this.jndiName = jndiName;
        this.url = url;
        this.username = username;
        this.password = password;
        this.driverClassName = driverClassName;
        this.resourceDir = resourceDir;
    }
    
    @Override

        return driverClassName;
    }
    
    File getResourceDir() {
        return resourceDir;
    }
    
    void setResourceDir(File resourceDir) {
        this.resourceDir = resourceDir;
    }
    
    @Override
    public String toString() {
        return "[ " + jndiName + " : " + url 

    }
    
    @Override
    @SuppressWarnings("AccessingNonPublicFieldOfAnotherObject")
    public boolean equals(Object obj) {
        if (obj == null) {
            return false;

        if (this.password == null || !this.password.equals(other.password)) {
            return false;
        }
        if (this.driverClassName == null
                || !this.driverClassName.equals(other.driverClassName)) {
            return false;
        }
        return true;


    public SunDatasource copy(String jndiName) {
        return new SunDatasource(jndiName, this.url, this.username, 
            this.password, this.driverClassName/*, this.resourceDir*/);
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.javaee.db;

import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.Collections;
import java.util.Iterator;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation2;
import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

/**
 * Java EE module for GlassFish features tests.
 * <p/>
 * @author Tomas Kraus
 */
public class HK2TestEEModuleImpl implements J2eeModuleImplementation2 {
    
    private final FileObject appRoot;
    private final File srcDir;
    private final File configDir;
    private final J2eeModule.Type moduleType;
    private final String moduleVersion;

    /** Creates a new instance of TestJ2eeModule
     * @param appRoot Application root directory.
     * @param moduleType Java EE module type.
     * @param moduleVersion Java EE version.
     */
    public HK2TestEEModuleImpl(
            final FileObject appRoot, final J2eeModule.Type moduleType,
            final String moduleVersion
    ) {
        this.appRoot = appRoot;
        this.srcDir = new File(FileUtil.toFile(appRoot), "src");
        this.configDir = new File(srcDir, "conf");
        this.moduleType = moduleType;
        this.moduleVersion = moduleVersion;
    }

    @Override
    public FileObject getArchive() {
        return null;
    }
    
    @Override
    public Iterator<J2eeModule.RootedEntry> getArchiveContents() {
        return Collections.<J2eeModule.RootedEntry>emptySet().iterator();
    }
    
    @Override
    public FileObject getContentDirectory() {
        return appRoot;
    }
    
    @Override
    public J2eeModule.Type getModuleType() {
        return moduleType;
    }
    
    @Override
    public String getModuleVersion() {
        return moduleVersion;
    }
    
    @Override
    public String getUrl() {
        throw new UnsupportedOperationException("Not implemented.");
    }
    
    @Override
    public File getResourceDirectory() {
        return new File(FileUtil.toFile(appRoot), "setup");
    }

    @Override
    public File getDeploymentConfigurationFile(String name) {
        return new File(configDir, name);
    }

    @Override
    public void addPropertyChangeListener(PropertyChangeListener listener) {
        throw new UnsupportedOperationException("Not implemented.");
    }

    @Override
    public void removePropertyChangeListener(PropertyChangeListener listener) {
        throw new UnsupportedOperationException("Not implemented.");
    }
    
    @Override
    public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
        throw new UnsupportedOperationException("Not implemented.");
    }
}

Lines 1-7 Link Here

(-)a/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManagerTest.java (-9 / +31 lines)
1	/*	1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*	3	*
4	* Copyright 2010 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 2010-2015 Oracle and/or its affiliates. All rights reserved.
5	*	5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 51-66 Link Here
51	import org.junit.Before;	51	import org.junit.Before;
52	import org.junit.BeforeClass;	52	import org.junit.BeforeClass;
53	import org.junit.Test;	53	import org.junit.Test;
		54	import org.netbeans.api.j2ee.core.Profile;
		55	import org.netbeans.junit.NbTestCase;
		56	import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
54	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;	57	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
55	import static org.junit.Assert.*;	58	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
		59	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleFactory;
		60	import org.openide.filesystems.FileObject;
		61	import org.openide.filesystems.FileUtil;
56		62
57	/**	63	/**
58	*	64	* GlassFish server data source manager tests.
59	* @author vkraemer	65	* <p/>
		66	* @author Vince Kraemer, Tomas Kraus
60	*/	67	*/
61	public class Hk2DatasourceManagerTest {	68	public class Hk2DatasourceManagerTest extends NbTestCase {
62		69
63	public Hk2DatasourceManagerTest() {	70	private J2eeModule j2eeModule;
		71	private HK2TestEEModuleImpl j2eeModuleImpl;
		72
		73	public Hk2DatasourceManagerTest(String testName) {
		74	super(testName);
64	}	75	}
65		76
66	@BeforeClass	77	@BeforeClass
Lines 72-81 Link Here
72	}	83	}
73		84
74	@Before	85	@Before
75	public void setUp() {	86	@Override
		87	public void setUp() throws Exception {
		88	File dataDir = getDataDir();
		89	File rootFolder = new File(dataDir, "hk2sample");
		90	rootFolder.mkdirs();
		91	FileObject rootFolderFO = FileUtil.toFileObject(rootFolder);
		92	j2eeModuleImpl = new HK2TestEEModuleImpl(
		93	rootFolderFO, J2eeModule.Type.WAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
		94	j2eeModule = J2eeModuleFactory.createJ2eeModule(j2eeModuleImpl);
76	}	95	}
77		96
78	@After	97	@After
		98	@Override
79	public void tearDown() {	99	public void tearDown() {
80	}	100	}
81		101
Lines 93-103 Link Here
93	}	113	}
94	File resourceDir = null;	114	File resourceDir = null;
95	try {	115	try {
96	resourceDir = new File(new File(codebase.toURI()).getParentFile(), "data/178776"); // NOI18N	116	resourceDir = new File(
		117	new File(codebase.toURI()).getParentFile(), "data/178776"); // NOI18N
97	} catch (URISyntaxException x) {	118	} catch (URISyntaxException x) {
98	throw new Error(x);	119	throw new Error(x);
99	}	120	}
100	Set<Datasource> result = Hk2DatasourceManager.getDatasources(resourceDir);	121	Set<Datasource> result = Hk2DatasourceManager.getDatasources(
		122	j2eeModule, GlassFishVersion.GF_3);
101	// assertEquals(expResult, result);	123	// assertEquals(expResult, result);
102	// TODO review the generated test code and remove the default call to fail.	124	// TODO review the generated test code and remove the default call to fail.
103	assert null != result : "null result";	125	assert null != result : "null result";

Lines 29-34 Link Here

(-)a/glassfish.tooling/nbproject/project.xml (+1 lines)
29	<friend>org.netbeans.modules.glassfish.eecommon</friend>	29	<friend>org.netbeans.modules.glassfish.eecommon</friend>
30	<friend>org.netbeans.modules.glassfish.javaee</friend>	30	<friend>org.netbeans.modules.glassfish.javaee</friend>
31	<friend>org.netbeans.modules.j2ee.sun.appsrv81</friend>	31	<friend>org.netbeans.modules.j2ee.sun.appsrv81</friend>
		32	<friend>org.netbeans.modules.j2ee.sun.ddui</friend>
32	<package>org.netbeans.modules.glassfish.tooling</package>	33	<package>org.netbeans.modules.glassfish.tooling</package>
33	<package>org.netbeans.modules.glassfish.tooling.data</package>	34	<package>org.netbeans.modules.glassfish.tooling.data</package>
34	<package>org.netbeans.modules.glassfish.tooling.data.cloud</package>	35	<package>org.netbeans.modules.glassfish.tooling.data.cloud</package>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

import java.util.HashMap;
import java.util.Map;
import org.netbeans.modules.glassfish.tooling.logging.Logger;
import org.netbeans.modules.glassfish.tooling.utils.EnumUtils;

/**
 * GlassFish server version.

    }

    ////////////////////////////////////////////////////////////////////////////
    // Instance attributes                                                    //
    ////////////////////////////////////////////////////////////////////////////

    /** Major version number. */

     * @return Value of <code>true</code> when all parts of version numbers are
     *         the same or <code>false</code> otherwise.
     */
    @SuppressWarnings("AccessingNonPublicFieldOfAnotherObject")
    public boolean equals(final GlassFishVersion version) {
        if (version == null) {
            return false;

        }
    }

    /** {@inheritDoc} */
    public static boolean eq(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
        return EnumUtils.eq(v1, v2);
    }

     /** {@inheritDoc} */
    public static boolean ne(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
        return EnumUtils.ne(v1, v2);
    }

     /** {@inheritDoc} */
    public static boolean lt(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
        return EnumUtils.lt(v1, v2);
    }

     /** {@inheritDoc} */
    public static boolean le(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
        return EnumUtils.le(v1, v2);
    }

    /** {@inheritDoc} */
    public static boolean gt(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
        return EnumUtils.gt(v1, v2);
    }

     /** {@inheritDoc} */
    public static boolean ge(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
        return EnumUtils.ge(v1, v2);
    }

    /**
     * Convert <code>GlassFishVersion</code> value to <code>String</code>.
     * <p/>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.tooling.utils;

/**
 * Enumeration helper methods:<ul>
 * <li>Ordinal value based comparison.</li>
 * </ul>
 * @author Tomas Kraus
 */
public final class EnumUtils {
    
    /**
     * Ordinal value based comparison: <i>equals</i> {@code v1 == v2}.
     * <p/>
     * @param v1 First {@link Enum} instance to be compared.
     * @param v2 Second {@link Enum} instance to be compared.
     * @return Value of {@code true} when ordinal values of {@code v1}
     *         and {@code v2} are equal or both values are {@code null}.
     *         Value of {@code false} otherwise.
     */
    public static final boolean eq(
            final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
        return v1 != null
                ? (v2 != null ? v1.ordinal() == v2.ordinal() : false)
                : v2 == null;
    }

    /**
     * Ordinal value based comparison: <i>not equals</i> {@code v1 != v2}.
     * <p/>
     * @param v1 First {@link Enum} instance to be compared.
     * @param v2 Second {@link Enum} instance to be compared.
     * @return Value of {@code true} when ordinal values of {@code v1}
     *         and {@code v2} are not equal or one of the values
     *         is {@code null} and second one is not {@code null}. Value
     *         of {@code false} otherwise.
     */
    public static final boolean ne(
            final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
        return v1 != null
                ? (v2 != null ? v1.ordinal() != v2.ordinal() : true)
                : v2 != null;
    }

    /**
     * Ordinal value based comparison: <i>less than</i> {@code v1 < v2}.
     * Value of {@code null} is considered less than any ordinal value.
     * <p/>
     * @param v1 First {@link Enum} instance to be compared.
     * @param v2 Second {@link Enum} instance to be compared.
     * @return Value of {@code true} when ordinal values of {@code v1}
     *         is less than {@code v2} or {@code v1} is {@code null} 
     *         and {@code v2} is not {@code null}. Value of {@code false}
     *         otherwise. 
     */
    public static final boolean lt(
            final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
        return v1 != null
                ? (v2 != null ? v1.ordinal() < v2.ordinal() : false)
                : v2 != null;
    }

    /**
     * Ordinal value based comparison: <i>less than or equal</i> {@code v1 <= v2}.
     * Value of {@code null} is considered less than any ordinal value.
     * <p/>
     * @param v1 First {@link Enum} instance to be compared.
     * @param v2 Second {@link Enum} instance to be compared.
     * @return Value of {@code true} when ordinal values of {@code v1}
     *         is less than or equal to {@code v2} or {@code v1} is {@code null} 
     *         and {@code v2} is not {@code null}. Value of {@code false}
     *         otherwise. 
     */
    public static final boolean le(
            final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
        return v1 != null
                ? (v2 != null ? v1.ordinal() <= v2.ordinal() : false)
                : true;
    }

    /**
     * Ordinal value based comparison: <i>greater than</i> {@code v1 > v2}.
     * Value of {@code null} is considered less than any ordinal value.
     * <p/>
     * @param v1 First {@link Enum} instance to be compared.
     * @param v2 Second {@link Enum} instance to be compared.
     * @return Value of {@code true} when ordinal values of {@code v1}
     *         is greater than {@code v2} or {@code v1} is {@code null} 
     *         and {@code v2} is not {@code null}. Value of {@code false}
     *         otherwise. 
     */
    public static final boolean gt(
            final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
        return v1 != null
                ? (v2 != null ? v1.ordinal() > v2.ordinal() : true)
                : false;
    }

    /**
     * Ordinal value based comparison: <i>greater than or equal</i> {@code v1 >= v2}.
     * Value of {@code null} is considered less than any ordinal value.
     * <p/>
     * @param v1 First {@link Enum} instance to be compared.
     * @param v2 Second {@link Enum} instance to be compared.
     * @return Value of {@code true} when ordinal values of {@code v1}
     *         is greater than or equal to {@code v2} or {@code v1} is not {@code null} 
     *         and {@code v2} is {@code null}. Value of {@code false}
     *         otherwise. 
     */
    public static final boolean ge(
            final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
        return v1 != null
                ? (v2 != null ? v1.ordinal() >= v2.ordinal() : true)
                : v2 == null;
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, 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-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2015 Sun Microsystems, Inc.
 */
package org.netbeans.modules.glassfish.tooling.utils;

import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3;
import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;

/**
 * Test enumeration utilities.
 * <p>
 * @author Tomas Kraus
 */
@Test(groups = {"unit-tests"})
public class EnumUtilsTest {
    
    
    /**
     * Test equals method.
     * Expected results:<ul>
     * <li>{@code a > b}: false</li>
     * <li>{@code a == b}: true</li>
     * <li>{@code a < b}: false</li>
     * <li>{@code a, null}: false</li>
     * <li>{@code null, b}: false</li>
     * <li>{@code null, null}: true</li></ul>
     */
    @Test
    public void testEq() {
        assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false.");
        assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true.");
        assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false.");
        assertFalse(EnumUtils.eq(GF_3, null), "Equals for a, null shall be false.");
        assertFalse(EnumUtils.eq(null, GF_3), "Equals for null, b shall be false.");
        assertTrue(EnumUtils.eq(null, null), "Equals for null, null shall be true.");
    }

    /**
     * Test not equals method.
     * Expected results:<ul>
     * <li>{@code a > b}: true</li>
     * <li>{@code a == b}: false</li>
     * <li>{@code a < b}: true</li>
     * <li>{@code a, null}: true</li>
     * <li>{@code null, b}: true</li>
     * <li>{@code null, null}: false</li></ul>
     */
    @Test
    public void testNe() {
        assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true.");
        assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false.");
        assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true.");
        assertTrue(EnumUtils.ne(GF_3, null), "Not equals for a, null shall be true.");
        assertTrue(EnumUtils.ne(null, GF_3), "Not equals for null, b shall be true.");
        assertFalse(EnumUtils.ne(null, null), "Not equals for null, null shall be false.");
    }

    /**
     * Test less than method.
     * Expected results:<ul>
     * <li>{@code a > b}: false</li>
     * <li>{@code a == b}: false</li>
     * <li>{@code a < b}: true</li>
     * <li>{@code a, null}: false</li>
     * <li>{@code null, b}: true</li>
     * <li>{@code null, null}: false</li></ul>
     */
    @Test
    public void testLt() {
        assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false.");
        assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false.");
        assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true.");
        assertFalse(EnumUtils.lt(GF_3, null), "Less than for a, null shall be false.");
        assertTrue(EnumUtils.lt(null, GF_3), "Less than for null, b shall be true.");
        assertFalse(EnumUtils.lt(null, null), "Less than for null, null shall be false.");
    }

    /**
     * Test less than or equal method.
     * Expected results:<ul>
     * <li>{@code a > b}: false</li>
     * <li>{@code a == b}: true</li>
     * <li>{@code a < b}: true</li>
     * <li>{@code a, null}: false</li>
     * <li>{@code null, b}: true</li>
     * <li>{@code null, null}: true</li></ul>
     */
    @Test
    public void testLe() {
        assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false.");
        assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true.");
        assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true.");
        assertFalse(EnumUtils.le(GF_3, null), "Less than or equal for a, null shall be false.");
        assertTrue(EnumUtils.le(null, GF_3), "Less than or equal for null, b shall be true.");
        assertTrue(EnumUtils.le(null, null), "Less than or equal for null, null shall be true.");
    }

   /**
     * Test greater than method.
     * Expected results:<ul>
     * <li>{@code a > b}: true</li>
     * <li>{@code a == b}: false</li>
     * <li>{@code a < b}: false</li>
     * <li>{@code a, null}: true</li>
     * <li>{@code null, b}: false</li>
     * <li>{@code null, null}: false</li></ul>
     */
    @Test
    public void testGt() {
        assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true.");
        assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false.");
        assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false.");
        assertTrue(EnumUtils.gt(GF_3, null), "Greater than for a, null shall be true.");
        assertFalse(EnumUtils.gt(null, GF_3), "Greater than for null, b shall be false.");
        assertFalse(EnumUtils.gt(null, null), "Greater than for null, null shall be false.");
    }

    /**
     * Test greater than or equal method.
     * Expected results:<ul>
     * <li>{@code a > b}: true</li>
     * <li>{@code a == b}: true</li>
     * <li>{@code a < b}: false</li>
     * <li>{@code a, null}: true</li>
     * <li>{@code null, b}: false</li>
     * <li>{@code null, null}: true</li></ul>
     */
    @Test
    public void testGe() {
        assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true.");
        assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true.");
        assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");
        assertTrue(EnumUtils.ge(GF_3, null), "Greater than or equal for a, null shall be true.");
        assertFalse(EnumUtils.ge(null, GF_3), "Greater than or equal for null, b shall be false.");
        assertTrue(EnumUtils.ge(null, null), "Greater than or equal for null, null shall be true.");
    }

}




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.glassfish.tooling</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0-1</release-version>
                        <specification-version>1.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.

package org.netbeans.modules.j2ee.sun.share.configbean;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
import java.util.Set;

import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;
import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
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.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.sun.api.CmpMappingProvider;
import org.netbeans.modules.j2ee.sun.api.ResourceConfiguratorInterface;
import org.netbeans.modules.j2ee.sun.api.SunDeploymentManagerInterface;

import org.openide.util.RequestProcessor;


/**
 * Manages the deployment plan I/O and access for initializing DConfigBeans
 * <p/>
 * @author Vince Kraemer, Peter Williams, Tomas Kraus
 */ 
public class SunONEDeploymentConfiguration
extends GlassfishConfiguration implements DeploymentConfiguration {

    /**
     * inject cmp bean & field update support into descriptor listener factories

    private SunDeploymentManagerInterface sdmi;
    

    /**
     * Create an instance of SunONEDeploymentConfiguration for GF V2
     * and earlier servers.
     *
     * @param module  J2eeModule instance for the project represented by this config.
     * @param mySdmi  Sun deployment manager.
     * @param version GlassFish server version.
     *
     * @throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
     */
    public SunONEDeploymentConfiguration(
            final J2eeModule module, final SunDeploymentManagerInterface mySdmi,
            final GlassFishVersion version
    ) throws ConfigurationException {
        super(module, version);
        this.sdmi = mySdmi;
    }

    /**
     * Create an instance of SunONEDeploymentConfiguration for Webserver.
     *
     * @param module J2eeModule instance for the project represented by this config.
     * @param webServerDDName short name for web server sun dd
     * @param version GlassFish server version.
     *
     * @throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
     */
    public SunONEDeploymentConfiguration(
            final J2eeModule module, final String webServerDDName,
            final GlassFishVersion version
    ) throws ConfigurationException {
        super(module, J2eeModuleHelper.getWsModuleHelper(webServerDDName), version);
    }

    /** Deprecated form used for JSR-88.  Only exists to keep legacy parts of

Return to bug 233481

Lines 1-7 Link Here

(-)a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java (-2 / +34 lines)
1	/*	1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*	3	*
4	* Copyright 2012-2013 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 2012-2015 Oracle and/or its affiliates. All rights reserved.
5	*	5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 42-47 Link Here
42	import java.util.HashMap;	42	import java.util.HashMap;
43	import java.util.Map;	43	import java.util.Map;
44	import org.netbeans.modules.glassfish.tooling.logging.Logger;	44	import org.netbeans.modules.glassfish.tooling.logging.Logger;
		45	import org.netbeans.modules.glassfish.tooling.utils.EnumUtils;
45		46
46	/**	47	/**
47	* GlassFish server version.	48	* GlassFish server version.
Lines 271-277 Link Here
271	}	272	}
272		273
273	////////////////////////////////////////////////////////////////////////////	274	////////////////////////////////////////////////////////////////////////////
274	// Class attributes //	275	// Instance attributes //
275	////////////////////////////////////////////////////////////////////////////	276	////////////////////////////////////////////////////////////////////////////
276		277
277	/** Major version number. */	278	/** Major version number. */
Lines 372-377 Link Here
372	* @return Value of <code>true</code> when all parts of version numbers are	373	* @return Value of <code>true</code> when all parts of version numbers are
373	* the same or <code>false</code> otherwise.	374	* the same or <code>false</code> otherwise.
374	*/	375	*/
		376	@SuppressWarnings("AccessingNonPublicFieldOfAnotherObject")
375	public boolean equals(final GlassFishVersion version) {	377	public boolean equals(final GlassFishVersion version) {
376	if (version == null) {	378	if (version == null) {
377	return false;	379	return false;
Lines 383-388 Link Here
383	}	385	}
384	}	386	}
385		387
		388	/** {@inheritDoc} */
		389	public static boolean eq(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
		390	return EnumUtils.eq(v1, v2);
		391	}
		392
		393	/** {@inheritDoc} */
		394	public static boolean ne(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
		395	return EnumUtils.ne(v1, v2);
		396	}
		397
		398	/** {@inheritDoc} */
		399	public static boolean lt(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
		400	return EnumUtils.lt(v1, v2);
		401	}
		402
		403	/** {@inheritDoc} */
		404	public static boolean le(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
		405	return EnumUtils.le(v1, v2);
		406	}
		407
		408	/** {@inheritDoc} */
		409	public static boolean gt(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
		410	return EnumUtils.gt(v1, v2);
		411	}
		412
		413	/** {@inheritDoc} */
		414	public static boolean ge(Enum<GlassFishVersion> v1, Enum<GlassFishVersion> v2) {
		415	return EnumUtils.ge(v1, v2);
		416	}
		417
386	/**	418	/**
387	* Convert <code>GlassFishVersion</code> value to <code>String</code>.	419	* Convert <code>GlassFishVersion</code> value to <code>String</code>.
388	* <p/>	420	* <p/>

Lines 1-7 Link Here

(-)a/glassfish.common/src/org/netbeans/modules/glassfish/spi/Utils.java (-4 / +5 lines)
1	/*	1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*	3	*
4	* Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 2009-2015 Oracle and/or its affiliates. All rights reserved.
5	*	5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 61-68 Link Here
61	import org.openide.filesystems.FileUtil;	61	import org.openide.filesystems.FileUtil;
62		62
63	/**	63	/**
64	*	64	* Utilities.
65	* @author vbk	65	* <p/>
		66	* @author Vince Kraemer
66	*/	67	*/
67	public class Utils {	68	public class Utils {
68		69
Lines 416-422 Link Here
416		417
417	/**	418	/**
418	* Use the server instance id for a project to decide whether the server specific DD/resource	419	* Use the server instance id for a project to decide whether the server specific DD/resource
419	* file should use the glassfish- prefix.	420	* file should use the {@code glassfish-} prefix.
420	*	421	*
421	* @param serverInstanceID	422	* @param serverInstanceID
422	* @return	423	* @return

Lines 1-7 Link Here

(-)a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java (-9 / +11 lines)
1	/*	1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*	3	*
4	* Copyright 2010-2013 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 2010-2015 Oracle and/or its affiliates. All rights reserved.
5	*	5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 57-77 Link Here
57	import org.openide.filesystems.FileUtil;	57	import org.openide.filesystems.FileUtil;
58		58
59	/**	59	/**
60	*	60	* Java EE module helper.
61	* @author Peter Williams	61	* <p/>
		62	* @author Peter Williams, Tomas Kraus
62	*/	63	*/
63	public abstract class J2eeModuleHelper {	64	public abstract class J2eeModuleHelper {
64		65
65	/** Web application meta data directory. */	66	/** Web application meta data directory. */
66	public static final String WEB_INF = "WEB-INF";	67	public static final String WEB_INF = JavaEEModule.WEB_INF;
67		68
68	/** GlassFish specific meta data file for version 1 and 2. */	69	/** GlassFish specific meta data file for version since version 3.1. */
		70	public static final String GF_WEB_XML_V2
		71	= WEB_INF + File.separatorChar + GlassfishConfiguration.RESOURCE_FILES[0];
		72
		73	/** GlassFish specific meta data file for version 1, 2 and 3.0. */
69	public static final String GF_WEB_XML_V1	74	public static final String GF_WEB_XML_V1
70	= WEB_INF + File.separatorChar + "sun-web.xml";	75	= WEB_INF + File.separatorChar + GlassfishConfiguration.RESOURCE_FILES[1];
71		76
72	/** GlassFish specific meta data file for version 3 and 4. */
73	public static final String GF_WEB_XML_V2
74	= WEB_INF + File.separatorChar + "glassfish-web.xml";
75		77
76	private static final Map<Object, J2eeModuleHelper> helperMap;	78	private static final Map<Object, J2eeModuleHelper> helperMap;
77	private static final Map<Object, J2eeModuleHelper> gfhelperMap;	79	private static final Map<Object, J2eeModuleHelper> gfhelperMap;

Added Link Here

(-)3a3c32bf146f (+185 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.eecommon.api.config;
43
44	import java.util.HashMap;
45	import java.util.Map;
46	import java.util.logging.Logger;
47	import javax.enterprise.deploy.shared.ModuleType;
48	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
49
50	// This is J2eeModule.Type rewritten as Enum. I could not modify original class
51	// because it's API.
52	/**
53	* Java EE module types.
54	* <p/>
55	* @author Tomas Kraus
56	*/
57	public enum JavaEEModule {
58
59	////////////////////////////////////////////////////////////////////////////
60	// Enum values //
61	////////////////////////////////////////////////////////////////////////////
62
63	/** Client application archive. */
64	CAR(ModuleType.CAR),
65	/** Enterprise application archive */
66	EAR(ModuleType.EAR),
67	/** Enterprise Java bean archive. */
68	EJB(ModuleType.EJB),
69	/** Connector archive. */
70	RAR(ModuleType.RAR),
71	/** Web application archive. */
72	WAR(ModuleType.WAR);
73
74	////////////////////////////////////////////////////////////////////////////
75	// Class attributes //
76	////////////////////////////////////////////////////////////////////////////
77
78	/** GlassFish Java EE common module Logger. */
79	private static final Logger LOGGER = Logger.getLogger("glassfish-eecommon");
80
81	/** JavaEEModule version enumeration length. */
82	public static final int length = JavaEEModule.values().length;
83
84	/** Name of web application configuration directory. */
85	public static final String WEB_INF = "WEB-INF";
86
87	/** Name of java archive manifest directory. */
88	public static final String META_INF = "META-INF";
89
90	/** {@link J2eeModule.Type} to {@link JavaEEModule} conversion map. */
91	private static final Map<J2eeModule.Type, JavaEEModule> j2eeModuleTypeToValue
92	= new HashMap<J2eeModule.Type, JavaEEModule>(2*length);
93
94	// Initialize J2eeModule.Type to JavaEEModule conversion map.
95	static {
96	j2eeModuleTypeToValue.put(J2eeModule.Type.CAR, CAR);
97	j2eeModuleTypeToValue.put(J2eeModule.Type.EAR, EAR);
98	j2eeModuleTypeToValue.put(J2eeModule.Type.EJB, EJB);
99	j2eeModuleTypeToValue.put(J2eeModule.Type.RAR, RAR);
100	j2eeModuleTypeToValue.put(J2eeModule.Type.WAR, WAR);
101	}
102
103	////////////////////////////////////////////////////////////////////////////
104	// Static methods //
105	////////////////////////////////////////////////////////////////////////////
106
107	/**
108	* Get Java EE module configuration directory (e.g. {@code "META-INF"}).
109	* This is just {@link J2eeModule.Type} shortcut.
110	* <p/>
111	* @param type {@link J2eeModule.Type} instance of Java EE module type.
112	* @return Java EE module configuration directory for known Java EE
113	* module type or {@code null} when provided Java EE module type
114	* is not known.
115	*/
116	public static final String getConfigDir(J2eeModule.Type type) {
117	JavaEEModule configDir = JavaEEModule.toValue(type);
118	return type != null ? configDir.getConfigDir() : null;
119	}
120
121	/**
122	* Convert {@link J2eeModule.Type} to {@link JavaEEModule}.
123	* <p/>
124	* @param type {@link ModuleType} value to be converted.
125	* @return {@link J2eeModule.Type} value corresponding to provided
126	* {@link ModuleType} value.
127	*/
128	@SuppressWarnings("deprecation")
129	public static JavaEEModule toValue(final J2eeModule.Type type) {
130	return j2eeModuleTypeToValue.get(type);
131	}
132
133	////////////////////////////////////////////////////////////////////////////
134	// Instance attributes //
135	////////////////////////////////////////////////////////////////////////////
136
137	/** Java EE module type. */
138	private final ModuleType moduleType;
139
140	////////////////////////////////////////////////////////////////////////////
141	// Constructors //
142	////////////////////////////////////////////////////////////////////////////
143
144	/**
145	* Creates an instance of Java EE module type.
146	* <p/>
147	* @param moduleType Java EE module type.
148	*/
149	private JavaEEModule(final ModuleType moduleType) {
150	this.moduleType = moduleType;
151	}
152
153	////////////////////////////////////////////////////////////////////////////
154	// Methods //
155	////////////////////////////////////////////////////////////////////////////
156
157	/**
158	* Get stored {@link ModuleType} value.
159	* <p/>
160	* @return Stored {@link ModuleType} value.
161	*/
162	private ModuleType getModuleType() {
163	return moduleType;
164	}
165
166	/**
167	* Get Java EE module configuration directory (e.g. {@code "META-INF"}).
168	* <p/>
169	* @return Java EE module configuration directory.
170	*/
171	public String getConfigDir() {
172	switch (this) {
173	case CAR:
174	case EAR:
175	case EJB:
176	case RAR:
177	return META_INF;
178	case WAR:
179	return WEB_INF;
180	default:
181	throw new IllegalArgumentException("Unknown Java EE module type.");
182	}
183	}
184
185	}

Added Link Here

(-)3a3c32bf146f (+138 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.eecommon.api.config;
43
44	import java.beans.PropertyChangeListener;
45	import java.io.File;
46	import java.util.Collections;
47	import java.util.Iterator;
48	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
49	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation2;
50	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
51	import org.openide.filesystems.FileObject;
52	import org.openide.filesystems.FileUtil;
53
54	/**
55	* Java EE module for GlassFish features tests.
56	* <p/>
57	* @author Tomas Kraus
58	*/
59	public class GFTestEEModuleImpl implements J2eeModuleImplementation2 {
60
61	private final FileObject appRoot;
62	private final File srcDir;
63	private final File configDir;
64	private final J2eeModule.Type moduleType;
65	private final String moduleVersion;
66
67	/** Creates a new instance of TestJ2eeModule
68	* @param appRoot Application root directory.
69	* @param moduleType Java EE module type.
70	* @param moduleVersion Java EE version.
71	*/
72	public GFTestEEModuleImpl(
73	final FileObject appRoot, final J2eeModule.Type moduleType,
74	final String moduleVersion
75	) {
76	this.appRoot = appRoot;
77	this.srcDir = new File(FileUtil.toFile(appRoot), "src");
78	this.configDir = new File(srcDir, "conf");
79	this.moduleType = moduleType;
80	this.moduleVersion = moduleVersion;
81	}
82
83	@Override
84	public FileObject getArchive() {
85	return null;
86	}
87
88	@Override
89	public Iterator<J2eeModule.RootedEntry> getArchiveContents() {
90	return Collections.<J2eeModule.RootedEntry>emptySet().iterator();
91	}
92
93	@Override
94	public FileObject getContentDirectory() {
95	return appRoot;
96	}
97
98	@Override
99	public J2eeModule.Type getModuleType() {
100	return moduleType;
101	}
102
103	@Override
104	public String getModuleVersion() {
105	return moduleVersion;
106	}
107
108	@Override
109	public String getUrl() {
110	throw new UnsupportedOperationException("Not implemented.");
111	}
112
113	@Override
114	public File getResourceDirectory() {
115	return new File(FileUtil.toFile(appRoot), "setup");
116	}
117
118	@Override
119	public File getDeploymentConfigurationFile(String name) {
120	return new File(configDir, name);
121	}
122
123	@Override
124	public void addPropertyChangeListener(PropertyChangeListener listener) {
125	throw new UnsupportedOperationException("Not implemented.");
126	}
127
128	@Override
129	public void removePropertyChangeListener(PropertyChangeListener listener) {
130	throw new UnsupportedOperationException("Not implemented.");
131	}
132
133	@Override
134	public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
135	throw new UnsupportedOperationException("Not implemented.");
136	}
137
138	}

Added Link Here

(-)3a3c32bf146f (+304 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.eecommon.api.config;
43
44	import java.io.File;
45	import java.io.IOException;
46	import java.lang.reflect.InvocationTargetException;
47	import java.lang.reflect.Method;
48	import java.util.HashSet;
49	import java.util.Set;
50	import org.junit.After;
51	import org.junit.AfterClass;
52	import org.junit.Before;
53	import org.junit.BeforeClass;
54	import org.junit.Test;
55	import org.netbeans.api.j2ee.core.Profile;
56	import org.netbeans.junit.NbTestCase;
57	import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
58	import org.netbeans.modules.glassfish.tooling.utils.OsUtils;
59	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
60	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleFactory;
61	import org.openide.filesystems.FileObject;
62	import org.openide.filesystems.FileUtil;
63
64	/**
65	* GlassFish Java EE server configuration API support tests.
66	* <p/>
67	* @author Tomas Kraus
68	*/
69	public class GlassfishConfigurationTest extends NbTestCase {
70
71	private GFTestEEModuleImpl moduleImplCar;
72	private J2eeModule moduleCar;
73	private GFTestEEModuleImpl moduleImplEjb;
74	private J2eeModule moduleEjb;
75	private GFTestEEModuleImpl moduleImplEar;
76	private J2eeModule moduleEar;
77	private GFTestEEModuleImpl moduleImplWar;
78	private J2eeModule moduleWar;
79	private GFTestEEModuleImpl moduleImplRar;
80	private J2eeModule moduleRar;
81
82	public GlassfishConfigurationTest(final String testName) {
83	super(testName);
84	}
85
86	@BeforeClass
87	public static void setUpClass() throws Exception {
88	}
89
90	@AfterClass
91	public static void tearDownClass() throws Exception {
92	}
93
94	@Before
95	@Override
96	public void setUp() throws Exception {
97	final File dataDir = getDataDir();
98	final File rootFolder = new File(dataDir, "gfsample");
99	rootFolder.mkdirs();
100	final FileObject rootFolderFO = FileUtil.toFileObject(rootFolder);
101	moduleImplCar = new GFTestEEModuleImpl(
102	rootFolderFO, J2eeModule.Type.CAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
103	moduleCar = J2eeModuleFactory.createJ2eeModule(moduleImplCar);
104	moduleImplEjb = new GFTestEEModuleImpl(
105	rootFolderFO, J2eeModule.Type.EJB, Profile.JAVA_EE_7_FULL.toPropertiesString());
106	moduleEjb = J2eeModuleFactory.createJ2eeModule(moduleImplEjb);
107	moduleImplEar = new GFTestEEModuleImpl(
108	rootFolderFO, J2eeModule.Type.EAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
109	moduleEar = J2eeModuleFactory.createJ2eeModule(moduleImplEar);
110	moduleImplRar = new GFTestEEModuleImpl(
111	rootFolderFO, J2eeModule.Type.RAR, Profile.JAVA_EE_7_FULL.toPropertiesString());
112	moduleRar = J2eeModuleFactory.createJ2eeModule(moduleImplRar);
113	moduleImplWar = new GFTestEEModuleImpl(
114	rootFolderFO, J2eeModule.Type.WAR, Profile.JAVA_EE_7_WEB.toPropertiesString());
115	moduleWar = J2eeModuleFactory.createJ2eeModule(moduleImplWar);
116	}
117
118	@After
119	@Override
120	public void tearDown() {
121	// Pass everything to GC.
122	moduleImplCar = null;
123	moduleCar = null;
124	moduleImplEjb = null;
125	moduleEjb = null;
126	moduleImplEar = null;
127	moduleEar = null;
128	moduleImplRar = null;
129	moduleRar = null;
130	moduleImplWar = null;
131	moduleWar = null;
132	}
133
134	/**
135	* Test Java EE module directory structure for resource file.
136	* @throws NoSuchMethodException when there is a problem with reflection.
137	* @throws IllegalAccessException when there is a problem with reflection.
138	* @throws IllegalArgumentException when there is a problem with reflection.
139	* @throws InvocationTargetException when there is a problem with reflection.
140	*/
141	@Test
142	public void testResourceFilePath()
143	throws NoSuchMethodException, IllegalAccessException,
144	IllegalArgumentException, InvocationTargetException {
145	final Method resourceFilePath = GlassfishConfiguration.class.getDeclaredMethod(
146	"resourceFilePath", J2eeModule.class, String.class);
147	resourceFilePath.setAccessible(true);
148
149	final String pathFragment = "myDirectory";
150	final String verifyConfigDirCar = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
151	final String verifyConfigDirEjb = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
152	final String verifyConfigDirEar = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
153	final String verifyConfigDirRar = OsUtils.joinPaths(JavaEEModule.META_INF, pathFragment);
154	final String verifyConfigDirWar = OsUtils.joinPaths(JavaEEModule.WEB_INF, pathFragment);
155	final String configDirCar = (String)resourceFilePath.invoke(null, moduleCar, pathFragment);
156	final String configDirEjb = (String)resourceFilePath.invoke(null, moduleEjb, pathFragment);
157	final String configDirEar = (String)resourceFilePath.invoke(null, moduleEar, pathFragment);
158	final String configDirRar = (String)resourceFilePath.invoke(null, moduleRar, pathFragment);
159	final String configDirWar = (String)resourceFilePath.invoke(null, moduleWar, pathFragment);
160	assertEquals("Expected resource file path for CAR is: " + verifyConfigDirCar,
161	verifyConfigDirCar, configDirCar);
162	assertEquals("Expected resource file path for EJB is: " + verifyConfigDirEjb,
163	verifyConfigDirEjb, configDirEjb);
164	assertEquals("Expected resource file path for EAR is: " + verifyConfigDirEar,
165	verifyConfigDirEar, configDirEar);
166	assertEquals("Expected resource file path for RAR is: " + verifyConfigDirRar,
167	verifyConfigDirRar, configDirRar);
168	assertEquals("Expected resource file path for WAR is: " + verifyConfigDirWar,
169	verifyConfigDirWar, configDirWar);
170	}
171
172	/**
173	* Test new GlassFish resources file name generation depending on passed {@link GlassFishVersion}.
174	* Expected values are:<ul>
175	* <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
176	* on GlassFish older than 3.1</li\>
177	* <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
178	* on GlassFish 3.1 and later</li\>
179	* <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish older than 3.1</li\>
180	* <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish 3.1 and later</li\></ul>
181	*/
182	@Test
183	public void testGetNewResourceFile() {
184	for (GlassFishVersion version : GlassFishVersion.values()) {
185	final File resourceFileCar = GlassfishConfiguration.getNewResourceFile(moduleCar, version);
186	final File resourceFileEar = GlassfishConfiguration.getNewResourceFile(moduleEar, version);
187	final File resourceFileEjb = GlassfishConfiguration.getNewResourceFile(moduleEjb, version);
188	final File resourceFileRar = GlassfishConfiguration.getNewResourceFile(moduleRar, version);
189	final File resourceFileWar = GlassfishConfiguration.getNewResourceFile(moduleWar, version);
190	final File verifyPrefixCar = moduleCar.getDeploymentConfigurationFile(
191	JavaEEModule.getConfigDir(moduleCar.getType()));
192	final File verifyPrefixEar = moduleEar.getDeploymentConfigurationFile(
193	JavaEEModule.getConfigDir(moduleEar.getType()));
194	final File verifyPrefixEjb = moduleEjb.getDeploymentConfigurationFile(
195	JavaEEModule.getConfigDir(moduleEjb.getType()));
196	final File verifyPrefixRar = moduleRar.getDeploymentConfigurationFile(
197	JavaEEModule.getConfigDir(moduleRar.getType()));
198	final File verifyPrefixWar = moduleWar.getDeploymentConfigurationFile(
199	JavaEEModule.getConfigDir(moduleWar.getType()));
200	final String fileName = GlassFishVersion.lt(version, GlassFishVersion.GF_3_1)
201	? "sun-resources.xml"
202	: "glassfish-resources.xml";
203	final File verifyFileCar = new File(verifyPrefixCar, fileName);
204	final File verifyFileEar = new File(verifyPrefixEar, fileName);
205	final File verifyFileEjb = new File(verifyPrefixEjb, fileName);
206	final File verifyFileRar = new File(verifyPrefixRar, fileName);
207	final File verifyFileWar = new File(verifyPrefixWar, fileName);
208	assertTrue("New resource file for " + version.toString() + " CAR: " + verifyFileCar.toString(),
209	verifyFileCar.equals(resourceFileCar));
210	assertTrue("New resource file for " + version.toString() + " EAR: " + verifyFileEar.toString(),
211	verifyFileEar.equals(resourceFileEar));
212	assertTrue("New resource file for " + version.toString() + " EJB: " + verifyFileEjb.toString(),
213	verifyFileEjb.equals(resourceFileEjb));
214	assertTrue("New resource file for " + version.toString() + " RAR: " + verifyFileRar.toString(),
215	verifyFileRar.equals(resourceFileRar));
216	assertTrue("New resource file for " + version.toString() + " WAR: " + verifyFileWar.toString(),
217	verifyFileWar.equals(resourceFileWar));
218	}
219	}
220
221
222	/**
223	* Verify that proper resource file from Java EE module is returned.
224	* Both {@code sun-resources.xml} and {@code glassfish-resources.xml} are available
225	* in Java EE module configuration directory on the disk.
226	* Expected values are:<ul>
227	* <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
228	* on GlassFish older than 3.1</li\>
229	* <li>PREFIX/src/conf/META_INF/sun-resources.xml for CAR, EAR, EJB and RAR
230	* on GlassFish 3.1 and later</li\>
231	* <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish older than 3.1</li\>
232	* <li>PREFIX/src/conf/WEB_INF/sun-resources.xml for WAR on GlassFish 3.1 and later</li\></ul>
233	*/
234	@Test
235	public void testGetExistingResourceFile() throws IOException {
236	final File prefixCar = moduleCar.getDeploymentConfigurationFile(
237	JavaEEModule.getConfigDir(moduleCar.getType()));
238	final File prefixEar = moduleEar.getDeploymentConfigurationFile(
239	JavaEEModule.getConfigDir(moduleEar.getType()));
240	final File prefixEjb = moduleEjb.getDeploymentConfigurationFile(
241	JavaEEModule.getConfigDir(moduleEjb.getType()));
242	final File prefixRar = moduleRar.getDeploymentConfigurationFile(
243	JavaEEModule.getConfigDir(moduleRar.getType()));
244	final File prefixWar = moduleWar.getDeploymentConfigurationFile(
245	JavaEEModule.getConfigDir(moduleWar.getType()));
246	final Set<File> prefixes = new HashSet<File>(5);
247	prefixes.add(prefixCar);
248	prefixes.add(prefixEar);
249	prefixes.add(prefixEjb);
250	prefixes.add(prefixRar);
251	prefixes.add(prefixWar);
252	// Create all resource files (they are empty but it's enough for this test).
253	for (File prefix : prefixes) {
254	final File sunResource = new File(prefix, "sun-resources.xml");
255	final File gfResource = new File(prefix, "glassfish-resources.xml");
256	prefix.mkdirs();
257	sunResource.createNewFile();
258	gfResource.createNewFile();
259	}
260	for (GlassFishVersion version : GlassFishVersion.values()) {
261	File resourcesCar = GlassfishConfiguration.getExistingResourceFile(moduleCar, version);
262	File resourcesEar = GlassfishConfiguration.getExistingResourceFile(moduleEar, version);
263	File resourcesEjb = GlassfishConfiguration.getExistingResourceFile(moduleEjb, version);
264	File resourcesRar = GlassfishConfiguration.getExistingResourceFile(moduleRar, version);
265	File resourcesWar = GlassfishConfiguration.getExistingResourceFile(moduleWar, version);
266	final File verifyPrefixCar = moduleCar.getDeploymentConfigurationFile(
267	JavaEEModule.getConfigDir(moduleCar.getType()));
268	final File verifyPrefixEar = moduleEar.getDeploymentConfigurationFile(
269	JavaEEModule.getConfigDir(moduleEar.getType()));
270	final File verifyPrefixEjb = moduleEjb.getDeploymentConfigurationFile(
271	JavaEEModule.getConfigDir(moduleEjb.getType()));
272	final File verifyPrefixRar = moduleRar.getDeploymentConfigurationFile(
273	JavaEEModule.getConfigDir(moduleRar.getType()));
274	final File verifyPrefixWar = moduleWar.getDeploymentConfigurationFile(
275	JavaEEModule.getConfigDir(moduleWar.getType()));
276	final String fileName = GlassFishVersion.lt(version, GlassFishVersion.GF_3_1)
277	? "sun-resources.xml"
278	: "glassfish-resources.xml";
279	final File verifyFileCar = new File(verifyPrefixCar, fileName);
280	final File verifyFileEar = new File(verifyPrefixEar, fileName);
281	final File verifyFileEjb = new File(verifyPrefixEjb, fileName);
282	final File verifyFileRar = new File(verifyPrefixRar, fileName);
283	final File verifyFileWar = new File(verifyPrefixWar, fileName);
284	assertTrue("Existing resource file for " + version.toString() + " CAR: " + verifyFileCar.toString(),
285	verifyFileCar.equals(resourcesCar));
286	assertTrue("Existing resource file for " + version.toString() + " EAR: " + verifyFileEar.toString(),
287	verifyFileEar.equals(resourcesEar));
288	assertTrue("Existing resource file for " + version.toString() + " EJB: " + verifyFileEjb.toString(),
289	verifyFileEjb.equals(resourcesEjb));
290	assertTrue("Existing resource file for " + version.toString() + " RAR: " + verifyFileRar.toString(),
291	verifyFileRar.equals(resourcesRar));
292	assertTrue("Existing resource file for " + version.toString() + " WAR: " + verifyFileWar.toString(),
293	verifyFileWar.equals(resourcesWar));
294	}
295	// Delete all resource files.
296	for (File prefix : prefixes) {
297	final File sunResource = new File(prefix, "sun-resources.xml");
298	final File gfResource = new File(prefix, "glassfish-resources.xml");
299	sunResource.delete();
300	gfResource.delete();
301	}
302	}
303
304	}

Added Link Here

(-)3a3c32bf146f (+152 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.javaee;
43
44	import org.netbeans.api.annotations.common.NonNull;
45	import org.netbeans.modules.glassfish.common.GlassfishInstance;
46	import org.netbeans.modules.glassfish.common.GlassfishInstanceProvider;
47	import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
48	import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
49	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
50	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
51	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
52	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory2;
53
54	/**
55	* Abstract factory to construct Java EE server configuration API support object.
56	* <p/>
57	* @author Vince Kraemer, Tomas Kraus
58	*/
59	abstract class AbstractHk2ConfigurationFactory implements ModuleConfigurationFactory2 {
60	/** Deployment manager. */
61	private final Hk2DeploymentManager hk2dm;
62
63	/**
64	* Creates a new instance of {@link GlassFishConfigurationFactory
65	*/
66	AbstractHk2ConfigurationFactory(final Hk2DeploymentManager hk2dm) {
67	this.hk2dm = hk2dm;
68	}
69
70	/**
71	* Constructs proper module configuration object without having
72	* GlassFish server.
73	* <p/>
74	* Proper configuration object is selected depending on GlassFish specific
75	* web application meta data file (<code>WEB-INFsun-web.xml</code>
76	* or <code>WEB-INF/glassfish-web.xml</code>) existence.
77	* GlassFish version 3.0 is passed to old module configuration object
78	* to rely on {@code sun-resources.xml} resource file.
79	* GlassFish version 3.1 is passed to new module configuration object
80	* to rely on {@code glassfish-resources.xml} resource file.
81	* <p/>
82	* @param module Java EE module.
83	* @return Module configuration object.
84	* @throws ConfigurationException if there is a problem with the server-specific
85	* configuration.
86	*/
87	@Override
88	public ModuleConfiguration create(final J2eeModule module)
89	throws ConfigurationException {
90	ModuleConfiguration retVal = null;
91	try {
92	if (J2eeModuleHelper.isGlassFishWeb(module)) {
93	retVal = new ModuleConfigurationImpl(
94	module, new Three1Configuration(module, GlassFishVersion.GF_3_1), hk2dm);
95	} else {
96	retVal = new ModuleConfigurationImpl(
97	module, new Hk2Configuration(module, GlassFishVersion.GF_3), hk2dm);
98	}
99	} catch (ConfigurationException ce) {
100	throw ce;
101	} catch (Exception ex) {
102	throw new ConfigurationException(module.toString(), ex);
103	}
104	return retVal;
105	}
106
107	/**
108	* Constructs proper module configuration object depending on
109	* GlassFish server.
110	* <p/>
111	* Proper configuration object is selected depending on GlassFish version.
112	* Old module configuration object is created for server before version 3.1
113	* and new module configuration object for server version 3.1 and later.
114	* <p/>
115	* @param module Java EE module.
116	* @param instanceUrl GlassFish server internal URL.
117	* @return Module configuration object.
118	* @throws ConfigurationException if there is a problem with the server-specific
119	* configuration.
120	*/
121	@Override
122	@SuppressWarnings("UseSpecificCatch")
123	public ModuleConfiguration create(final @NonNull J2eeModule module,
124	final @NonNull String instanceUrl) throws ConfigurationException {
125	ModuleConfiguration retVal = null;
126	final GlassfishInstance instance
127	= GlassfishInstanceProvider.getProvider()
128	.getGlassfishInstance(instanceUrl);
129	final GlassFishVersion version = instance != null
130	? instance.getVersion() : null;
131	try {
132	final Hk2DeploymentManager dm = hk2dm != null
133	? hk2dm
134	: (Hk2DeploymentManager) Hk2DeploymentFactory.createEe6()
135	.getDisconnectedDeploymentManager(instanceUrl);
136	if (version != null
137	&& GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
138	retVal = new ModuleConfigurationImpl(
139	module, new Three1Configuration(module, version), dm);
140	} else {
141	retVal = new ModuleConfigurationImpl(
142	module, new Hk2Configuration(module, version), dm);
143	}
144	} catch (ConfigurationException ce) {
145	throw ce;
146	} catch (Exception ex) {
147	throw new ConfigurationException(module.toString(), ex);
148	}
149	return retVal;
150	}
151
152	}

Lines 1-7 Link Here

(-)a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2Configuration.java (-23 / +44 lines)
1	/*	1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*	3	*
4	* Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
5	*	5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 57-62 Link Here
57	import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;	57	import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;
58	import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;	58	import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
59	import org.netbeans.modules.glassfish.javaee.db.Hk2DatasourceManager;	59	import org.netbeans.modules.glassfish.javaee.db.Hk2DatasourceManager;
		60	import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
60	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;	61	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
61	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;	62	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
62	import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;	63	import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
Lines 65-82 Link Here
65	import org.openide.util.NbBundle;	66	import org.openide.util.NbBundle;
66		67
67	/**	68	/**
68	*	69	* Java EE server configuration API support for GlassFish servers before 3.1.
69	* @author Ludovic Champenois	70	* Covers GlassFish servers before 3.1. Old {@code sun-resources.xml} files are used.
70	* @author Peter Williams	71	* <p/>
		72	* @author Ludovic Champenois, Peter Williams, Tomas Kraus
71	*/	73	*/
72	public class Hk2Configuration extends GlassfishConfiguration implements DeploymentConfiguration {	74	public class Hk2Configuration extends GlassfishConfiguration implements DeploymentConfiguration {
73		75
74	public Hk2Configuration(J2eeModule module) throws ConfigurationException {	76	/**
75	super(module);	77	* Creates an instance of Java EE server configuration API support
		78	* for GlassFish servers before 3.1.
		79	* <p/>
		80	* @param module Java EE module (project).
		81	* @param version GlassFish server version.
		82	* @throws ConfigurationException when there is a problem with Java EE server
		83	* configuration initialization.
		84	*/
		85	public Hk2Configuration(
		86	final J2eeModule module, final GlassFishVersion version
		87	) throws ConfigurationException {
		88	super(module, version);
76	}	89	}
77		90
78	public Hk2Configuration(J2eeModule module, J2eeModuleHelper jmh) throws ConfigurationException {	91	/**
79	super(module, jmh);	92	* Creates an instance of Java EE server configuration API support
		93	* for GlassFish servers before 3.1 with existing {@link J2eeModuleHelper} instance.
		94	* <p/>
		95	* @param module Java EE module (project).
		96	* @param moduleHelper Already existing {@link J2eeModuleHelper} instance.
		97	* @param version GlassFish server version.
		98	* @throws ConfigurationException when there is a problem with Java EE server
		99	* configuration initialization.
		100	*/
		101	public Hk2Configuration(
		102	final J2eeModule module, final J2eeModuleHelper jmh,
		103	final GlassFishVersion version
		104	) throws ConfigurationException {
		105	super(module, jmh, version);
80	}	106	}
81		107
82	@Deprecated	108	@Deprecated
Lines 88-95 Link Here
88	// DatasourceConfiguration support	114	// DatasourceConfiguration support
89	// ------------------------------------------------------------------------	115	// ------------------------------------------------------------------------
90	@Override	116	@Override
91	public Set<Datasource> getDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException {	117	public Set<Datasource> getDatasources() throws ConfigurationException {
92	return Hk2DatasourceManager.getDatasources(module.getResourceDirectory());	118	return Hk2DatasourceManager.getDatasources(module, version);
93	}	119	}
94		120
95	@Override	121	@Override
Lines 98-122 Link Here
98	}	124	}
99		125
100	@Override	126	@Override
101	public Datasource createDatasource(String jndiName, String url, String username, String password, String driver) throws UnsupportedOperationException, org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException, DatasourceAlreadyExistsException {	127	public Datasource createDatasource(
102	File resourceDir = module.getResourceDirectory();	128	final String jndiName, final String url, final String username,
103	if (resourceDir == null) {	129	final String password, final String driver
104	// Unable to create JDBC data source for resource ref.	130	) throws UnsupportedOperationException, ConfigurationException, DatasourceAlreadyExistsException {
105	// postResourceError(NbBundle.getMessage(ModuleConfigurationImpl.class,	131	return Hk2DatasourceManager.createDataSource(
106	// "ERR_NoRefJdbcDataSource", jndiName)); // NOI18N	132	jndiName, url, username, password, driver, module, version);
107	Logger.getLogger("glassfish-javaee").log(Level.WARNING, "Null Resource Folder");
108	throw new ConfigurationException(NbBundle.getMessage(
109	ModuleConfigurationImpl.class, "ERR_NoRefJdbcDataSource", jndiName)); // NOI18N
110	}
111
112	return Hk2DatasourceManager.createDataSource(jndiName, url, username, password, driver, resourceDir,"sun-resources");
113	}	133	}
114		134
115	// ------------------------------------------------------------------------	135	// ------------------------------------------------------------------------
116	// MessageDestinationConfiguration support	136	// MessageDestinationConfiguration support
117	// ------------------------------------------------------------------------	137	// ------------------------------------------------------------------------
118	@Override	138	@Override
119	public Set<MessageDestination> getMessageDestinations() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException {	139	public Set<MessageDestination> getMessageDestinations()
		140	throws ConfigurationException {
120	return Hk2MessageDestinationManager.getMessageDestinations(module.getResourceDirectory(),"sun-resources");	141	return Hk2MessageDestinationManager.getMessageDestinations(module.getResourceDirectory(),"sun-resources");
121	}	142	}
122		143

Added Link Here

(-)3a3c32bf146f (+137 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.javaee.db;
43
44	import java.beans.PropertyChangeListener;
45	import java.io.File;
46	import java.util.Collections;
47	import java.util.Iterator;
48	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
49	import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation2;
50	import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
51	import org.openide.filesystems.FileObject;
52	import org.openide.filesystems.FileUtil;
53
54	/**
55	* Java EE module for GlassFish features tests.
56	* <p/>
57	* @author Tomas Kraus
58	*/
59	public class HK2TestEEModuleImpl implements J2eeModuleImplementation2 {
60
61	private final FileObject appRoot;
62	private final File srcDir;
63	private final File configDir;
64	private final J2eeModule.Type moduleType;
65	private final String moduleVersion;
66
67	/** Creates a new instance of TestJ2eeModule
68	* @param appRoot Application root directory.
69	* @param moduleType Java EE module type.
70	* @param moduleVersion Java EE version.
71	*/
72	public HK2TestEEModuleImpl(
73	final FileObject appRoot, final J2eeModule.Type moduleType,
74	final String moduleVersion
75	) {
76	this.appRoot = appRoot;
77	this.srcDir = new File(FileUtil.toFile(appRoot), "src");
78	this.configDir = new File(srcDir, "conf");
79	this.moduleType = moduleType;
80	this.moduleVersion = moduleVersion;
81	}
82
83	@Override
84	public FileObject getArchive() {
85	return null;
86	}
87
88	@Override
89	public Iterator<J2eeModule.RootedEntry> getArchiveContents() {
90	return Collections.<J2eeModule.RootedEntry>emptySet().iterator();
91	}
92
93	@Override
94	public FileObject getContentDirectory() {
95	return appRoot;
96	}
97
98	@Override
99	public J2eeModule.Type getModuleType() {
100	return moduleType;
101	}
102
103	@Override
104	public String getModuleVersion() {
105	return moduleVersion;
106	}
107
108	@Override
109	public String getUrl() {
110	throw new UnsupportedOperationException("Not implemented.");
111	}
112
113	@Override
114	public File getResourceDirectory() {
115	return new File(FileUtil.toFile(appRoot), "setup");
116	}
117
118	@Override
119	public File getDeploymentConfigurationFile(String name) {
120	return new File(configDir, name);
121	}
122
123	@Override
124	public void addPropertyChangeListener(PropertyChangeListener listener) {
125	throw new UnsupportedOperationException("Not implemented.");
126	}
127
128	@Override
129	public void removePropertyChangeListener(PropertyChangeListener listener) {
130	throw new UnsupportedOperationException("Not implemented.");
131	}
132
133	@Override
134	public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
135	throw new UnsupportedOperationException("Not implemented.");
136	}
137	}

Added Link Here

(-)3a3c32bf146f (+157 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.tooling.utils;
43
44	/**
45	* Enumeration helper methods:<ul>
46	* <li>Ordinal value based comparison.</li>
47	* </ul>
48	* @author Tomas Kraus
49	*/
50	public final class EnumUtils {
51
52	/**
53	* Ordinal value based comparison: <i>equals</i> {@code v1 == v2}.
54	* <p/>
55	* @param v1 First {@link Enum} instance to be compared.
56	* @param v2 Second {@link Enum} instance to be compared.
57	* @return Value of {@code true} when ordinal values of {@code v1}
58	* and {@code v2} are equal or both values are {@code null}.
59	* Value of {@code false} otherwise.
60	*/
61	public static final boolean eq(
62	final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
63	return v1 != null
64	? (v2 != null ? v1.ordinal() == v2.ordinal() : false)
65	: v2 == null;
66	}
67
68	/**
69	* Ordinal value based comparison: <i>not equals</i> {@code v1 != v2}.
70	* <p/>
71	* @param v1 First {@link Enum} instance to be compared.
72	* @param v2 Second {@link Enum} instance to be compared.
73	* @return Value of {@code true} when ordinal values of {@code v1}
74	* and {@code v2} are not equal or one of the values
75	* is {@code null} and second one is not {@code null}. Value
76	* of {@code false} otherwise.
77	*/
78	public static final boolean ne(
79	final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
80	return v1 != null
81	? (v2 != null ? v1.ordinal() != v2.ordinal() : true)
82	: v2 != null;
83	}
84
85	/**
86	* Ordinal value based comparison: <i>less than</i> {@code v1 < v2}.
87	* Value of {@code null} is considered less than any ordinal value.
88	* <p/>
89	* @param v1 First {@link Enum} instance to be compared.
90	* @param v2 Second {@link Enum} instance to be compared.
91	* @return Value of {@code true} when ordinal values of {@code v1}
92	* is less than {@code v2} or {@code v1} is {@code null}
93	* and {@code v2} is not {@code null}. Value of {@code false}
94	* otherwise.
95	*/
96	public static final boolean lt(
97	final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
98	return v1 != null
99	? (v2 != null ? v1.ordinal() < v2.ordinal() : false)
100	: v2 != null;
101	}
102
103	/**
104	* Ordinal value based comparison: <i>less than or equal</i> {@code v1 <= v2}.
105	* Value of {@code null} is considered less than any ordinal value.
106	* <p/>
107	* @param v1 First {@link Enum} instance to be compared.
108	* @param v2 Second {@link Enum} instance to be compared.
109	* @return Value of {@code true} when ordinal values of {@code v1}
110	* is less than or equal to {@code v2} or {@code v1} is {@code null}
111	* and {@code v2} is not {@code null}. Value of {@code false}
112	* otherwise.
113	*/
114	public static final boolean le(
115	final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
116	return v1 != null
117	? (v2 != null ? v1.ordinal() <= v2.ordinal() : false)
118	: true;
119	}
120
121	/**
122	* Ordinal value based comparison: <i>greater than</i> {@code v1 > v2}.
123	* Value of {@code null} is considered less than any ordinal value.
124	* <p/>
125	* @param v1 First {@link Enum} instance to be compared.
126	* @param v2 Second {@link Enum} instance to be compared.
127	* @return Value of {@code true} when ordinal values of {@code v1}
128	* is greater than {@code v2} or {@code v1} is {@code null}
129	* and {@code v2} is not {@code null}. Value of {@code false}
130	* otherwise.
131	*/
132	public static final boolean gt(
133	final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
134	return v1 != null
135	? (v2 != null ? v1.ordinal() > v2.ordinal() : true)
136	: false;
137	}
138
139	/**
140	* Ordinal value based comparison: <i>greater than or equal</i> {@code v1 >= v2}.
141	* Value of {@code null} is considered less than any ordinal value.
142	* <p/>
143	* @param v1 First {@link Enum} instance to be compared.
144	* @param v2 Second {@link Enum} instance to be compared.
145	* @return Value of {@code true} when ordinal values of {@code v1}
146	* is greater than or equal to {@code v2} or {@code v1} is not {@code null}
147	* and {@code v2} is {@code null}. Value of {@code false}
148	* otherwise.
149	*/
150	public static final boolean ge(
151	final Enum<? extends Enum> v1, final Enum<? extends Enum> v2) {
152	return v1 != null
153	? (v2 != null ? v1.ordinal() >= v2.ordinal() : true)
154	: v2 == null;
155	}
156
157	}

Added Link Here

(-)3a3c32bf146f (+179 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2015 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2015 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.glassfish.tooling.utils;
43
44	import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3;
45	import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4;
46	import static org.testng.Assert.assertFalse;
47	import static org.testng.Assert.assertTrue;
48	import org.testng.annotations.Test;
49
50	/**
51	* Test enumeration utilities.
52	* <p>
53	* @author Tomas Kraus
54	*/
55	@Test(groups = {"unit-tests"})
56	public class EnumUtilsTest {
57
58
59	/**
60	* Test equals method.
61	* Expected results:<ul>
62	* <li>{@code a > b}: false</li>
63	* <li>{@code a == b}: true</li>
64	* <li>{@code a < b}: false</li>
65	* <li>{@code a, null}: false</li>
66	* <li>{@code null, b}: false</li>
67	* <li>{@code null, null}: true</li></ul>
68	*/
69	@Test
70	public void testEq() {
71	assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false.");
72	assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true.");
73	assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false.");
74	assertFalse(EnumUtils.eq(GF_3, null), "Equals for a, null shall be false.");
75	assertFalse(EnumUtils.eq(null, GF_3), "Equals for null, b shall be false.");
76	assertTrue(EnumUtils.eq(null, null), "Equals for null, null shall be true.");
77	}
78
79	/**
80	* Test not equals method.
81	* Expected results:<ul>
82	* <li>{@code a > b}: true</li>
83	* <li>{@code a == b}: false</li>
84	* <li>{@code a < b}: true</li>
85	* <li>{@code a, null}: true</li>
86	* <li>{@code null, b}: true</li>
87	* <li>{@code null, null}: false</li></ul>
88	*/
89	@Test
90	public void testNe() {
91	assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true.");
92	assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false.");
93	assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true.");
94	assertTrue(EnumUtils.ne(GF_3, null), "Not equals for a, null shall be true.");
95	assertTrue(EnumUtils.ne(null, GF_3), "Not equals for null, b shall be true.");
96	assertFalse(EnumUtils.ne(null, null), "Not equals for null, null shall be false.");
97	}
98
99	/**
100	* Test less than method.
101	* Expected results:<ul>
102	* <li>{@code a > b}: false</li>
103	* <li>{@code a == b}: false</li>
104	* <li>{@code a < b}: true</li>
105	* <li>{@code a, null}: false</li>
106	* <li>{@code null, b}: true</li>
107	* <li>{@code null, null}: false</li></ul>
108	*/
109	@Test
110	public void testLt() {
111	assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false.");
112	assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false.");
113	assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true.");
114	assertFalse(EnumUtils.lt(GF_3, null), "Less than for a, null shall be false.");
115	assertTrue(EnumUtils.lt(null, GF_3), "Less than for null, b shall be true.");
116	assertFalse(EnumUtils.lt(null, null), "Less than for null, null shall be false.");
117	}
118
119	/**
120	* Test less than or equal method.
121	* Expected results:<ul>
122	* <li>{@code a > b}: false</li>
123	* <li>{@code a == b}: true</li>
124	* <li>{@code a < b}: true</li>
125	* <li>{@code a, null}: false</li>
126	* <li>{@code null, b}: true</li>
127	* <li>{@code null, null}: true</li></ul>
128	*/
129	@Test
130	public void testLe() {
131	assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false.");
132	assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true.");
133	assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true.");
134	assertFalse(EnumUtils.le(GF_3, null), "Less than or equal for a, null shall be false.");
135	assertTrue(EnumUtils.le(null, GF_3), "Less than or equal for null, b shall be true.");
136	assertTrue(EnumUtils.le(null, null), "Less than or equal for null, null shall be true.");
137	}
138
139	/**
140	* Test greater than method.
141	* Expected results:<ul>
142	* <li>{@code a > b}: true</li>
143	* <li>{@code a == b}: false</li>
144	* <li>{@code a < b}: false</li>
145	* <li>{@code a, null}: true</li>
146	* <li>{@code null, b}: false</li>
147	* <li>{@code null, null}: false</li></ul>
148	*/
149	@Test
150	public void testGt() {
151	assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true.");
152	assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false.");
153	assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false.");
154	assertTrue(EnumUtils.gt(GF_3, null), "Greater than for a, null shall be true.");
155	assertFalse(EnumUtils.gt(null, GF_3), "Greater than for null, b shall be false.");
156	assertFalse(EnumUtils.gt(null, null), "Greater than for null, null shall be false.");
157	}
158
159	/**
160	* Test greater than or equal method.
161	* Expected results:<ul>
162	* <li>{@code a > b}: true</li>
163	* <li>{@code a == b}: true</li>
164	* <li>{@code a < b}: false</li>
165	* <li>{@code a, null}: true</li>
166	* <li>{@code null, b}: false</li>
167	* <li>{@code null, null}: true</li></ul>
168	*/
169	@Test
170	public void testGe() {
171	assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true.");
172	assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true.");
173	assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");
174	assertTrue(EnumUtils.ge(GF_3, null), "Greater than or equal for a, null shall be true.");
175	assertFalse(EnumUtils.ge(null, GF_3), "Greater than or equal for null, b shall be false.");
176	assertTrue(EnumUtils.ge(null, null), "Greater than or equal for null, null shall be true.");
177	}
178
179	}

Lines 130-135 Link Here

(-)a/j2ee.sun.ddui/nbproject/project.xml (-8 / +17 lines)
130	</run-dependency>	130	</run-dependency>
131	</dependency>	131	</dependency>
132	<dependency>	132	<dependency>
		133	<code-name-base>org.netbeans.modules.glassfish.tooling</code-name-base>
		134	<build-prerequisite/>
		135	<compile-dependency/>
		136	<run-dependency>
		137	<release-version>0-1</release-version>
		138	<specification-version>1.0</specification-version>
		139	</run-dependency>
		140	</dependency>
		141	<dependency>
133	<code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>	142	<code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
134	<build-prerequisite/>	143	<build-prerequisite/>
135	<compile-dependency/>	144	<compile-dependency/>
Lines 337-350 Link Here
337	</run-dependency>	346	</run-dependency>
338	</dependency>	347	</dependency>
339	<dependency>	348	<dependency>
340	<code-name-base>org.openide.util.ui</code-name-base>
341	<build-prerequisite/>
342	<compile-dependency/>
343	<run-dependency>
344	<specification-version>9.3</specification-version>
345	</run-dependency>
346	</dependency>
347	<dependency>
348	<code-name-base>org.openide.util</code-name-base>	349	<code-name-base>org.openide.util</code-name-base>
349	<build-prerequisite/>	350	<build-prerequisite/>
350	<compile-dependency/>	351	<compile-dependency/>
Lines 361-366 Link Here
361	</run-dependency>	362	</run-dependency>
362	</dependency>	363	</dependency>
363	<dependency>	364	<dependency>
		365	<code-name-base>org.openide.util.ui</code-name-base>
		366	<build-prerequisite/>
		367	<compile-dependency/>
		368	<run-dependency>
		369	<specification-version>9.3</specification-version>
		370	</run-dependency>
		371	</dependency>
		372	<dependency>
364	<code-name-base>org.openide.windows</code-name-base>	373	<code-name-base>org.openide.windows</code-name-base>
365	<build-prerequisite/>	374	<build-prerequisite/>
366	<compile-dependency/>	375	<compile-dependency/>

Lines 1-7 Link Here

(-)a/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/share/configbean/SunONEDeploymentConfiguration.java (-17 / +29 lines)
1	/*	1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.	2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*	3	*
4	* Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.	4	* Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
5	*	5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.	6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.	7	* Other names may be trademarks of their respective owners.
Lines 44-51 Link Here
44	package org.netbeans.modules.j2ee.sun.share.configbean;	44	package org.netbeans.modules.j2ee.sun.share.configbean;
45		45
46	import java.io.File;	46	import java.io.File;
		47	import java.io.IOException;
47	import java.io.InputStream;	48	import java.io.InputStream;
48	import java.io.IOException;
49	import java.io.OutputStream;	49	import java.io.OutputStream;
50	import java.util.Collections;	50	import java.util.Collections;
51	import java.util.Set;	51	import java.util.Set;
Lines 59-70 Link Here
59	import org.netbeans.api.project.ProjectUtils;	59	import org.netbeans.api.project.ProjectUtils;
60	import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;	60	import org.netbeans.modules.glassfish.eecommon.api.config.GlassfishConfiguration;
61	import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;	61	import org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper;
		62	import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
62	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;	63	import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
63	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;	64	import org.netbeans.modules.j2ee.deployment.common.api.Datasource;
64	import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;	65	import org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException;
65	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
66	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;	66	import org.netbeans.modules.j2ee.deployment.common.api.MessageDestination;
67	import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;	67	import org.netbeans.modules.j2ee.deployment.common.api.OriginalCMPMapping;
		68	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
68	import org.netbeans.modules.j2ee.sun.api.CmpMappingProvider;	69	import org.netbeans.modules.j2ee.sun.api.CmpMappingProvider;
69	import org.netbeans.modules.j2ee.sun.api.ResourceConfiguratorInterface;	70	import org.netbeans.modules.j2ee.sun.api.ResourceConfiguratorInterface;
70	import org.netbeans.modules.j2ee.sun.api.SunDeploymentManagerInterface;	71	import org.netbeans.modules.j2ee.sun.api.SunDeploymentManagerInterface;
Lines 84-95 Link Here
84	import org.openide.util.RequestProcessor;	85	import org.openide.util.RequestProcessor;
85		86
86		87
87	/** Manages the deployment plan I/O and access for initializing DConfigBeans	88	/**
88	*	89	* Manages the deployment plan I/O and access for initializing DConfigBeans
89	* @author Vince Kraemer	90	* <p/>
90	* @author Peter Williams	91	* @author Vince Kraemer, Peter Williams, Tomas Kraus
91	*/	92	*/
92	public class SunONEDeploymentConfiguration extends GlassfishConfiguration implements DeploymentConfiguration { //implements Constants, SunDeploymentConfigurationInterface {	93	public class SunONEDeploymentConfiguration
		94	extends GlassfishConfiguration implements DeploymentConfiguration {
93		95
94	/**	96	/**
95	* inject cmp bean & field update support into descriptor listener factories	97	* inject cmp bean & field update support into descriptor listener factories
Lines 108-135 Link Here
108	private SunDeploymentManagerInterface sdmi;	110	private SunDeploymentManagerInterface sdmi;
109		111
110		112
111	/** Create an instance of SunONEDeploymentConfiguration for GF V2	113	/**
112	* and earlier servers.	114	* Create an instance of SunONEDeploymentConfiguration for GF V2
		115	* and earlier servers.
113	*	116	*
114	* @param module J2eeModule instance for the project represented by this config.	117	* @param module J2eeModule instance for the project represented by this config.
		118	* @param mySdmi Sun deployment manager.
		119	* @param version GlassFish server version.
115	*	120	*
116	* @throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException	121	* @throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
117	*/	122	*/
118	public SunONEDeploymentConfiguration(J2eeModule module, SunDeploymentManagerInterface mySdmi)	123	public SunONEDeploymentConfiguration(
119	throws ConfigurationException {	124	final J2eeModule module, final SunDeploymentManagerInterface mySdmi,
120	super(module);	125	final GlassFishVersion version
		126	) throws ConfigurationException {
		127	super(module, version);
121	this.sdmi = mySdmi;	128	this.sdmi = mySdmi;
122	}	129	}
123		130
124	/** Create an instance of SunONEDeploymentConfiguration for Webserver.	131	/**
		132	* Create an instance of SunONEDeploymentConfiguration for Webserver.
125	*	133	*
126	* @param module J2eeModule instance for the project represented by this config.	134	* @param module J2eeModule instance for the project represented by this config.
127	* @param webServerDDName short name for web server sun dd	135	* @param webServerDDName short name for web server sun dd
		136	* @param version GlassFish server version.
128	*	137	*
129	* @throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException	138	* @throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
130	*/	139	*/
131	public SunONEDeploymentConfiguration(J2eeModule module, String webServerDDName) throws ConfigurationException {	140	public SunONEDeploymentConfiguration(
132	super(module, J2eeModuleHelper.getWsModuleHelper(webServerDDName));	141	final J2eeModule module, final String webServerDDName,
		142	final GlassFishVersion version
		143	) throws ConfigurationException {
		144	super(module, J2eeModuleHelper.getWsModuleHelper(webServerDDName), version);
133	}	145	}
134		146
135	/** Deprecated form used for JSR-88. Only exists to keep legacy parts of	147	/** Deprecated form used for JSR-88. Only exists to keep legacy parts of