Attachment #94175 for bug #148177

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

Lines 100-106 Link Here

(-)a/glassfish.javaee/nbproject/project.xml (-1 / +1 lines)
100	<compile-dependency/>	100	<compile-dependency/>
101	<run-dependency>	101	<run-dependency>
102	<release-version>4</release-version>	102	<release-version>4</release-version>
103	<specification-version>1.59</specification-version>	103	<specification-version>1.65</specification-version>
104	</run-dependency>	104	</run-dependency>
105	</dependency>	105	</dependency>
106	<dependency>	106	<dependency>

Lines 109-114 Link Here

(-)a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java (+1 lines)
109	* @param uri	109	* @param uri
110	* @return	110	* @return
111	*/	111	*/
		112	// also check the urlPattern in layer.xml when changing this
112	public boolean handlesURI(String uri) {	113	public boolean handlesURI(String uri) {
113	if (uri == null) {	114	if (uri == null) {
114	return false;	115	return false;

Lines 25-30 Link Here

(-)a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml (+2 lines)
25	<file name="Descriptor" url="nbdep.xml"/>	25	<file name="Descriptor" url="nbdep.xml"/>
26	<!-- -->	26	<!-- -->
27	<file name="Factory.instance">	27	<file name="Factory.instance">
		28	<attr name="urlPattern" stringvalue="^\[.deployer:gfv3:.$"/>
28	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createPrelude"/>	29	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createPrelude"/>
29	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory"/>	30	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory"/>
30	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	31	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
Lines 56-61 Link Here
56	<file name="Descriptor" url="nbdepee6.xml"/>	57	<file name="Descriptor" url="nbdepee6.xml"/>
57	<!-- -->	58	<!-- -->
58	<file name="Factory.instance">	59	<file name="Factory.instance">
		60	<attr name="urlPattern" stringvalue="^\[.deployer:gfv3ee6:.$"/>
59	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createEe6"/>	61	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createEe6"/>
60	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory"/>	62	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory"/>
61	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	63	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>




org.netbeans.modules.j2ee.deployment.plugins.spi.ServerInstanceDescriptor
org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer
org.netbeans.modules.j2ee.deployment.plugins.spi.TargetModuleIDResolver
org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory
org.netbeans.modules.j2ee.genericserver.ide.GSOptionalDeploymentManagerFactory
org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory
org.netbeans.modules.j2ee.jboss4.ide.JBOptionalDeploymentManagerFactory
org.netbeans.modules.j2ee.jboss4.ide.ui.JBPluginUtils
org.netbeans.modules.j2ee.jboss4.ide.ui.JBPluginUtils$Version
org.netbeans.modules.j2ee.sun.api.ServerLocationManager
org.netbeans.modules.j2ee.sun.ide.dm.Bundle
org.netbeans.modules.j2ee.sun.ide.dm.Bundle_en
org.netbeans.modules.j2ee.sun.ide.dm.Bundle_en_US
org.netbeans.modules.j2ee.sun.ide.dm.Constants
org.netbeans.modules.j2ee.sun.ide.dm.SunDeploymentFactory
org.netbeans.modules.j2ee.sun.ide.j2ee.Constants
org.netbeans.modules.j2ee.sun.ide.j2ee.OptionalFactory
org.netbeans.modules.j2ee.sun.ide.j2ee.PluginProperties
org.netbeans.modules.j2ee.sun.ide.j2ee.RunTimeDDCatalog
org.netbeans.modules.j2ee.weblogic9.optional.WLOptionalFactory
org.netbeans.modules.j2ee.sun.share.SecurityMasterListModel
org.netbeans.modules.j2ee.weblogic9.WLBaseDeploymentManager
org.netbeans.modules.j2ee.weblogic9.WLDeploymentFactory
org.netbeans.modules.j2ee.weblogic9.optional.WLOptionalDeploymentManagerFactory
org.netbeans.modules.tomcat5.TomcatManager$TomcatVersion
org.netbeans.modules.tomcat5.ide.OptionalFactory
org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory
org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory
org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory
org.netbeans.modules.tomcat5.TomcatFactory

#IZ 177644
org.netbeans.modules.schema2beans.AttrProp

Lines 84-90 Link Here

(-)a/j2ee.genericserver/nbproject/project.xml (-1 / +1 lines)
84	<compile-dependency/>	84	<compile-dependency/>
85	<run-dependency>	85	<run-dependency>
86	<release-version>4</release-version>	86	<release-version>4</release-version>
87	<specification-version>1.23</specification-version>	87	<specification-version>1.65</specification-version>
88	</run-dependency>	88	</run-dependency>
89	</dependency>	89	</dependency>
90	<dependency>	90	<dependency>

Lines 48-53 Link Here

(-)a/j2ee.genericserver/src/org/netbeans/modules/j2ee/genericserver/resources/layer.xml (+1 lines)
48	<folder name="GENERIC">	48	<folder name="GENERIC">
49	<file name="Descriptor" url="nbdep.xml"/>	49	<file name="Descriptor" url="nbdep.xml"/>
50	<file name="Factory.instance">	50	<file name="Factory.instance">
		51	<attr name="urlPattern" stringvalue="^generic.*$"/>
51	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory.create"/>	52	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory.create"/>
52	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory"/>	53	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory"/>
53	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	54	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

Lines 122-128 Link Here

(-)a/j2ee.jboss4/nbproject/project.xml (-1 / +1 lines)
122	<compile-dependency/>	122	<compile-dependency/>
123	<run-dependency>	123	<run-dependency>
124	<release-version>4</release-version>	124	<release-version>4</release-version>
125	<specification-version>1.52</specification-version>	125	<specification-version>1.65</specification-version>
126	</run-dependency>	126	</run-dependency>
127	</dependency>	127	</dependency>
128	<dependency>	128	<dependency>

Lines 49-54 Link Here

(-)a/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/resources/layer.xml (+1 lines)
49	<file name="Descriptor" url="nbdep.xml"/>	49	<file name="Descriptor" url="nbdep.xml"/>
50		50
51	<file name="Factory.instance">	51	<file name="Factory.instance">
		52	<attr name="urlPattern" stringvalue="^jboss-deployer:.*$"/>
52	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory.create"/>	53	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory.create"/>
53	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory"/>	54	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory"/>
54	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	55	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

Lines 189-195 Link Here

(-)a/j2ee.sun.appsrv81/nbproject/project.xml (-1 / +1 lines)
189	<compile-dependency/>	189	<compile-dependency/>
190	<run-dependency>	190	<run-dependency>
191	<release-version>4</release-version>	191	<release-version>4</release-version>
192	<specification-version>1.51</specification-version>	192	<specification-version>1.65</specification-version>
193	</run-dependency>	193	</run-dependency>
194	</dependency>	194	</dependency>
195	<dependency>	195	<dependency>

Lines 175-180 Link Here

(-)a/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/dm/SunDeploymentFactory.java (+1 lines)
175	* @param uri	175	* @param uri
176	* @return boolean value	176	* @return boolean value
177	*/	177	*/
		178	// also check the urlPattern in layer.xml when changing this
178	public boolean handlesURI(String uri) {	179	public boolean handlesURI(String uri) {
179	if (uri==null){	180	if (uri==null){
180	return false;	181	return false;




		    <folder name="J2EE">
			    <file name="Descriptor" url="nbdep.xml"/>
				<file name="Factory.instance">
                                        <attr name="urlPattern" stringvalue="^\[.+\].*$"/>
					<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV2"/>
					<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
					<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

            <folder name="JavaEEPlusSIP">
                <file name="Descriptor" url="nbdep.xml"/>
                <file name="Factory.instance">
                    <attr name="urlPattern" stringvalue="^\[.+\].*$"/>
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createJavaEEPlusSIP"/>
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
                    <attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

		    <folder name="APPSERVERSJS">
			    <file name="Descriptor" url="nbdep.xml"/>
				<file name="Factory.instance">
                                        <attr name="urlPattern" stringvalue="^\[.+\].*$"/>
					<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.create"/>
					<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
					<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

		    <folder name="GlassFishV1">
			    <file name="Descriptor" url="nbdep.xml"/>
				<file name="Factory.instance">
                                        <attr name="urlPattern" stringvalue="^\[.+\].*$"/>
					<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV1"/>
					<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
					<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

Lines 110-116 Link Here

(-)a/j2ee.weblogic9/nbproject/project.xml (-1 / +1 lines)
110	<compile-dependency/>	110	<compile-dependency/>
111	<run-dependency>	111	<run-dependency>
112	<release-version>4</release-version>	112	<release-version>4</release-version>
113	<specification-version>1.23</specification-version>	113	<specification-version>1.65</specification-version>
114	</run-dependency>	114	</run-dependency>
115	</dependency>	115	</dependency>
116	<dependency>	116	<dependency>

Lines 60-65 Link Here

(-)a/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/resources/layer.xml (+1 lines)
60	plugin	60	plugin
61	-->	61	-->
62	<file name="Factory.instance">	62	<file name="Factory.instance">
		63	<attr name="urlPattern" stringvalue="^deployer:WebLogic:http://.*$"/>
63	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.weblogic9.WLDeploymentFactory.getInstance"/>	64	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.weblogic9.WLDeploymentFactory.getInstance"/>
64	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.weblogic9.WLDeploymentFactory"/>	65	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.weblogic9.WLDeploymentFactory"/>
65	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	66	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

Lines 32-37 Link Here

(-)a/j2eeserver/api/doc/org/netbeans/modules/j2ee/deployment/plugins/api/doc-files/plugin-layer-file.html (-2 / +8 lines)
32	<file name="Factory.instance"></small><br	32	<file name="Factory.instance"></small><br
33	style="font-family: courier new,courier,monospace;">	33	style="font-family: courier new,courier,monospace;">
34	<small style="font-family: courier new,courier,monospace;">	34	<small style="font-family: courier new,courier,monospace;">
		35	<attr name="urlPattern" stringvalue="^regexp$" /></small><br>
		36	<small style="font-family: courier new,courier,monospace;">
35	<attr name="instanceClass" </small><br	37	<attr name="instanceClass" </small><br
36	style="font-family: courier new,courier,monospace;">	38	style="font-family: courier new,courier,monospace;">
37	<small style="font-family: courier new,courier,monospace;">	39	<small style="font-family: courier new,courier,monospace;">
Lines 39-46 Link Here
39	style="font-family: courier new,courier,monospace;">	41	style="font-family: courier new,courier,monospace;">
40	<small style="font-family: courier new,courier,monospace;">	42	<small style="font-family: courier new,courier,monospace;">
41	</file></small><br	43	</file></small><br
42	style="font-family: courier new,courier,monospace;">	44	style="font-family: courier new,courier,monospace;"><br>
43	<small><br>	45	<small>
		46	Optional <code>urlPattern</code> attribute specifies the required format
		47	for server instance URL checked before call to DeploymentFactory.handlesURI().
		48	<br>
		49	<br>
44	</small>3.  NetBeans instance class declaration of	50	</small>3.  NetBeans instance class declaration of
45	RegistryNodeFactory:<br>	51	RegistryNodeFactory:<br>
46	<small style="font-family: courier new,courier,monospace;">	52	<small style="font-family: courier new,courier,monospace;">




        <!-- org.netbeans.modules.j2ee.deployment.profiler -->
        <apidef name="profiler">J2EE Server Common API</apidef>
        <!-- org.netbeans.modules.j2ee.deployment.plugins.spi.support -->
        <apidef name="support">Server Integration Plugin SPI Support</apidef>
        <apidef name="PluginRegistration">XML Layer interfaces for plugin registration</apidef>
    </apidefs>

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

    <changes>
        <change id="urlPattern">
	    <api name="PluginRegistration"/>
	    <summary>
                Optional attribute urlPattern for Factory.instance to prefilter
                server instances on which server plugin is queried for support.
	    </summary>
	    <version major="1" minor="65"/>
	    <date day="22" month="2" year="2010"/>
	    <author login="phejl"/>
	    <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
	    <description>
                <p>
                Optional attribute urlPattern for Factory.instance may contain
                regexp which the server instance url has to have.
                </p>
	    </description>
            <issue number="148177"/>
	 </change>

        <change id="resourceChangeReporter">
	    <api name="devmodules"/>

Lines 39-45 Link Here

(-)a/j2eeserver/nbproject/project.properties (-1 / +1 lines)
39		39
40	is.autoload=true	40	is.autoload=true
41	javac.source=1.6	41	javac.source=1.6
42	spec.version.base=1.64.0	42	spec.version.base=1.65.0
43		43
44	javadoc.overview=${basedir}/api/doc/overview.html	44	javadoc.overview=${basedir}/api/doc/overview.html
45	javadoc.arch=${basedir}/arch.xml	45	javadoc.arch=${basedir}/arch.xml




import org.netbeans.modules.j2ee.deployment.impl.ui.RegistryNodeProvider;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory;
import org.openide.util.Lookup;
import org.openide.cookies.InstanceCookie;
import org.openide.nodes.Node;
import org.openide.util.NbBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.xml.parsers.ParserConfigurationException;

import org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory;
import org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.util.lookup.Lookups;
import org.xml.sax.SAXException;


    private static final String ATTR_NEEDS_FIND_SERVER_UI = "needsFindServerUI";

    private final NetbeansDeployment dep;
    private final Class factoryCls;
    private final String name;
    private final Lookup lkp;
    private final boolean needsFindServerUI;

    private final Pattern urlPattern;

    /** GuardedBy("this") */
    private DeploymentFactory factory = null;
    /** GuardedBy("this") */
    private Class factoryCls = null;
    /** GuardedBy("this") */
    private DeploymentManager manager = null;
    /** GuardedBy("this") */
    private RegistryNodeProvider nodeProvider = null;
    /** GuardedBy("this") */
    private boolean failed;

    public Server(FileObject fo) throws IOException, ParserConfigurationException,
            SAXException, ClassNotFoundException {

        needsFindServerUI = getBooleanValue(descriptor.getAttribute(ATTR_NEEDS_FIND_SERVER_UI), false);

        dep = NetbeansDeployment.createGraph(descriptor.getInputStream());
        FileObject factoryinstance = fo.getFileObject("Factory.instance");
        if (factoryinstance != null) {
            Object regex = factoryinstance.getAttribute("urlPattern");
            if (regex != null) {
                urlPattern = Pattern.compile(regex.toString());
            } else {
                urlPattern = null;
            }
        } else {
            urlPattern = null;
        }

        lkp = Lookups.forPath(fo.getPath());

        if (factoryinstance == null) {
            String msg = NbBundle.getMessage(Server.class, "MSG_NoFactoryInstanceClass", name);
            LOGGER.log(Level.SEVERE, msg);
        }
    }

    // not really sure about this code
    private synchronized void initFactory() {
        if ((factory != null && factoryCls != null) || failed) {
            return;
        }

        factory = lkp.lookup(DeploymentFactory.class);
        if (factory != null) {
            factoryCls = factory.getClass();
            return;
        } else {
            String msg = NbBundle.getMessage(Server.class, "MSG_FactoryFailed", name);
            LOGGER.log(Level.SEVERE, msg);
            failed = true;
            return;
                factoryCls = null;
                return;
            }
            DataObject dobj = DataObject.find(factoryinstance);
            InstanceCookie cookie = (InstanceCookie) dobj.getCookie(InstanceCookie.class);
            if (cookie == null) {
                String msg = NbBundle.getMessage(Server.class, "MSG_FactoryFailed", name);
                LOGGER.log(Level.SEVERE, msg);
                factoryCls = null;
                return;
            }
            factoryCls = cookie.instanceClass();

// FIXME what is this crap?
//            DataObject dobj = DataObject.find(factoryinstance);
//            InstanceCookie cookie = (InstanceCookie) dobj.getCookie(InstanceCookie.class);
//            if (cookie == null) {
//                String msg = NbBundle.getMessage(Server.class, "MSG_FactoryFailed", name);
//                LOGGER.log(Level.SEVERE, msg);
//                factoryCls = null;
//                return;
//            }
//            factoryCls = cookie.instanceClass();
//
//            // speculative code depending on the DF implementation and if it registers
//            // itself with DFM or not
//
//            try {
//                factory = (DeploymentFactory) cookie.instanceCreate();
//            } catch (Exception e) {
//                LOGGER.log(Level.INFO, null, e);
//            }
        }
    }

    private synchronized DeploymentFactory getFactory() {
        initFactory();

        if (factory == null) {

            DeploymentFactory[] factories = DeploymentFactoryManager.getInstance().getDeploymentFactories();
            for (int i = 0; i < factories.length; i++) {
                if (factoryCls.isInstance(factories[i])) {

    public synchronized DeploymentManager getDisconnectedDeploymentManager()
            throws DeploymentManagerCreationException  {

        if (manager == null) {
            manager = getDisconnectedDeploymentManager(dep.getDisconnectedString());
        }
        return manager;

    }

    public boolean handlesUri(String uri) {
        if (uri != null && urlPattern != null) {
            if (!urlPattern.matcher(uri).matches()) {
                return false;
            }
        }

        try {
            return getFactory().handlesURI(uri);
        } catch (Exception e) {

Lines 197-205 Link Here

(-)a/j2eeserver/test/unit/src/org/netbeans/modules/j2ee/deployment/plugins/api/InstancePropertiesTest.java (-3 / +2 lines)
197		197
198	private static class MockDF extends org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory {	198	private static class MockDF extends org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory {
199		199
200	@Override	200	public MockDF() {
201	public boolean handlesURI(String arg0) {	201	super("unknown:");
202	return arg0.startsWith("unknown:");
203	}	202	}
204	}	203	}
205		204




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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 2010 Sun Microsystems, Inc.
 */

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

import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
import org.netbeans.modules.j2ee.deployment.impl.ServerRegistryTestBase;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;

/**
 *
 * @author Petr Hejl
 */
public class UrlPatternTest extends ServerRegistryTestBase {

    private static final String TEST_URL_PREFIX_PERMITTED = "permittedfooservice:";

    private static final String TEST_URL_PREFIX_FORBIDDEN = "forbiddenfooservice:";

    public UrlPatternTest(String name) {
        super(name);
    }

    public void testPermittedPattern() throws InstanceCreationException {
        InstanceProperties.createInstanceProperties(
                TEST_URL_PREFIX_PERMITTED + "testPermitted", "test", "password", "Permitted instance");
    }

    public void testForbiddenPattern() throws InstanceCreationException {
        try {
        InstanceProperties.createInstanceProperties(
                TEST_URL_PREFIX_FORBIDDEN + "testForbidden", "test", "password", "Forbidden instance");
        fail("Forbidden instance registered");
        } catch (InstanceCreationException ex) {
            // expected
        }
    }
}

Lines 47-60 Link Here

(-)a/j2eeserver/test/unit/src/org/netbeans/tests/j2eeserver/plugin/jsr88/TestDeploymentFactory.java (-4 / +12 lines)
47		47
48	/**	48	/**
49	*	49	*
50	* @author gfink	50	* @author Petr Hejl
51	*/	51	*/
52	public class TestDeploymentFactory implements DeploymentFactory {	52	public class TestDeploymentFactory implements DeploymentFactory {
53		53
54	private Map managers = new HashMap();	54	private Map managers = new HashMap();
55		55
		56	private final String prefix;
		57
56	/** Creates a new instance of DepFactory */	58	/** Creates a new instance of DepFactory */
57	public TestDeploymentFactory() {	59	protected TestDeploymentFactory(String prefix) {
		60	assert prefix != null;
		61	this.prefix = prefix;
		62	}
		63
		64	public static TestDeploymentFactory create(Map map) {
		65	return new TestDeploymentFactory((String) map.get("prefix"));
58	}	66	}
59		67
60	public synchronized javax.enterprise.deploy.spi.DeploymentManager getDeploymentManager(String str, String str1, String str2) throws javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException {	68	public synchronized javax.enterprise.deploy.spi.DeploymentManager getDeploymentManager(String str, String str1, String str2) throws javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException {
Lines 84-90 Link Here
84	}	92	}
85		93
86	public boolean handlesURI(String str) {	94	public boolean handlesURI(String str) {
87	return (str != null && str.startsWith("fooservice"));	95	return (str != null && str.startsWith(prefix));
88	}	96	}
89		97
90	}	98	}




              <attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
            </file>
            <file name="Factory.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
                <attr name="prefix" stringvalue="fooservice"/>
            </file>
            <file name="TestRegistryNodeFactory.instance">
              <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/> 

            </folder>
        </folder>

        <folder name="TestWithPermittedPattern">
            <file name="Descriptor" url="nbdep.xml">
              <attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
            </file>
            <file name="Factory.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
                <attr name="urlPattern" stringvalue="^permittedfooservice.*$"/>
                <attr name="prefix" stringvalue="permittedfooservice"/>
            </file>
            <file name="TestRegistryNodeFactory.instance">
              <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>
              <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory"/>
            </file>
            <file name="OptionalFactory.instance">
                <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.ManagerWrapperFactory"/>
                <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
            </file>
            <file name="PlatformFactory.instance">
                <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestPlatformFactory"/>
                <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
            </file>
            <file name="ModuleConfigurationFactory.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory.getInstance"/>
                <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory"/>
                <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/>
            </file>
            <folder name="DeploymentFileNames">
                <folder name="WAR">
                    <file name="WEB-INF\test-web.xml"/>
                </folder>
                <folder name="EJB">
                    <file name="META-INF\test-ejb.xml"/>
                </folder>
                <folder name="CAR">
                    <file name="META-INF\test-client.xml"/>
                </folder>
                <folder name="EAR">
                    <file name="META-INF\test-app.xml"/>
                </folder>
            </folder>
        </folder>

        <folder name="TestWithForbiddenPattern">
            <file name="Descriptor" url="nbdep.xml">
              <attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
            </file>
            <file name="Factory.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
                <attr name="urlPattern" stringvalue="^nothing.*$"/>
                <attr name="prefix" stringvalue="forbiddenfooservice"/>
            </file>
            <file name="TestRegistryNodeFactory.instance">
              <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>
              <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory"/>
            </file>
            <file name="OptionalFactory.instance">
                <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.ManagerWrapperFactory"/>
                <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
            </file>
            <file name="PlatformFactory.instance">
                <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestPlatformFactory"/>
                <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
            </file>
            <file name="ModuleConfigurationFactory.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory.getInstance"/>
                <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory"/>
                <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/>
            </file>
            <folder name="DeploymentFileNames">
                <folder name="WAR">
                    <file name="WEB-INF\test-web.xml"/>
                </folder>
                <folder name="EJB">
                    <file name="META-INF\test-ejb.xml"/>
                </folder>
                <folder name="CAR">
                    <file name="META-INF\test-client.xml"/>
                </folder>
                <folder name="EAR">
                    <file name="META-INF\test-app.xml"/>
                </folder>
            </folder>
        </folder>

        <folder name="TestFailingInitialization">
            <file name="Descriptor" url="nbdep.xml">
              <attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
            </file>
            <file name="Factory.instance">
                <attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
                <attr name="prefix" stringvalue="fooservice"/>
            </file>
            <file name="TestRegistryNodeFactory.instance">
              <attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>

Lines 155-161 Link Here

(-)a/tomcat5/nbproject/project.xml (-1 / +1 lines)
155	<compile-dependency/>	155	<compile-dependency/>
156	<run-dependency>	156	<run-dependency>
157	<release-version>4</release-version>	157	<release-version>4</release-version>
158	<specification-version>1.51</specification-version>	158	<specification-version>1.65</specification-version>
159	</run-dependency>	159	</run-dependency>
160	</dependency>	160	</dependency>
161	<dependency>	161	<dependency>




            <folder name="Tomcat5">
                <file name="Descriptor" url="deployment.xml"/>
                <file name="Factory.instance">
                    <attr name="urlPattern" stringvalue="^tomcat:.*$"/>
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create50"/>
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

            <folder name="Tomcat55">
                <file name="Descriptor" url="deployment55.xml"/>
                <file name="Factory55.instance">
                    <attr name="urlPattern" stringvalue="^tomcat55:.*$"/>
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create55"/>
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

            <folder name="Tomcat60">
                <file name="Descriptor" url="deployment60.xml"/>
                <file name="Factory60.instance">
                    <attr name="urlPattern" stringvalue="^tomcat60:.*$"/>
                    <attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create60"/>
                    <attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>
                    <attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

Return to bug 148177

Lines 141-173 Link Here

(-)a/ide.kit/test/qa-functional/data/whitelist_3.txt (-20 / +1 lines)
141	org.netbeans.modules.j2ee.deployment.plugins.spi.ServerInstanceDescriptor	141	org.netbeans.modules.j2ee.deployment.plugins.spi.ServerInstanceDescriptor
142	org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer	142	org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer
143	org.netbeans.modules.j2ee.deployment.plugins.spi.TargetModuleIDResolver	143	org.netbeans.modules.j2ee.deployment.plugins.spi.TargetModuleIDResolver
144	org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory
145	org.netbeans.modules.j2ee.genericserver.ide.GSOptionalDeploymentManagerFactory	144	org.netbeans.modules.j2ee.genericserver.ide.GSOptionalDeploymentManagerFactory
146	org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory
147	org.netbeans.modules.j2ee.jboss4.ide.JBOptionalDeploymentManagerFactory	145	org.netbeans.modules.j2ee.jboss4.ide.JBOptionalDeploymentManagerFactory
148	org.netbeans.modules.j2ee.jboss4.ide.ui.JBPluginUtils
149	org.netbeans.modules.j2ee.jboss4.ide.ui.JBPluginUtils$Version
150	org.netbeans.modules.j2ee.sun.api.ServerLocationManager	146	org.netbeans.modules.j2ee.sun.api.ServerLocationManager
151	org.netbeans.modules.j2ee.sun.ide.dm.Bundle
152	org.netbeans.modules.j2ee.sun.ide.dm.Bundle_en
153	org.netbeans.modules.j2ee.sun.ide.dm.Bundle_en_US
154	org.netbeans.modules.j2ee.sun.ide.dm.Constants
155	org.netbeans.modules.j2ee.sun.ide.dm.SunDeploymentFactory
156	org.netbeans.modules.j2ee.sun.ide.j2ee.Constants
157	org.netbeans.modules.j2ee.sun.ide.j2ee.OptionalFactory	147	org.netbeans.modules.j2ee.sun.ide.j2ee.OptionalFactory
158	org.netbeans.modules.j2ee.sun.ide.j2ee.PluginProperties
159	org.netbeans.modules.j2ee.sun.ide.j2ee.RunTimeDDCatalog	148	org.netbeans.modules.j2ee.sun.ide.j2ee.RunTimeDDCatalog
160	org.netbeans.modules.j2ee.sun.share.CharsetMapping	149	org.netbeans.modules.j2ee.weblogic9.optional.WLOptionalFactory
161	org.netbeans.modules.j2ee.sun.share.SecurityMasterListModel
162	org.netbeans.modules.j2ee.weblogic9.WLBaseDeploymentManager
163	org.netbeans.modules.j2ee.weblogic9.WLDeploymentFactory
164	org.netbeans.modules.j2ee.weblogic9.optional.WLOptionalDeploymentManagerFactory
165	org.netbeans.modules.tomcat5.TomcatManager$TomcatVersion	150	org.netbeans.modules.tomcat5.TomcatManager$TomcatVersion
166	org.netbeans.modules.tomcat5.ide.OptionalFactory	151	org.netbeans.modules.tomcat5.ide.OptionalFactory
167	org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory
168	org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory
169	org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory
170	org.netbeans.modules.tomcat5.TomcatFactory
171		152
172	#IZ 177644	153	#IZ 177644
173	org.netbeans.modules.schema2beans.AttrProp	154	org.netbeans.modules.schema2beans.AttrProp

Lines 54-59 Link Here

(-)a/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/layer.xml (+4 lines)
54	<folder name="J2EE">	54	<folder name="J2EE">
55	<file name="Descriptor" url="nbdep.xml"/>	55	<file name="Descriptor" url="nbdep.xml"/>
56	<file name="Factory.instance">	56	<file name="Factory.instance">
		57	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
57	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV2"/>	58	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV2"/>
58	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	59	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
59	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	60	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
Lines 108-113 Link Here
108	<folder name="JavaEEPlusSIP">	109	<folder name="JavaEEPlusSIP">
109	<file name="Descriptor" url="nbdep.xml"/>	110	<file name="Descriptor" url="nbdep.xml"/>
110	<file name="Factory.instance">	111	<file name="Factory.instance">
		112	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
111	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createJavaEEPlusSIP"/>	113	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createJavaEEPlusSIP"/>
112	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	114	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
113	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	115	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
Lines 162-167 Link Here
162	<folder name="APPSERVERSJS">	164	<folder name="APPSERVERSJS">
163	<file name="Descriptor" url="nbdep.xml"/>	165	<file name="Descriptor" url="nbdep.xml"/>
164	<file name="Factory.instance">	166	<file name="Factory.instance">
		167	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
165	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.create"/>	168	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.create"/>
166	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	169	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
167	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	170	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
Lines 216-221 Link Here
216	<folder name="GlassFishV1">	219	<folder name="GlassFishV1">
217	<file name="Descriptor" url="nbdep.xml"/>	220	<file name="Descriptor" url="nbdep.xml"/>
218	<file name="Factory.instance">	221	<file name="Factory.instance">
		222	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
219	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV1"/>	223	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV1"/>
220	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	224	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>
221	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	225	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>

Lines 107-118 Link Here

(-)a/j2eeserver/apichanges.xml (-1 / +20 lines)
107	<!-- org.netbeans.modules.j2ee.deployment.profiler -->	107	<!-- org.netbeans.modules.j2ee.deployment.profiler -->
108	<apidef name="profiler">J2EE Server Common API</apidef>	108	<apidef name="profiler">J2EE Server Common API</apidef>
109	<!-- org.netbeans.modules.j2ee.deployment.plugins.spi.support -->	109	<!-- org.netbeans.modules.j2ee.deployment.plugins.spi.support -->
110	<apidef name="support">Server Integration Plugin SPI Support</apidef>	110	<apidef name="support">Server Integration Plugin SPI Support</apidef>
		111	<apidef name="PluginRegistration">XML Layer interfaces for plugin registration</apidef>
111	</apidefs>	112	</apidefs>
112		113
113	<!-- ACTUAL CHANGES BEGIN HERE: -->	114	<!-- ACTUAL CHANGES BEGIN HERE: -->
114		115
115	<changes>	116	<changes>
		117	<change id="urlPattern">
		118	<api name="PluginRegistration"/>
		119	<summary>
		120	Optional attribute urlPattern for Factory.instance to prefilter
		121	server instances on which server plugin is queried for support.
		122	</summary>
		123	<version major="1" minor="65"/>
		124	<date day="22" month="2" year="2010"/>
		125	<author login="phejl"/>
		126	<compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
		127	<description>
		128	<p>
		129	Optional attribute urlPattern for Factory.instance may contain
		130	regexp which the server instance url has to have.
		131	</p>
		132	</description>
		133	<issue number="148177"/>
		134	</change>
116		135
117	<change id="resourceChangeReporter">	136	<change id="resourceChangeReporter">
118	<api name="devmodules"/>	137	<api name="devmodules"/>

Lines 56-66 Link Here

(-)a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/Server.java (-30 / +64 lines)
56	import org.netbeans.modules.j2ee.deployment.impl.ui.RegistryNodeProvider;	56	import org.netbeans.modules.j2ee.deployment.impl.ui.RegistryNodeProvider;
57	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory;	57	import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory;
58	import org.openide.util.Lookup;	58	import org.openide.util.Lookup;
59	import org.openide.cookies.InstanceCookie;
60	import org.openide.nodes.Node;	59	import org.openide.nodes.Node;
61	import org.openide.util.NbBundle;	60	import org.openide.util.NbBundle;
62	import java.util.logging.Level;	61	import java.util.logging.Level;
63	import java.util.logging.Logger;	62	import java.util.logging.Logger;
		63	import java.util.regex.Pattern;
64	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;	64	import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
65	import javax.enterprise.deploy.spi.DeploymentManager;	65	import javax.enterprise.deploy.spi.DeploymentManager;
66	import javax.xml.parsers.ParserConfigurationException;	66	import javax.xml.parsers.ParserConfigurationException;
Lines 73-79 Link Here
73	import org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory;	73	import org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory;
74	import org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport;	74	import org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport;
75	import org.openide.filesystems.FileObject;	75	import org.openide.filesystems.FileObject;
76	import org.openide.loaders.DataObject;
77	import org.openide.util.lookup.Lookups;	76	import org.openide.util.lookup.Lookups;
78	import org.xml.sax.SAXException;	77	import org.xml.sax.SAXException;
79		78
Lines 85-102 Link Here
85	private static final String ATTR_NEEDS_FIND_SERVER_UI = "needsFindServerUI";	84	private static final String ATTR_NEEDS_FIND_SERVER_UI = "needsFindServerUI";
86		85
87	private final NetbeansDeployment dep;	86	private final NetbeansDeployment dep;
88	private final Class factoryCls;
89	private final String name;	87	private final String name;
90	private final Lookup lkp;	88	private final Lookup lkp;
91	private final boolean needsFindServerUI;	89	private final boolean needsFindServerUI;
92		90
		91	private final Pattern urlPattern;
		92
93	/** GuardedBy("this") */	93	/** GuardedBy("this") */
94	private DeploymentFactory factory = null;	94	private DeploymentFactory factory = null;
95	/** GuardedBy("this") */	95	/** GuardedBy("this") */
		96	private Class factoryCls = null;
		97	/** GuardedBy("this") */
96	private DeploymentManager manager = null;	98	private DeploymentManager manager = null;
97	/** GuardedBy("this") */	99	/** GuardedBy("this") */
98	private RegistryNodeProvider nodeProvider = null;	100	private RegistryNodeProvider nodeProvider = null;
99		101	/** GuardedBy("this") */
		102	private boolean failed;
100		103
101	public Server(FileObject fo) throws IOException, ParserConfigurationException,	104	public Server(FileObject fo) throws IOException, ParserConfigurationException,
102	SAXException, ClassNotFoundException {	105	SAXException, ClassNotFoundException {
Lines 112-154 Link Here
112	needsFindServerUI = getBooleanValue(descriptor.getAttribute(ATTR_NEEDS_FIND_SERVER_UI), false);	115	needsFindServerUI = getBooleanValue(descriptor.getAttribute(ATTR_NEEDS_FIND_SERVER_UI), false);
113		116
114	dep = NetbeansDeployment.createGraph(descriptor.getInputStream());	117	dep = NetbeansDeployment.createGraph(descriptor.getInputStream());
		118	FileObject factoryinstance = fo.getFileObject("Factory.instance");
		119	if (factoryinstance != null) {
		120	Object regex = factoryinstance.getAttribute("urlPattern");
		121	if (regex != null) {
		122	urlPattern = Pattern.compile(regex.toString());
		123	} else {
		124	urlPattern = null;
		125	}
		126	} else {
		127	urlPattern = null;
		128	}
115		129
116	lkp = Lookups.forPath(fo.getPath());	130	lkp = Lookups.forPath(fo.getPath());
		131
		132	if (factoryinstance == null) {
		133	String msg = NbBundle.getMessage(Server.class, "MSG_NoFactoryInstanceClass", name);
		134	LOGGER.log(Level.SEVERE, msg);
		135	}
		136	}
		137
		138	// not really sure about this code
		139	private synchronized void initFactory() {
		140	if ((factory != null && factoryCls != null) \|\| failed) {
		141	return;
		142	}
		143
117	factory = lkp.lookup(DeploymentFactory.class);	144	factory = lkp.lookup(DeploymentFactory.class);
118	if (factory != null) {	145	if (factory != null) {
119	factoryCls = factory.getClass();	146	factoryCls = factory.getClass();
		147	return;
120	} else {	148	} else {
121	FileObject factoryinstance = fo.getFileObject("Factory.instance");	149	String msg = NbBundle.getMessage(Server.class, "MSG_FactoryFailed", name);
122	if (factoryinstance == null) {	150	LOGGER.log(Level.SEVERE, msg);
123	String msg = NbBundle.getMessage(Server.class, "MSG_NoFactoryInstanceClass", name);	151	failed = true;
124	LOGGER.log(Level.SEVERE, msg);	152	return;
125	factoryCls = null;
126	return;
127	}
128	DataObject dobj = DataObject.find(factoryinstance);
129	InstanceCookie cookie = (InstanceCookie) dobj.getCookie(InstanceCookie.class);
130	if (cookie == null) {
131	String msg = NbBundle.getMessage(Server.class, "MSG_FactoryFailed", name);
132	LOGGER.log(Level.SEVERE, msg);
133	factoryCls = null;
134	return;
135	}
136	factoryCls = cookie.instanceClass();
137		153
138	// speculative code depending on the DF implementation and if it registers	154	// FIXME what is this crap?
139	// itself with DFM or not	155	// DataObject dobj = DataObject.find(factoryinstance);
140		156	// InstanceCookie cookie = (InstanceCookie) dobj.getCookie(InstanceCookie.class);
141	try {	157	// if (cookie == null) {
142	factory = (DeploymentFactory) cookie.instanceCreate();	158	// String msg = NbBundle.getMessage(Server.class, "MSG_FactoryFailed", name);
143	} catch (Exception e) {	159	// LOGGER.log(Level.SEVERE, msg);
144	LOGGER.log(Level.INFO, null, e);	160	// factoryCls = null;
145	}	161	// return;
		162	// }
		163	// factoryCls = cookie.instanceClass();
		164	//
		165	// // speculative code depending on the DF implementation and if it registers
		166	// // itself with DFM or not
		167	//
		168	// try {
		169	// factory = (DeploymentFactory) cookie.instanceCreate();
		170	// } catch (Exception e) {
		171	// LOGGER.log(Level.INFO, null, e);
		172	// }
146	}	173	}
147	}	174	}
148		175
149	private synchronized DeploymentFactory getFactory() {	176	private synchronized DeploymentFactory getFactory() {
		177	initFactory();
		178
150	if (factory == null) {	179	if (factory == null) {
151
152	DeploymentFactory[] factories = DeploymentFactoryManager.getInstance().getDeploymentFactories();	180	DeploymentFactory[] factories = DeploymentFactoryManager.getInstance().getDeploymentFactories();
153	for (int i = 0; i < factories.length; i++) {	181	for (int i = 0; i < factories.length; i++) {
154	if (factoryCls.isInstance(factories[i])) {	182	if (factoryCls.isInstance(factories[i])) {
Lines 166-172 Link Here
166	public synchronized DeploymentManager getDisconnectedDeploymentManager()	194	public synchronized DeploymentManager getDisconnectedDeploymentManager()
167	throws DeploymentManagerCreationException {	195	throws DeploymentManagerCreationException {
168		196
169	if(manager == null) {	197	if (manager == null) {
170	manager = getDisconnectedDeploymentManager(dep.getDisconnectedString());	198	manager = getDisconnectedDeploymentManager(dep.getDisconnectedString());
171	}	199	}
172	return manager;	200	return manager;
Lines 177-182 Link Here
177	}	205	}
178		206
179	public boolean handlesUri(String uri) {	207	public boolean handlesUri(String uri) {
		208	if (uri != null && urlPattern != null) {
		209	if (!urlPattern.matcher(uri).matches()) {
		210	return false;
		211	}
		212	}
		213
180	try {	214	try {
181	return getFactory().handlesURI(uri);	215	return getFactory().handlesURI(uri);
182	} catch (Exception e) {	216	} catch (Exception e) {

Added Link Here

(-)4aa2398980b6 (+75 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* If you wish your version of this file to be governed by only the CDDL
25	* or only the GPL Version 2, indicate your decision by adding
26	* "[Contributor] elects to include this software in this distribution
27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
28	* single choice of license, a recipient has the option to distribute
29	* your version of this file under either the CDDL, the GPL Version 2 or
30	* to extend the choice of license to its licensees as provided above.
31	* However, if you add GPL Version 2 code and therefore, elected the GPL
32	* Version 2 license, then the option applies only if the new code is
33	* made subject to such option by the copyright holder.
34	*
35	* Contributor(s):
36	*
37	* Portions Copyrighted 2010 Sun Microsystems, Inc.
38	*/
39
40	package org.netbeans.modules.j2ee.deployment.plugins.spi;
41
42	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistry;
43	import org.netbeans.modules.j2ee.deployment.impl.ServerRegistryTestBase;
44	import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException;
45	import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
46
47	/**
48	*
49	* @author Petr Hejl
50	*/
51	public class UrlPatternTest extends ServerRegistryTestBase {
52
53	private static final String TEST_URL_PREFIX_PERMITTED = "permittedfooservice:";
54
55	private static final String TEST_URL_PREFIX_FORBIDDEN = "forbiddenfooservice:";
56
57	public UrlPatternTest(String name) {
58	super(name);
59	}
60
61	public void testPermittedPattern() throws InstanceCreationException {
62	InstanceProperties.createInstanceProperties(
63	TEST_URL_PREFIX_PERMITTED + "testPermitted", "test", "password", "Permitted instance");
64	}
65
66	public void testForbiddenPattern() throws InstanceCreationException {
67	try {
68	InstanceProperties.createInstanceProperties(
69	TEST_URL_PREFIX_FORBIDDEN + "testForbidden", "test", "password", "Forbidden instance");
70	fail("Forbidden instance registered");
71	} catch (InstanceCreationException ex) {
72	// expected
73	}
74	}
75	}

Lines 52-58 Link Here

(-)a/j2eeserver/test/unit/src/org/netbeans/tests/j2eeserver/plugin/layer.xml (-2 / +88 lines)
52	<attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->	52	<attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
53	</file>	53	</file>
54	<file name="Factory.instance">	54	<file name="Factory.instance">
55	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory"/>	55	<attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
		56	<attr name="prefix" stringvalue="fooservice"/>
56	</file>	57	</file>
57	<file name="TestRegistryNodeFactory.instance">	58	<file name="TestRegistryNodeFactory.instance">
58	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>	59	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>
Lines 87-98 Link Here
87	</folder>	88	</folder>
88	</folder>	89	</folder>
89		90
		91	<folder name="TestWithPermittedPattern">
		92	<file name="Descriptor" url="nbdep.xml">
		93	<attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
		94	</file>
		95	<file name="Factory.instance">
		96	<attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
		97	<attr name="urlPattern" stringvalue="^permittedfooservice.*$"/>
		98	<attr name="prefix" stringvalue="permittedfooservice"/>
		99	</file>
		100	<file name="TestRegistryNodeFactory.instance">
		101	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>
		102	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory"/>
		103	</file>
		104	<file name="OptionalFactory.instance">
		105	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.ManagerWrapperFactory"/>
		106	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
		107	</file>
		108	<file name="PlatformFactory.instance">
		109	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestPlatformFactory"/>
		110	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
		111	</file>
		112	<file name="ModuleConfigurationFactory.instance">
		113	<attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory.getInstance"/>
		114	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory"/>
		115	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/>
		116	</file>
		117	<folder name="DeploymentFileNames">
		118	<folder name="WAR">
		119	<file name="WEB-INF\test-web.xml"/>
		120	</folder>
		121	<folder name="EJB">
		122	<file name="META-INF\test-ejb.xml"/>
		123	</folder>
		124	<folder name="CAR">
		125	<file name="META-INF\test-client.xml"/>
		126	</folder>
		127	<folder name="EAR">
		128	<file name="META-INF\test-app.xml"/>
		129	</folder>
		130	</folder>
		131	</folder>
		132
		133	<folder name="TestWithForbiddenPattern">
		134	<file name="Descriptor" url="nbdep.xml">
		135	<attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
		136	</file>
		137	<file name="Factory.instance">
		138	<attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
		139	<attr name="urlPattern" stringvalue="^nothing.*$"/>
		140	<attr name="prefix" stringvalue="forbiddenfooservice"/>
		141	</file>
		142	<file name="TestRegistryNodeFactory.instance">
		143	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>
		144	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory"/>
		145	</file>
		146	<file name="OptionalFactory.instance">
		147	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.ManagerWrapperFactory"/>
		148	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
		149	</file>
		150	<file name="PlatformFactory.instance">
		151	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestPlatformFactory"/>
		152	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
		153	</file>
		154	<file name="ModuleConfigurationFactory.instance">
155	<attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory.getInstance"/>
156	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.TestModuleConfigurationFactory"/>
157	<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/>
158	</file>
159	<folder name="DeploymentFileNames">
160	<folder name="WAR">
161	<file name="WEB-INF\test-web.xml"/>
162	</folder>
163	<folder name="EJB">
164	<file name="META-INF\test-ejb.xml"/>
165	</folder>
166	<folder name="CAR">
167	<file name="META-INF\test-client.xml"/>
168	</folder>
169	<folder name="EAR">
170	<file name="META-INF\test-app.xml"/>
171	</folder>
172	</folder>
173	</folder>
174
90	<folder name="TestFailingInitialization">	175	<folder name="TestFailingInitialization">
91	<file name="Descriptor" url="nbdep.xml">	176	<file name="Descriptor" url="nbdep.xml">
92	<attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->	177	<attr name="needsFindServerUI" stringvalue="true"/> <!-- default is false -->
93	</file>	178	</file>
94	<file name="Factory.instance">	179	<file name="Factory.instance">
95	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory"/>	180	<attr name="instanceCreate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
		181	<attr name="prefix" stringvalue="fooservice"/>
96	</file>	182	</file>
97	<file name="TestRegistryNodeFactory.instance">	183	<file name="TestRegistryNodeFactory.instance">
98	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>	184	<attr name="instanceClass" stringvalue="org.netbeans.tests.j2eeserver.plugin.registry.NodeFactory"/>

Lines 48-53 Link Here

(-)a/tomcat5/src/org/netbeans/modules/tomcat5/resources/layer.xml (+3 lines)
48	<folder name="Tomcat5">	48	<folder name="Tomcat5">
49	<file name="Descriptor" url="deployment.xml"/>	49	<file name="Descriptor" url="deployment.xml"/>
50	<file name="Factory.instance">	50	<file name="Factory.instance">
		51	<attr name="urlPattern" stringvalue="^tomcat:.*$"/>
51	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create50"/>	52	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create50"/>
52	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>	53	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>
53	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	54	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
Lines 81-86 Link Here
81	<folder name="Tomcat55">	82	<folder name="Tomcat55">
82	<file name="Descriptor" url="deployment55.xml"/>	83	<file name="Descriptor" url="deployment55.xml"/>
83	<file name="Factory55.instance">	84	<file name="Factory55.instance">
		85	<attr name="urlPattern" stringvalue="^tomcat55:.*$"/>
84	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create55"/>	86	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create55"/>
85	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>	87	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>
86	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	88	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
Lines 114-119 Link Here
114	<folder name="Tomcat60">	116	<folder name="Tomcat60">
115	<file name="Descriptor" url="deployment60.xml"/>	117	<file name="Descriptor" url="deployment60.xml"/>
116	<file name="Factory60.instance">	118	<file name="Factory60.instance">
		119	<attr name="urlPattern" stringvalue="^tomcat60:.*$"/>
117	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create60"/>	120	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create60"/>
118	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>	121	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>
119	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	122	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>