Attachment #94250 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-32 Link Here

(-)a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml (-4 / +8 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="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createPrelude"/>	28	<attr name="urlPattern" stringvalue="^\[.deployer:gfv3:.$"/>
29	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory"/>	29	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		30	<attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createPrelude"/>
		31	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
30	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	32	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
31	</file>	33	</file>
32	<file name="J2eePlatformFactory.instance">	34	<file name="J2eePlatformFactory.instance">
Lines 56-63 Link Here
56	<file name="Descriptor" url="nbdepee6.xml"/>	58	<file name="Descriptor" url="nbdepee6.xml"/>
57	<!-- -->	59	<!-- -->
58	<file name="Factory.instance">	60	<file name="Factory.instance">
59	<attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createEe6"/>	61	<attr name="urlPattern" stringvalue="^\[.deployer:gfv3ee6:.$"/>
60	<attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory"/>	62	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		63	<attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createEe6"/>
		64	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
61	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	65	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
62	</file>	66	</file>
63	<file name="J2eePlatformFactory.instance">	67	<file name="J2eePlatformFactory.instance">




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.deployment.plugins.spi.support.ProxyDeploymentFactory
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-55 Link Here

(-)a/j2ee.genericserver/src/org/netbeans/modules/j2ee/genericserver/resources/layer.xml (-2 / +4 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="instanceCreate" methodvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory.create"/>	51	<attr name="urlPattern" stringvalue="^generic.*$"/>
52	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory"/>	52	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		53	<attr name="delegate" methodvalue="org.netbeans.modules.j2ee.genericserver.GSDeploymentFactory.create"/>
		54	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
53	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	55	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
54	</file>	56	</file>
55	<file name="RegistryNodeFactory.instance">	57	<file name="RegistryNodeFactory.instance">

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-56 Link Here

(-)a/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/resources/layer.xml (-2 / +4 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="instanceCreate" methodvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory.create"/>	52	<attr name="urlPattern" stringvalue="^jboss-deployer:.*$"/>
53	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory"/>	53	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		54	<attr name="delegate" methodvalue="org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory.create"/>
		55	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
54	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	56	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
55	</file>	57	</file>
56		58

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;

Lines 54-61 Link Here

(-)a/j2ee.sun.appsrv81/src/org/netbeans/modules/j2ee/sun/ide/j2ee/layer.xml (-8 / +16 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="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV2"/>	57	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
58	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	58	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		59	<attr name="delegate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV2"/>
		60	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
59	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	61	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
60	</file>	62	</file>
61	<file name="RegistryNodeFactory.instance">	63	<file name="RegistryNodeFactory.instance">
Lines 108-115 Link Here
108	<folder name="JavaEEPlusSIP">	110	<folder name="JavaEEPlusSIP">
109	<file name="Descriptor" url="nbdep.xml"/>	111	<file name="Descriptor" url="nbdep.xml"/>
110	<file name="Factory.instance">	112	<file name="Factory.instance">
111	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createJavaEEPlusSIP"/>	113	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
112	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	114	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		115	<attr name="delegate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createJavaEEPlusSIP"/>
		116	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
113	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	117	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
114	</file>	118	</file>
115	<file name="RegistryNodeFactory.instance">	119	<file name="RegistryNodeFactory.instance">
Lines 162-169 Link Here
162	<folder name="APPSERVERSJS">	166	<folder name="APPSERVERSJS">
163	<file name="Descriptor" url="nbdep.xml"/>	167	<file name="Descriptor" url="nbdep.xml"/>
164	<file name="Factory.instance">	168	<file name="Factory.instance">
165	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.create"/>	169	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
166	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	170	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		171	<attr name="delegate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.create"/>
		172	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
167	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	173	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
168	</file>	174	</file>
169	<file name="RegistryNodeFactory.instance">	175	<file name="RegistryNodeFactory.instance">
Lines 216-223 Link Here
216	<folder name="GlassFishV1">	222	<folder name="GlassFishV1">
217	<file name="Descriptor" url="nbdep.xml"/>	223	<file name="Descriptor" url="nbdep.xml"/>
218	<file name="Factory.instance">	224	<file name="Factory.instance">
219	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV1"/>	225	<attr name="urlPattern" stringvalue="^\[.+\].*$"/>
220	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.sun.ide.Installer"/>	226	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
		227	<attr name="delegate" methodvalue="org.netbeans.modules.j2ee.sun.ide.Installer.createGlassFishV1"/>
		228	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
221	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	229	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
222	</file>	230	</file>
223	<file name="RegistryNodeFactory.instance">	231	<file name="RegistryNodeFactory.instance">

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-67 Link Here

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

Lines 39-46 Link Here

(-)a/j2eeserver/api/doc/org/netbeans/modules/j2ee/deployment/plugins/api/doc-files/plugin-layer-file.html (-2 / +5 lines)
39	style="font-family: courier new,courier,monospace;">	39	style="font-family: courier new,courier,monospace;">
40	<small style="font-family: courier new,courier,monospace;">	40	<small style="font-family: courier new,courier,monospace;">
41	</file></small><br	41	</file></small><br
42	style="font-family: courier new,courier,monospace;">	42	style="font-family: courier new,courier,monospace;"><br>
43	<small><br>	43	<small>
		44	See also org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.
		45	<br>
		46	<br>
44	</small>3.  NetBeans instance class declaration of	47	</small>3.  NetBeans instance class declaration of
45	RegistryNodeFactory:<br>	48	RegistryNodeFactory:<br>
46	<small style="font-family: courier new,courier,monospace;">	49	<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>
    </apidefs>

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

    <changes>
        <change id="deploymentFactoryProxy">
	    <api name="support"/>
	    <summary>
                Added class proxying the DeploymentFactory and adding
                the optional urlPattern attribute.
	    </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>
                Added class ProxyDeploymentFactory which delegates all calls
                to configured delegate. Via urlPattern it is possible to do
                precheck of server instance uri. The uri has to mach the pattern
                otherwise the instance is rejected as not supported but
                the factory.
                </p>
                <p>
                Designed to be used from XML Layer.
                </p>
	    </description>
            <class package="org.netbeans.modules.j2ee.deployment.devmodules.spi.support" name="ProxyDeploymentFactory"/>
            <issue number="148177"/>
	 </change>

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





<answer id="arch-overall">

<p>
    There are two separate api/spi sets in j2eeserver. The devmodules
    api/spi is for j2ee development modules (web, j2ee app, etc). The
    plugins api/spi is for server plugins.
</p>

<api name="J2EEServer-devmodules" type="export" category="friend" group="java">
    The spi classes are to be subclassed by dev modules and to be provided
    as cookies on the development nodes. The api classes are to be used to
    add actions/properties/additional cookies to those nodes.
</api>

<api name="J2EEServerAPI" type="export" category="friend" group="java">
  J2EE Server module serves as an integration point between two kinds of netbeans modules:
  <ul>
    <li><b>server plugins</b> (or simply plugins) that integrate various J2EE servers in IDE</li>
    <li><b>devmodules</b> - netbeans modules that provide support for development
    of J2EE modules (web module, EJB module, J2EE Application, etc.) and need to deploy 
    and debug them on J2EE servers.</li>

Lines 39-47 Link Here

(-)a/j2eeserver/nbproject/project.properties (-2 / +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
45	javadoc.arch=${basedir}/arch.xml	44	javadoc.arch=${basedir}/arch.xml
46	javadoc.apichanges=${basedir}/apichanges.xml	45	javadoc.apichanges=${basedir}/apichanges.xml
47	javadoc.docfiles=${basedir}/api/doc	46	javadoc.docfiles=${basedir}/api/doc




/*
 * 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.support;

import java.util.Map;
import java.util.regex.Pattern;
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import org.openide.util.Parameters;

/**
 * Provides a proxying implementation of {@link DeploymentFactory}. Handles
 * optional <code>urlPattern</code> attribute as precheck for url the plugin
 * can handle. Designed to be used via XML layer filesystem.
 * <p>
 * The <code>urlPattern</code> attribute is expected to be regexp string.
 * If it is present the server instance uri must match the regexp otherwise
 * {@link #handlesURI(java.lang.String)} will automatically return false
 * (before querying the delegate).
 *
 * @author Petr Hejl
 */
public final class ProxyDeploymentFactory implements DeploymentFactory {

    private final Map attributes;

    private final Pattern urlPattern;

    private DeploymentFactory delegate;

    private ProxyDeploymentFactory(Map attributes) {
        this.attributes = attributes;

        String pattern = (String) attributes.get("urlPattern"); // NOI18N
        if (pattern != null) {
            urlPattern = Pattern.compile(pattern);
        } else {
            urlPattern = null;
        }
    }

    public static ProxyDeploymentFactory create(Map map) {
        return new ProxyDeploymentFactory(map);
    }

    @Override
    public boolean handlesURI(String string) {
        if (string == null) {
            return false;
        }
        if (urlPattern != null && !urlPattern.matcher(string).matches()) {
            return false;
        }
        return getDelegate().handlesURI(string);
    }

    @Override
    public String getProductVersion() {
        return getDelegate().getProductVersion();
    }

    @Override
    public String getDisplayName() {
        return getDelegate().getDisplayName();
    }

    @Override
    public DeploymentManager getDisconnectedDeploymentManager(String string) throws DeploymentManagerCreationException {
        return getDelegate().getDisconnectedDeploymentManager(string);
    }

    @Override
    public DeploymentManager getDeploymentManager(String string, String string1, String string2) throws DeploymentManagerCreationException {
        return getDelegate().getDeploymentManager(string, string1, string2);
    }

    private DeploymentFactory getDelegate() {
        synchronized (this) {
            if (delegate != null) {
                return delegate;
            }
        }

        DeploymentFactory factory = (DeploymentFactory) attributes.get("delegate"); // NOI18N
        Parameters.notNull("delegate", factory); // NOI18N

        synchronized (this) {
            if (delegate == null) {
                delegate = factory;
            }
            return delegate;
        }
    }
}

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.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
                <attr name="delegate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
                <attr name="urlPattern" stringvalue="^permittedfooservice.*$"/>
                <attr name="prefix" stringvalue="permittedfooservice"/>
                <attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
            </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.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
                <attr name="delegate" methodvalue="org.netbeans.tests.j2eeserver.plugin.jsr88.TestDeploymentFactory.create"/>
                <attr name="urlPattern" stringvalue="^nothing.*$"/>
                <attr name="prefix" stringvalue="forbiddenfooservice"/>
                <attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
            </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>

Lines 48-56 Link Here

(-)a/tomcat5/src/org/netbeans/modules/tomcat5/resources/layer.xml (-9 / +15 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="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create50"/>	51	<attr name="urlPattern" stringvalue="^tomcat:.*$"/>
52	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>	52	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
53	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	53	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
		54	<attr name="delegate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create50"/>
		55	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
54	</file>	56	</file>
55	<file name="TomcatRegistryNodeFactory.instance">	57	<file name="TomcatRegistryNodeFactory.instance">
56	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.nodes.TomcatRegistryNodeFactory"/>	58	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.nodes.TomcatRegistryNodeFactory"/>
Lines 81-89 Link Here
81	<folder name="Tomcat55">	83	<folder name="Tomcat55">
82	<file name="Descriptor" url="deployment55.xml"/>	84	<file name="Descriptor" url="deployment55.xml"/>
83	<file name="Factory55.instance">	85	<file name="Factory55.instance">
84	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create55"/>	86	<attr name="urlPattern" stringvalue="^tomcat55:.*$"/>
85	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>	87	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
86	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	88	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
		89	<attr name="delegate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create55"/>
		90	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
87	</file>	91	</file>
88	<file name="TomcatRegistryNodeFactory.instance">	92	<file name="TomcatRegistryNodeFactory.instance">
89	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.nodes.TomcatRegistryNodeFactory"/>	93	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.nodes.TomcatRegistryNodeFactory"/>
Lines 114-122 Link Here
114	<folder name="Tomcat60">	118	<folder name="Tomcat60">
115	<file name="Descriptor" url="deployment60.xml"/>	119	<file name="Descriptor" url="deployment60.xml"/>
116	<file name="Factory60.instance">	120	<file name="Factory60.instance">
117	<attr name="instanceCreate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create60"/>	121	<attr name="urlPattern" stringvalue="^tomcat60:.*$"/>
118	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory"/>	122	<attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
119	<attr name="instanceOf" stringvalue="org.netbeans.modules.tomcat5.TomcatFactory,javax.enterprise.deploy.spi.factories.DeploymentFactory"/>	123	<attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
		124	<attr name="delegate" methodvalue="org.netbeans.modules.tomcat5.TomcatFactory.create60"/>
		125	<attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
120	</file>	126	</file>
121	<file name="TomcatRegistryNodeFactory.instance">	127	<file name="TomcatRegistryNodeFactory.instance">
122	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.nodes.TomcatRegistryNodeFactory"/>	128	<attr name="instanceClass" stringvalue="org.netbeans.modules.tomcat5.nodes.TomcatRegistryNodeFactory"/>

Return to bug 148177

Lines 141-173 Link Here

(-)a/ide.kit/test/qa-functional/data/whitelist_3.txt (-20 / +2 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	144	org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory
145	org.netbeans.modules.j2ee.genericserver.ide.GSOptionalDeploymentManagerFactory	145	org.netbeans.modules.j2ee.genericserver.ide.GSOptionalDeploymentManagerFactory
146	org.netbeans.modules.j2ee.jboss4.JBDeploymentFactory
147	org.netbeans.modules.j2ee.jboss4.ide.JBOptionalDeploymentManagerFactory	146	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	147	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	148	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	149	org.netbeans.modules.j2ee.sun.ide.j2ee.RunTimeDDCatalog
160	org.netbeans.modules.j2ee.sun.share.CharsetMapping	150	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	151	org.netbeans.modules.tomcat5.TomcatManager$TomcatVersion
166	org.netbeans.modules.tomcat5.ide.OptionalFactory	152	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		153
172	#IZ 177644	154	#IZ 177644
173	org.netbeans.modules.schema2beans.AttrProp	155	org.netbeans.modules.schema2beans.AttrProp

Lines 107-118 Link Here

(-)a/j2eeserver/apichanges.xml (-1 / +26 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	</apidefs>	111	</apidefs>
112		112
113	<!-- ACTUAL CHANGES BEGIN HERE: -->	113	<!-- ACTUAL CHANGES BEGIN HERE: -->
114		114
115	<changes>	115	<changes>
		116	<change id="deploymentFactoryProxy">
		117	<api name="support"/>
		118	<summary>
		119	Added class proxying the DeploymentFactory and adding
		120	the optional urlPattern attribute.
		121	</summary>
		122	<version major="1" minor="65"/>
		123	<date day="22" month="2" year="2010"/>
		124	<author login="phejl"/>
		125	<compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
		126	<description>
		127	<p>
		128	Added class ProxyDeploymentFactory which delegates all calls
		129	to configured delegate. Via urlPattern it is possible to do
		130	precheck of server instance uri. The uri has to mach the pattern
		131	otherwise the instance is rejected as not supported but
		132	the factory.
		133	</p>
		134	<p>
		135	Designed to be used from XML Layer.
		136	</p>
		137	</description>
		138	<class package="org.netbeans.modules.j2ee.deployment.devmodules.spi.support" name="ProxyDeploymentFactory"/>
		139	<issue number="148177"/>
		140	</change>
116		141
117	<change id="resourceChangeReporter">	142	<change id="resourceChangeReporter">
118	<api name="devmodules"/>	143	<api name="devmodules"/>

Lines 70-79 Link Here

(-)a/j2eeserver/arch.xml (-1 / +13 lines)
70		70
71	<answer id="arch-overall">	71	<answer id="arch-overall">
72		72
		73	<p>
		74	There are two separate api/spi sets in j2eeserver. The devmodules
		75	api/spi is for j2ee development modules (web, j2ee app, etc). The
		76	plugins api/spi is for server plugins.
		77	</p>
		78
		79	<api name="J2EEServer-devmodules" type="export" category="friend" group="java">
		80	The spi classes are to be subclassed by dev modules and to be provided
		81	as cookies on the development nodes. The api classes are to be used to
		82	add actions/properties/additional cookies to those nodes.
		83	</api>
		84
73	<api name="J2EEServerAPI" type="export" category="friend" group="java">	85	<api name="J2EEServerAPI" type="export" category="friend" group="java">
74	J2EE Server module serves as an integration point between two kinds of netbeans modules:	86	J2EE Server module serves as an integration point between two kinds of netbeans modules:
75	<ul>	87	<ul>
76	<li><b>server plugins</b> (or simply plugins) that integrate various J2EE servers in IDE, and</li>	88	<li><b>server plugins</b> (or simply plugins) that integrate various J2EE servers in IDE</li>
77	<li><b>devmodules</b> - netbeans modules that provide support for development	89	<li><b>devmodules</b> - netbeans modules that provide support for development
78	of J2EE modules (web module, EJB module, J2EE Application, etc.) and need to deploy	90	of J2EE modules (web module, EJB module, J2EE Application, etc.) and need to deploy
79	and debug them on J2EE servers.</li>	91	and debug them on J2EE servers.</li>

Added Link Here

(-)41d5a0f1bef2 (+132 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.support;
41
42	import java.util.Map;
43	import java.util.regex.Pattern;
44	import javax.enterprise.deploy.spi.DeploymentManager;
45	import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
46	import javax.enterprise.deploy.spi.factories.DeploymentFactory;
47	import org.openide.util.Parameters;
48
49	/**
50	* Provides a proxying implementation of {@link DeploymentFactory}. Handles
51	* optional <code>urlPattern</code> attribute as precheck for url the plugin
52	* can handle. Designed to be used via XML layer filesystem.
53	* <p>
54	* The <code>urlPattern</code> attribute is expected to be regexp string.
55	* If it is present the server instance uri must match the regexp otherwise
56	* {@link #handlesURI(java.lang.String)} will automatically return false
57	* (before querying the delegate).
58	*
59	* @author Petr Hejl
60	*/
61	public final class ProxyDeploymentFactory implements DeploymentFactory {
62
63	private final Map attributes;
64
65	private final Pattern urlPattern;
66
67	private DeploymentFactory delegate;
68
69	private ProxyDeploymentFactory(Map attributes) {
70	this.attributes = attributes;
71
72	String pattern = (String) attributes.get("urlPattern"); // NOI18N
73	if (pattern != null) {
74	urlPattern = Pattern.compile(pattern);
75	} else {
76	urlPattern = null;
77	}
78	}
79
80	public static ProxyDeploymentFactory create(Map map) {
81	return new ProxyDeploymentFactory(map);
82	}
83
84	@Override
85	public boolean handlesURI(String string) {
86	if (string == null) {
87	return false;
88	}
89	if (urlPattern != null && !urlPattern.matcher(string).matches()) {
90	return false;
91	}
92	return getDelegate().handlesURI(string);
93	}
94
95	@Override
96	public String getProductVersion() {
97	return getDelegate().getProductVersion();
98	}
99
100	@Override
101	public String getDisplayName() {
102	return getDelegate().getDisplayName();
103	}
104
105	@Override
106	public DeploymentManager getDisconnectedDeploymentManager(String string) throws DeploymentManagerCreationException {
107	return getDelegate().getDisconnectedDeploymentManager(string);
108	}
109
110	@Override
111	public DeploymentManager getDeploymentManager(String string, String string1, String string2) throws DeploymentManagerCreationException {
112	return getDelegate().getDeploymentManager(string, string1, string2);
113	}
114
115	private DeploymentFactory getDelegate() {
116	synchronized (this) {
117	if (delegate != null) {
118	return delegate;
119	}
120	}
121
122	DeploymentFactory factory = (DeploymentFactory) attributes.get("delegate"); // NOI18N
123	Parameters.notNull("delegate", factory); // NOI18N
124
125	synchronized (this) {
126	if (delegate == null) {
127	delegate = factory;
128	}
129	return delegate;
130	}
131	}
132	}

Added Link Here

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