You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/11 18:39:10 UTC
[GitHub] geertjanw closed pull request #858: [NETBEANS-1180] Move enterprise
cluster
geertjanw closed pull request #858: [NETBEANS-1180] Move enterprise cluster
URL: https://github.com/apache/incubator-netbeans/pull/858
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/api.web.webmodule/apichanges.xml b/api.web.webmodule/apichanges.xml
deleted file mode 100644
index d3a07dd73f..0000000000
--- a/api.web.webmodule/apichanges.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
-<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
-
-<!--
-
-INFO FOR PEOPLE ADDING CHANGES:
-
-Check the DTD (apichanges.dtd) for details on the syntax. You do not
-need to regenerate the HTML, as this is part of Javadoc generation; just
-change the XML. Rough syntax of a change (several parts optional):
-
-<change>
- <api name="compiler"/>
- <summary>Some brief description here, can use <b>XHTML</b></summary>
- <version major="1" minor="99"/>
- <date day="13" month="6" year="2001"/>
- <author login="jrhacker"/>
- <compatibility addition="yes"/>
- <description>
- The main description of the change here.
- Again can use full <b>XHTML</b> as needed.
- </description>
- <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
- <issue number="14309"/>
-</change>
-
-Also permitted elements: <package>, <branch>. <version> is API spec
-version, recommended for all new changes. <compatibility> should say
-if things were added/modified/deprecated/etc. and give all information
-related to upgrading old code. List affected top-level classes and
-link to issue numbers if applicable. See the DTD for more details.
-
-Changes need not be in any particular order, they are sorted in various
-ways by the stylesheet anyway.
-
-Dates are assumed to mean "on the trunk". If you *also* make the same
-change on a stabilization branch, use the <branch> tag to indicate this
-and explain why the change was made on a branch in the <description>.
-
-Please only change this file on the trunk! Rather: you can change it
-on branches if you want, but these changes will be ignored; only the
-trunk version of this file is important.
-
-Deprecations do not count as incompatible, assuming that code using the
-deprecated calls continues to see their documented behavior. But do
-specify deprecation="yes" in <compatibility>.
-
-This file is not a replacement for Javadoc: it is intended to list changes,
-not describe the complete current behavior, for which ordinary documentation
-is the proper place.
-
--->
-
-<apichanges>
-
- <!-- First, a list of API names you may use: -->
- <apidefs>
- <apidef name="WebModuleAPI">Web Module API</apidef>
- </apidefs>
-
- <!-- ACTUAL CHANGES BEGIN HERE: -->
-
- <changes>
- <change id="Adding_WebModuleExtender_Savable">
- <api name="WebModuleAPI"/>
- <summary>Adding <code>WebModuleExtender.Savable</code> interface</summary>
- <version major="1" minor="26"/>
- <date day="26" month="9" year="2011"/>
- <author login="marfous@netbeans.org"/>
- <compatibility addition="yes"/>
- <description>
- <p>
- Added interface <code>WebModuleExtender.Savable</code> for ability to
- save framework settings of already included extender after confirming
- project customizer.
- </p>
- </description>
- </change>
- <change id="ListenableWebModuleImplementation2">
- <api name="WebModuleAPI"/>
- <summary>Adding ability to listen on WebModuleImplementation2 changes</summary>
- <version major="1" minor="16"/>
- <date day="21" month="9" year="2009"/>
- <author login="dkonecny"/>
- <compatibility addition="yes"/>
- <description>
- <p>
- Adding ability to listen on changes of document base or
- WEB-INF folder. WebModuleImplementation2 was introduced in this
- release so I'm taking advantage of it and adding requested methods.
- </p>
- </description>
- <class package="org.netbeans.modules.web.spi.webmodule" name="WebModuleImplementation2"/>
- <issue number="154944"/>
- </change>
- <change id="Adding_requresWebXml">
- <api name="WebModuleAPI"/>
- <summary>Adding method requiresWebXml</summary>
- <version major="1" minor="15"/>
- <date day="1" month="7" year="2009"/>
- <author login="pslechta@netbeans.org"/>
- <compatibility addition="yes"/>
- <description>
- <p>
- New method requiresWebXml added. Framework specifies via this method if it reqires web.xml DD or not.
- </p>
- </description>
- </change>
- <change id="Making_WebModuleAPI_Public">
- <api name="WebModuleAPI"/>
- <summary>Making the WebModule API public</summary>
- <version major="1" minor="10"/>
- <date day="28" month="9" year="2007"/>
- <author login="abadea@netbeans.org"/>
- <compatibility modification="yes"/>
- <description>
- <p>
- Made the WebModule API public with the stability level "under development".
- </p>
- </description>
- <issue number="112441"/>
- </change>
- <change id="Deprecating_WebFrameworkProvider_Methods">
- <api name="WebModuleAPI"/>
- <summary>Deprecating <code>WebFrameworkProvider.extend()</code> and <code>WebFrameworkProvider.getConfigurationPanel()</code></summary>
- <version major="1" minor="9"/>
- <date day="14" month="9" year="2007"/>
- <author login="abadea@netbeans.org"/>
- <compatibility deprecation="yes"/>
- <description>
- <p>
- Deprecated methods <code>WebFrameworkProvider.extend()</code> and <code>WebFrameworkProvider.getConfigurationPanel()</code>.
- Class <code>WebConfigurationPanel</code> has been deprecated too.
- </p>
- <p>
- Introduced a <code>WebModuleExtender</code> class and a <code>WebModule.createWebModuleExtender()</code> method returning it.
- This allows for better encapsulation of the web module extending process.
- </p>
- </description>
- <class package="org.netbeans.modules.web.spi.webmodule" name="FrameworkConfigurationPanel"/>
- <class package="org.netbeans.modules.web.spi.webmodule" name="WebFrameworkProvider"/>
- <class package="org.netbeans.modules.web.spi.webmodule" name="WebModuleExtender"/>
- </change>
- <change id="Deprecating_getJavaSources">
- <api name="WebModuleAPI"/>
- <summary>Deprecating <code>WebModule.getJavaSources</code></summary>
- <version major="1" minor="9"/>
- <date day="14" month="9" year="2007"/>
- <author login="abadea@netbeans.org"/>
- <compatibility deprecation="yes"/>
- <description>
- <p>
- Deprecated <code>WebModule.getJavaSources</code> because its return value is not generic enough.
- </p>
- </description>
- <class package="org.netbeans.modules.web.api.webmodule" name="WebModule"/>
- </change>
- <change id="Adding_getServletPath">
- <api name="WebModuleAPI"/>
- <summary>Adding <code>WebFrameworkProvider.getServletPath()</code></summary>
- <version major="1" minor="5"/>
- <date day="8" month="3" year="2006"/>
- <author login="ppisl@netbeans.org"/>
- <compatibility addition="yes"/>
- <description>
- <p>
- Added method <code>WebFrameworkProvider.getServletPath()</code> for obtaining the servlet path for a JSP.
- </p>
- </description>
- <class package="org.netbeans.modules.web.spi.webmodule" name="WebFrameworkProvider"/>
- </change>
- <change id="Adding_Framework_Support">
- <api name="WebModuleAPI"/>
- <summary>Adding web framework support</summary>
- <version major="1" minor="4"/>
- <date day="28" month="7" year="2005"/>
- <author login="ppisl@netbeans.org"/>
- <compatibility addition="yes"/>
- <description>
- <p>
- There are some frameworks like Struts, JSF, Spring etc., which extend the web applications.
- This change introduces the concept of a web framework provider to the Web Module API/SPI
- which allows to implement supporting these frameworks.
- </p>
- </description>
- <class package="org.netbeans.modules.web.api.webmodule" name="WebFrameworks"/>
- <class package="org.netbeans.modules.web.spi.webmodule" name="WebFrameworkProvider"/>
- </change>
-
- <change id="Remove_URLCookie">
- <api name="WebModuleAPI"/>
- <summary>Replace URLCookie with a RequestParametersQuery API and RequestParametersQueryImplementation SPI</summary>
- <version major="1" minor="2"/>
- <date day="27" month="1" year="2005"/>
- <author login="pbuzek@netbeans.org"/>
- <compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="no"/>
- <description>
- <p>
- Node.Cookie should not be exposed in API. The URLCookie has been replaced with a query pattern
- with a corresponding SPI.
- </p>
- </description>
- <class package="org.netbeans.modules.web.api.webmodule" name="URLCookie" link="no" />
- <class package="org.netbeans.modules.web.api.webmodule" name="RequestParametersQuery"/>
- <class package="org.netbeans.modules.web.spi.webmodule" name="RequestParametersQueryImplementation"/>
- </change>
- </changes>
-
- <!-- Now the surrounding HTML text and document structure: -->
-
- <htmlcontents>
-<!--
-
- NO NO NO NO NO!
-
- ==============> DO NOT EDIT ME! <==============
-
- AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
-
- SEE web/webapi/apichanges.xml
-
--->
- <head>
- <title>Change History for the WebModule API</title>
- <link rel="stylesheet" href="prose.css" type="text/css"/>
- </head>
- <body>
-
-<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
-
-<h1>Introduction</h1>
-
-<p>This document lists changes made to the <a href="@TOP@overview-summary.html">WebModule API</a>.</p>
-
-<!-- The actual lists of changes, as summaries and details: -->
- <hr/>
- <standard-changelists module-code-name="org.netbeans.api.web.webmodule"/>
-
- <hr/><p>@FOOTER@</p>
-
- </body>
- </htmlcontents>
-
-</apichanges>
diff --git a/api.web.webmodule/arch.xml b/api.web.webmodule/arch.xml
deleted file mode 100644
index 0fdb0caa0d..0000000000
--- a/api.web.webmodule/arch.xml
+++ /dev/null
@@ -1,892 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
- <!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
-]>
-
-<api-answers
- question-version="1.29"
- author="pavel.buzek@sun.com"
->
-
- &api-questions;
-
-<!--
- <question id="arch-what" when="init" >
- What is this project good for?
- <hint>
- Please provide here a few lines describing the project,
- what problem it should solve, provide links to documentation,
- specifications, etc.
- </hint>
- </question>
--->
-
-<answer id="arch-what">
-<p>
-There are multiple IDE modules that need access to definition of web module.
-On one side there are modules that provide wizards, edititing, debugging etc.
-for JSPs, web.xml, servlets, and similar. On the other side there are also
-multiple project types that can contain web modules in them.
-This API/SPI exists for communication between these two types of modules.
-</p>
-</answer>
-
-<!--
- <question id="arch-overall" when="init">
- Describe the overall architecture.
- <hint>
- What will be API for
- <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
- clients and what support API</a>?
- What parts will be pluggable?
- How will plug-ins be registered? Please use <code><api type="export"/></code>
- to describe your general APIs.
- If possible please provide
- simple diagrams.
- </hint>
- </question>
--->
-<answer id="arch-overall">
-<p>
-<api group="java" name="WebModuleAPI" type="export" category="devel">
-The API part provides access to web module properties and defines constants for use
-web module projects (such as action commands or source types).
-The SPI part can be implemented by modules that provide web module "project" support.
-It can be implemented with project APIs but other implementations are also possible.
-There is also an SPI which allows implementors to provides support for web frameworks
-such as Struts and JSF.
-</api>
-</p>
-</answer>
-<!--
- <question id="arch-usecases" when="init">
- Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
- use cases</a> of the new API. Who will use it at
- what circumstances and what will be the typical code to write
- to use the module.
- </question>
--->
-<answer id="arch-usecases">
- <usecase id="web-module-properties" name="Retrieving the propertis of a web module">
- <p>
- The <code>WebModule</code> class, which encapsulates a web module, has methods
- for retrieving the module's properties:
- </p>
- <pre xml:space="preserve">
- FileObject myServlet = ...;
- WebModule wm1 = WebModule.getWebModule (myServlet);
- String version = wm1.getJ2eePlatformVersion ();
- System.out.println ("Servlet is in version:" + version + " web module");
- </pre>
- </usecase>
- <usecase id="web-module-implementation" name="Implementing a web module">
- <p>
- Most often the web module is implemented inside a project:
- </p>
- <pre xml:space="preserve">
- public class MyProjectType implements Project {
- Lookup getLookup () {
- return Lookups.fixed(new Object[] {
- new MyProvider (),
- ...
- }
- }
- private class MyProvider implements WebModuleProvider {
- WebModule findWebModule(FileObject file) {
- if (isMyFile (file)) {
- WebModule wm;
- synchronized (this) {
- wm = cachedWebModule (file);
- if (wm == null) {
- wm = WebModuleFactory.createWebModule (new WebModuleImpl ());
- cache (file, wm);
- }
- }
- return wm;
- }
- }
- boolean isMyFile (FileObject file) {...}
- WebModule cachedWebModule (FileObject file) {...}
- cache (FileObject file, WebModule wm) {...}
- }
-
- private class WebModuleImpl implements WebModuleImplementation {
- ...
- }
- }
- </pre>
- <p>
- It is also possible to implement web modules backed by other means than
- a project by implementing a <code>WebModuleProvider</code> and registering
- it in the default lookup.
- </p>
- </usecase>
- <usecase id="web-framework-implementation" name="Implementing support for a web framework">
- <p>
- Support for web frameworks, such as Struts and JSF, can
- extend a <code>WebModule</code> with framework-specific features, such as configuration files. An implementor
- wanting to provide such support implements <code>WebFrameworkProvider</code> and registers it in the
- <code>j2ee/webtier/framework</code> in the default file system.
- </p>
- </usecase>
-</answer>
-<!--
- <question id="arch-time" when="init">
- What are the time estimates of the work?
- <hint>
- Please express your estimates of how long the design, implementation,
- stabilization are likely to last. How many people will be needed to
- implement this and what is the expected milestone the work should be
- ready.
- </hint>
- </question>
--->
-<answer id="arch-time">
-The work scoped for promotion D is to make the API/SPI suite the needs of web
-apps and the new build system implementation. This work is done.
-</answer>
-<!--
- <question id="arch-quality" when="init">
- How the quality of your code will be tested and
- how future regressions are going to be prevented?
- <hint>
- What kind of testing you want to use? What/how much area of functionality
- should be covered by the tests?
- </hint>
- </question>
--->
-<answer id="arch-quality">
-There are unit tests for registration of web module providers in global lookup.
-Additional tests in ant/freeform module test a provider that is registered in
-project lookup and test all properties of the web module on this provider.
-</answer>
-<!--
- </category>
- <category id="dep" name="Project and platform dependencies">
- <question id="dep-nb" when="init" >
- What other NetBeans projects and modules does this one depend on?
- <hint>
- If you want, describe such projects as imported API using
- the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
- </hint>
- </question>
--->
-<answer id="dep-nb">
-<defaultanswer generate='here' />
-</answer>
-<!--
- <question id="dep-non-nb" when="init" >
- What other projects outside NetBeans does this one depend on?
-
- <hint>
- Some non-NetBeans projects are packaged as NetBeans modules
- (see <a href="http://libs.netbeans.org/">libraries</a>) and
- it is preferred to use this approach when more modules may
- depend on such third-party library.
- </hint>
- </question>
--->
-<answer id="dep-non-nb">
-None.
-</answer>
-<!--
- <question id="dep-platform" when="init" >
- On which platforms does your module run? Does it run in the same
- way on each?
- <hint>
- If your module is using JNI or deals with special differences of
- OSes like filesystems, etc. please describe here what they are.
- </hint>
- </question>
--->
-<answer id="dep-platform">
-It should run anywhere.
-</answer>
-<!--
- <question id="dep-jre" when="final" >
- Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
- <hint>
- It is expected that if your module runs on 1.x that it will run
- on 1.x+1 if no, state that please. Also describe here cases where
- you run different code on different versions of JRE and why.
- </hint>
- </question>
--->
-<answer id="dep-jre">
-JRE 1.3
-</answer>
-<!--
- <question id="dep-jrejdk" when="final" >
- Do you require the JDK or is the JRE enough?
- </question>
--->
-<answer id="dep-jrejdk">
-JRE is enough.
-</answer>
-<!--
- </category>
- <category id="deploy" name="Deployment">
- <question id="deploy-jar" when="impl" >
- Do you deploy just module JAR file(s) or other files as well?
- <hint>
- If your module consists of just one module JAR file, just confirm that.
- If it uses more than one JAR, describe where they are located, how
- they refer to each other.
- If it consist of module JAR(s) and other files, please describe
- what is their purpose, why other files are necessary. Please
- make sure that installation/uninstallation leaves the system
- in state as it was before installation.
- </hint>
- </question>
--->
-<answer id="deploy-jar">
-No other files are deployed.
-</answer>
-<!--
- <question id="deploy-nbm" when="impl" >
- Can you deploy an NBM via the Update Center?
- <hint>
- If not why?
- </hint>
- </question>
--->
-<answer id="deploy-nbm">
-Yes
-</answer>
-<!--
- <question id="deploy-shared" when="final" >
- Do you need to be installed in the shared location only, or in the user directory only,
- or can your module be installed anywhere?
- <hint>
- Installation location shall not matter, if it does explain why.
- Consider also whether <code>InstalledFileLocator</code> can help.
- </hint>
- </question>
--->
-<answer id="deploy-shared">
-Anywhere.
-</answer>
-<!--
- <question id="deploy-packages" when="init" >
- Are packages of your module made inaccessible by not declaring them public?
- <hint>
- NetBeans module system allows restriction of access rights to
- public classes of your module from other modules. This prevents
- unwanted dependencies of others on your code and should be used
- whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
- public packages
- </a>). If you do not restrict access to your classes you are
- making it too easy for other people to misuse your implementation
- details, that is why you should have good reason for not
- restricting package access.
- </hint>
- </question>
--->
-<answer id="deploy-packages">
-<p>
-There are 2 public packages that are both specified in manifest:
-</p>
-<ul>
-<li>org.netbeans.modules.web.api.webmodule</li>
-<li>org.netbeans.modules.web.spi.webmodule</li>
-</ul>
-</answer>
-<answer id="deploy-dependencies">
-<p>
-Nothing.
-</p>
-</answer>
-<!--
- </category>
- <category id="compat" name="Compatibility with environment">
- <question id="compat-i18n" when="impl" >
- Is your module correctly internationalized?
- <hint>
- Correct internationalization means that it obeys instructions
- at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
- NetBeans I18N pages</a>.
- </hint>
- </question>
--->
-<answer id="compat-i18n">
-Not applicable.
-</answer>
-<!--
- <question id="compat-standards" when="init" >
- Does the module implement or define any standards? Is the
- implementation exact or does it deviate somehow?
- </question>
--->
-<answer id="compat-standards">
-No.
-</answer>
-<!--
- <question id="compat-version" when="impl" >
- Can your module coexist with earlier and future
- versions of itself? Can you correctly read all old settings? Will future
- versions be able to read your current settings? Can you read
- or politely ignore settings stored by a future version?
-
- <hint>
- Very helpful for reading settings is to store version number
- there, so future versions can decide whether how to read/convert
- the settings and older versions can ignore the new ones.
- </hint>
- </question>
--->
-<answer id="compat-version">
-This is the first version. Modules does not store any settings.
-</answer>
-<!--
- </category>
- <category id="resources" name="Access to resources">
- <question id="resources-file" when="final">
- Does your module use <code>java.io.File</code> directly?
- <hint>
- NetBeans provide a logical wrapper over plain files called
- <code>org.openide.filesystems.FileObject</code> that
- provides uniform access to such resources and is the preferred
- way that should be used. But of course there can be situations when
- this is not suitable.
- </hint>
- </question>
--->
-<answer id="resources-file">
-No.
-</answer>
-<!--
- <question id="resources-layer" when="final">
- Does your module provide own layer? Does it create any files or
- folders in it? What it is trying to communicate by that and with which
- components?
-
- <hint>
- NetBeans allows automatic and declarative installation of resources
- by module layers. Module register files into appropriate places
- and other components use that information to perform their task
- (build menu, toolbar, window layout, list of templates, set of
- options, etc.).
- </hint>
- </question>
--->
-<answer id="resources-layer">
-No.
-</answer>
-<!--
- <question id="resources-read" when="final">
- Does your module read any resources from layers? For what purpose?
-
- <hint>
- As this is some kind of intermodule dependency, it is a kind of API.
- Please describe it and classify according to
- <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
- common stability categories</a>.
- </hint>
- </question>
--->
-<answer id="resources-read">
-No.
-</answer>
-<!--
- <question id="resources-mask" when="final">
- Does your module mask/hide/override any resources provided by other modules in
- their layers?
-
- <hint>
- If you mask a file provided by another module, you probably depend
- on that and do not want the other module to (for example) change
- the file's name. That module shall thus make that file available as an API
- of some stability category.
- </hint>
- </question>
- </category>
--->
-<answer id="resources-mask">
-No.
-</answer>
-<!--
- <category id="lookup" name="Lookup of components">
- <question id="lookup-lookup" when="init" >
- Does your module use <code>org.openide.util.Lookup</code>
- to find any components to communicate with? Which ones?
-
- <hint>
- Please describe the interfaces you are searching for, where
- are defined, whether you are searching for just one or more of them,
- if the order is important, etc. Also classify the stability of such
- API contract.
- </hint>
- </question>
--->
-<answer id="lookup-lookup">
-<p>
-The module is looking for <code>org.netbeans.spi.web.webmodule.WebModuleProvider</code> instances
-and uses them to resolve <code>org.netbeans.api.web.webmodule.WebModule.getWebModule()</code> query.
-</p>
-</answer>
-<!--
- <question id="lookup-register" when="final" >
- Do you register anything into lookup for other code to find?
- <hint>
- Do you register using layer file or using <code>META-INF/services</code>?
- Who is supposed to find your component?
- </hint>
- </question>
--->
-<answer id="lookup-register">
-<p>
-The module registers an instance of <code>org.netbeans.spi.web.webmodule.WebModuleProvider</code>
-that implements the query based on projects - it delegates to <code>WebModuleProvider</code>
-instances found in lookup of the project that owns the given file.
-</p>
-</answer>
-<!--
- <question id="lookup-remove" when="final" >
- Do you remove entries of other modules from lookup?
- <hint>
- Why? Of course, that is possible, but it can be dangerous. Is the module
- your are masking resource from aware of what you are doing?
- </hint>
- </question>
--->
-<answer id="lookup-remove">
-No.
-</answer>
-<!--
- </category>
--->
- <!-- classification of interfaces -->
- <!-- package names -->
-<!--
- <category id="exec" name="Execution Environment">
- <question id="exec-property" when="impl" >
- Is execution of your code influenced by any environment or
- Java system (<code>System.getProperty</code>) property?
-
- <hint>
- If there is a property that can change the behavior of your
- code, somebody will likely use it. You should describe what it does
- and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
- of this API. You may use
- <pre>
- <api type="export" group="property" name="id" category="private" url="http://...">
- description of the property, where it is used, what it influence, etc.
- </api>
- </pre>
- </hint>
- </question>
--->
-<answer id="exec-property">
-No.
-</answer>
-<!--
- <question id="exec-component" when="impl" >
- Is execution of your code influenced by any (string) property
- of any of your components?
-
- <hint>
- Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
- or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
- a behavior of some code. This of course forms an interface that should
- be documented. Also if one depends on some interface that an object
- implements (<code>component instanceof Runnable</code>) that forms an
- API as well.
- </hint>
- </question>
--->
-<answer id="exec-component">
-No.
-</answer>
-<!--
- <question id="exec-classloader" when="impl" >
- Does your code create its own class loader(s)?
- <hint>
- A bit unusual. Please explain why and what for.
- </hint>
- </question>
--->
-<answer id="exec-classloader">
-No.
-</answer>
-<!--
- <question id="exec-reflection" when="impl" >
- Does your code use Java Reflection to execute other code?
- <hint>
- This usually indicates a missing or insufficient API in the other
- part of the system. If the other side is not aware of your dependency
- this contract can be easily broken.
- </hint>
- </question>
--->
-<answer id="exec-reflection">
-No.
-</answer>
-<!--
- <question id="exec-privateaccess" when="final" >
- Are you aware of any other parts of the system calling some of
- your methods by reflection?
- <hint>
- If so, describe the "contract" as an API. Likely private or friend one, but
- still API and consider rewrite of it.
- </hint>
- </question>
--->
-<answer id="exec-privateaccess">
-No.
-</answer>
-<!--
- <question id="exec-process" when="impl" >
- Do you execute an external process from your module? How do you ensure
- that the result is the same on different platforms? Do you parse output?
- Do you depend on result code?
- <hint>
- If you feed an input, parse the output please declare that as an API.
- </hint>
- </question>
--->
-<answer id="exec-process">
-No.
-</answer>
-<!--
- <question id="exec-introspection" when="impl" >
- Does your module use any kind of runtime type information (<code>instanceof</code>,
- work with <code>java.lang.Class</code>, etc.)?
- <hint>
- Check for cases when you have an object of type A and you also
- expect it to (possibly) be of type B and do some special action. That
- should be documented. The same applies on operations in meta-level
- (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
- </hint>
- </question>
--->
-<answer id="exec-introspection">
-No.
-</answer>
-<!--
- <question id="exec-threading" when="impl">
- What threading models, if any, does your module adhere to?
- <hint>
- If your module calls foreign APIs which have a specific threading model,
- indicate how you comply with the requirements for multithreaded access
- (synchronization, mutexes, etc.) applicable to those APIs.
- If your module defines any APIs, or has complex internal structures
- that might be used from multiple threads, declare how you protect
- data against concurrent access, race conditions, deadlocks, etc.,
- and whether such rules are enforced by runtime warnings, errors, assertions, etc.
- Examples: a class might be non-thread-safe (like Java Collections); might
- be fully thread-safe (internal locking); might require access through a mutex
- (and may or may not automatically acquire that mutex on behalf of a client method);
- might be able to run only in the event queue; etc.
- Also describe when any events are fired: synchronously, asynchronously, etc.
- Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
- </hint>
- </question>
--->
-<answer id="exec-threading">
-None.
-</answer>
-<!--
- </category>
- <category id="format" name="Format of files and protocols">
- <question id="format-types" when="impl" >
- Which protocols and file formats (if any) does your module read or write on disk,
- or transmit or receive over the network?
- </question>
--->
-<answer id="format-types">
-None.
-</answer>
-<!--
- <question id="format-dnd" when="impl" >
- Which protocols (if any) does your code understand during Drag & Drop?
- <hint>
- Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
- Check your code for overriding these methods. Btw. if they are not overridden, they
- by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
- </hint>
- </question>
--->
-<answer id="format-dnd">
-Not applicable.
-</answer>
-<!--
- <question id="format-clipboard" when="impl" >
- Which data flavors (if any) does your code read from or insert to
- the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
-
- <hint>
- Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
- Check your code for overriding these methods.
- </hint>
- </question>
--->
-<answer id="format-clipboard">
-Not applicable.
-</answer>
-<!--
- </category>
- <category id="performance" name="Performance and Scalability">
- <question id="perf-startup" when="final" >
- Does your module run any code on startup?
- </question>
--->
-<answer id="perf-startup">
-No.
-</answer>
-<!--
- <question id="perf-exit" when="final">
- Does your module run any code on exit?
- </question>
--->
-<answer id="perf-exit">
-No.
-</answer>
-<!--
- <question id="perf-scale" when="init">
- Which external criteria influence the performance of your
- program (size of file in editor, number of files in menu,
- in source directory, etc.) and how well your code scales?
- <hint>
- Please include some estimates, there are other more detailed
- questions to answer in later phases of implementation.
- </hint>
- </question>
--->
-<answer id="perf-scale">
-Number of registered web module providers, number of open projects.
-No performance problems anticipated.
-</answer>
-<!--
- <question id="perf-limit" when="init">
- Are there any hard-coded or practical limits in the number or size of
- elements your code can handle?
- </question>
--->
-<answer id="perf-limit">
-Not aware of any.
-</answer>
- <!-- multithreading -->
-<!--
- <question id="perf-mem" when="final" >
- How much memory does your component consume? Estimate
- with a relation to the number of windows, etc.
- </question>
--->
-<answer id="perf-mem">
-The memory consumption of this module does not grow with number of implementations,
-the memory would be consumed by the implementation modules.
-</answer>
-<!--
- <question id="perf-wakeup" when="final">
- Does any piece of your code wake up periodically and do something
- even when the system is otherwise idle (no user interaction)?
- </question>
--->
-<answer id="perf-wakeupp">
-No.
-</answer>
-<!--
- <question id="perf-progress" when="final">
- Does your module execute any long-running tasks?
-
- <hint>Long running tasks should never block
- AWT thread as it badly hurts the UI
- <a href="http://performance.netbeans.org/responsiveness/issues.html">
- responsiveness</a>.
- Tasks like connecting over
- network, computing huge amount of data, compilation
- be done asynchronously (for example
- using <code>RequestProcessor</code>), definitively it should
- not block AWT thread.
- </hint>
- </question>
--->
-<answer id="perf-progress">
-No.
-</answer>
-<!--
- <question id="perf-huge_dialogs" when="final">
- Does your module contain any dialogs or wizards with a large number of
- GUI controls such as combo boxes, lists, trees, or text areas?
- </question>
--->
-<answer id="perf-huge_dialogs">
-No.
-</answer>
-<!--
- <question id="perf-menus" when="final">
- Does your module use dynamically updated context menus, or
- context-sensitive actions with complicated enablement logic?
- </question>
--->
-<answer id="perf-menus">
-No.
-</answer>
-<!--
- <question id="perf-spi" when="init">
- How the performance of the plugged in code will be enforced?
- <hint>
- If you allow foreign code to be plugged into your own module, how
- do you enforce, that it will behave correctly and fast and will not
- negatively influence the performance of your own module?
- </hint>
- </question>
--->
-<answer id="perf-spi">
-<code>WebModuleProvider.findWebModule()</code> is the critical method for SPI performance
-(both time and memory). It is expected that implementations will cache the results
-and that the implementation will be reasonably fast.
-</answer>
-
-
-<!--
- <question id="exec-ant-tasks" when="impl">
- Do you define or register any ant tasks that other can use?
-
- <hint>
- If you provide an ant task that users can use, you need to be very
- careful about its syntax and behaviour, as it most likely forms an
- API for end users and as there is a lot of end users, their reaction
- when such API gets broken can be pretty strong.
- </hint>
- </question>
--->
- <answer id="exec-ant-tasks">
- <p>
- No
- </p>
- </answer>
-
-
-
-<!--
- <question id="perf-wakeup" when="final">
- Does any piece of your code wake up periodically and do something
- even when the system is otherwise idle (no user interaction)?
- </question>
--->
- <answer id="perf-wakeup">
- <p>
- No
- </p>
- </answer>
-
-
-
-<!--
- <question id="security-grant" when="final">
- Does your code grant additional rights to some other code?
- <hint>Avoid using a class loader that adds extra
- permissions to loaded code unless really necessary.
- Also note that your API implementation
- can also expose unneeded permissions to enemy code by
- calling AccessController.doPrivileged().</hint>
- </question>
--->
- <answer id="security-grant">
- <p>
- No
- </p>
- </answer>
-
-
-
-<!--
- <question id="security-policy" when="final">
- Does your functionality require modifications to the standard policy file?
- <hint>Your code might pass control to third-party code not
- coming from trusted domains. This could be code downloaded over the
- network or code coming from libraries that are not bundled
- with NetBeans. Which permissions need to be granted to which domains?</hint>
- </question>
--->
- <answer id="security-policy">
- <p>
- No
- </p>
- </answer>
-
-
-
-
-
-
-<!--
- <question id="arch-where" when="impl">
- Where one can find sources for your module?
- <hint>
- Please provide link to the CVS web client at
- http://www.netbeans.org/download/source_browse.html
- or just use tag defaultanswer generate='here'
- </hint>
- </question>
--->
- <answer id="arch-where">
- <defaultanswer generate='here' />
- </answer>
-
-
-
-<!--
- <question id="compat-deprecation" when="init">
- How the introduction of your project influences functionality
- provided by previous version of the product?
- <hint>
- If you are planning to deprecate/remove/change any existing APIs,
- list them here accompanied with the reason explaining why you
- are doing so.
- </hint>
- </question>
--->
- <answer id="compat-deprecation">
- <p>
- This module does not deprecate any existing APIs.
- </p>
- </answer>
-
-
-
-<!--
- <question id="resources-preferences" when="final">
- Does your module uses preferences via Preferences API? Does your module use NbPreferences or
- or regular JDK Preferences ? Does it read, write or both ?
- Does it share preferences with other modules ? If so, then why ?
- <hint>
- You may use
- <api type="export" group="preferences"
- name="preference node name" category="private">
- description of individual keys, where it is used, what it
- influences, whether the module reads/write it, etc.
- </api>
- Due to XML ID restrictions, rather than /org/netbeans/modules/foo give the "name" as org.netbeans.modules.foo.
- Note that if you use NbPreferences this name will then be the same as the code name base of the module.
- </hint>
- </question>
--->
- <answer id="resources-preferences">
- <p>
- No.
- </p>
- </answer>
-
-</api-answers>
diff --git a/api.web.webmodule/build.xml b/api.web.webmodule/build.xml
deleted file mode 100644
index abac896683..0000000000
--- a/api.web.webmodule/build.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project basedir="." default="netbeans" name="api.web.webmodule">
- <import file="../nbbuild/templates/projectized.xml"/>
-</project>
diff --git a/cloud.amazon/build.xml b/cloud.amazon/build.xml
deleted file mode 100644
index cf577a588b..0000000000
--- a/cloud.amazon/build.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project basedir="." default="netbeans" name="cloud.amazon">
- <description>Builds, tests, and runs the project org.netbeans.modules.cloud.amazon</description>
- <import file="../nbbuild/templates/projectized.xml"/>
- <property name="resourcesdir" value="./src/org/netbeans/modules/cloud/amazon/resources/"/>
-
- <war destfile = "${resourcesdir}/empty.war" webxml = "${resourcesdir}/web.xml">
- <fileset dir="${resourcesdir}/">
- <include name="welcome.jsp"/>
- </fileset>
- <classes dir="${resourcesdir}/">
- <exclude name="**/*"/>
- </classes>
- </war>
-</project>
diff --git a/cloud.common/build.xml b/cloud.common/build.xml
deleted file mode 100644
index f0711271ed..0000000000
--- a/cloud.common/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project basedir="." default="netbeans" name="cloud.common">
- <description>Builds, tests, and runs the project org.netbeans.modules.cloud.common</description>
- <import file="../nbbuild/templates/projectized.xml"/>
-</project>
diff --git a/el.lexer/build.xml b/el.lexer/build.xml
deleted file mode 100644
index d276ac8454..0000000000
--- a/el.lexer/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<project name="el.lexer" default="netbeans" basedir=".">
-
- <import file="../nbbuild/templates/projectized.xml"/>
-
-</project>
diff --git a/enterprise/api.web.webmodule/apichanges.xml b/enterprise/api.web.webmodule/apichanges.xml
new file mode 100644
index 0000000000..63dcad6c94
--- /dev/null
+++ b/enterprise/api.web.webmodule/apichanges.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+ <api name="compiler"/>
+ <summary>Some brief description here, can use <b>XHTML</b></summary>
+ <version major="1" minor="99"/>
+ <date day="13" month="6" year="2001"/>
+ <author login="jrhacker"/>
+ <compatibility addition="yes"/>
+ <description>
+ The main description of the change here.
+ Again can use full <b>XHTML</b> as needed.
+ </description>
+ <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+ <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+ <!-- First, a list of API names you may use: -->
+ <apidefs>
+ <apidef name="WebModuleAPI">Web Module API</apidef>
+ </apidefs>
+
+ <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+ <changes>
+ <change id="Adding_WebModuleExtender_Savable">
+ <api name="WebModuleAPI"/>
+ <summary>Adding <code>WebModuleExtender.Savable</code> interface</summary>
+ <version major="1" minor="26"/>
+ <date day="26" month="9" year="2011"/>
+ <author login="marfous@netbeans.org"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ Added interface <code>WebModuleExtender.Savable</code> for ability to
+ save framework settings of already included extender after confirming
+ project customizer.
+ </p>
+ </description>
+ </change>
+ <change id="ListenableWebModuleImplementation2">
+ <api name="WebModuleAPI"/>
+ <summary>Adding ability to listen on WebModuleImplementation2 changes</summary>
+ <version major="1" minor="16"/>
+ <date day="21" month="9" year="2009"/>
+ <author login="dkonecny"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ Adding ability to listen on changes of document base or
+ WEB-INF folder. WebModuleImplementation2 was introduced in this
+ release so I'm taking advantage of it and adding requested methods.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="WebModuleImplementation2"/>
+ <issue number="154944"/>
+ </change>
+ <change id="Adding_requresWebXml">
+ <api name="WebModuleAPI"/>
+ <summary>Adding method requiresWebXml</summary>
+ <version major="1" minor="15"/>
+ <date day="1" month="7" year="2009"/>
+ <author login="pslechta@netbeans.org"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ New method requiresWebXml added. Framework specifies via this method if it reqires web.xml DD or not.
+ </p>
+ </description>
+ </change>
+ <change id="Making_WebModuleAPI_Public">
+ <api name="WebModuleAPI"/>
+ <summary>Making the WebModule API public</summary>
+ <version major="1" minor="10"/>
+ <date day="28" month="9" year="2007"/>
+ <author login="abadea@netbeans.org"/>
+ <compatibility modification="yes"/>
+ <description>
+ <p>
+ Made the WebModule API public with the stability level "under development".
+ </p>
+ </description>
+ <issue number="112441"/>
+ </change>
+ <change id="Deprecating_WebFrameworkProvider_Methods">
+ <api name="WebModuleAPI"/>
+ <summary>Deprecating <code>WebFrameworkProvider.extend()</code> and <code>WebFrameworkProvider.getConfigurationPanel()</code></summary>
+ <version major="1" minor="9"/>
+ <date day="14" month="9" year="2007"/>
+ <author login="abadea@netbeans.org"/>
+ <compatibility deprecation="yes"/>
+ <description>
+ <p>
+ Deprecated methods <code>WebFrameworkProvider.extend()</code> and <code>WebFrameworkProvider.getConfigurationPanel()</code>.
+ Class <code>WebConfigurationPanel</code> has been deprecated too.
+ </p>
+ <p>
+ Introduced a <code>WebModuleExtender</code> class and a <code>WebModule.createWebModuleExtender()</code> method returning it.
+ This allows for better encapsulation of the web module extending process.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="FrameworkConfigurationPanel"/>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="WebFrameworkProvider"/>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="WebModuleExtender"/>
+ </change>
+ <change id="Deprecating_getJavaSources">
+ <api name="WebModuleAPI"/>
+ <summary>Deprecating <code>WebModule.getJavaSources</code></summary>
+ <version major="1" minor="9"/>
+ <date day="14" month="9" year="2007"/>
+ <author login="abadea@netbeans.org"/>
+ <compatibility deprecation="yes"/>
+ <description>
+ <p>
+ Deprecated <code>WebModule.getJavaSources</code> because its return value is not generic enough.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.web.api.webmodule" name="WebModule"/>
+ </change>
+ <change id="Adding_getServletPath">
+ <api name="WebModuleAPI"/>
+ <summary>Adding <code>WebFrameworkProvider.getServletPath()</code></summary>
+ <version major="1" minor="5"/>
+ <date day="8" month="3" year="2006"/>
+ <author login="ppisl@netbeans.org"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ Added method <code>WebFrameworkProvider.getServletPath()</code> for obtaining the servlet path for a JSP.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="WebFrameworkProvider"/>
+ </change>
+ <change id="Adding_Framework_Support">
+ <api name="WebModuleAPI"/>
+ <summary>Adding web framework support</summary>
+ <version major="1" minor="4"/>
+ <date day="28" month="7" year="2005"/>
+ <author login="ppisl@netbeans.org"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ There are some frameworks like Struts, JSF, Spring etc., which extend the web applications.
+ This change introduces the concept of a web framework provider to the Web Module API/SPI
+ which allows to implement supporting these frameworks.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.web.api.webmodule" name="WebFrameworks"/>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="WebFrameworkProvider"/>
+ </change>
+
+ <change id="Remove_URLCookie">
+ <api name="WebModuleAPI"/>
+ <summary>Replace URLCookie with a RequestParametersQuery API and RequestParametersQueryImplementation SPI</summary>
+ <version major="1" minor="2"/>
+ <date day="27" month="1" year="2005"/>
+ <author login="pbuzek@netbeans.org"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="no"/>
+ <description>
+ <p>
+ Node.Cookie should not be exposed in API. The URLCookie has been replaced with a query pattern
+ with a corresponding SPI.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.web.api.webmodule" name="URLCookie" link="no" />
+ <class package="org.netbeans.modules.web.api.webmodule" name="RequestParametersQuery"/>
+ <class package="org.netbeans.modules.web.spi.webmodule" name="RequestParametersQueryImplementation"/>
+ </change>
+ </changes>
+
+ <!-- Now the surrounding HTML text and document structure: -->
+
+ <htmlcontents>
+<!--
+
+ NO NO NO NO NO!
+
+ ==============> DO NOT EDIT ME! <==============
+
+ AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+ SEE web/webapi/apichanges.xml
+
+-->
+ <head>
+ <title>Change History for the WebModule API</title>
+ <link rel="stylesheet" href="prose.css" type="text/css"/>
+ </head>
+ <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the <a href="@TOP@overview-summary.html">WebModule API</a>.</p>
+
+<!-- The actual lists of changes, as summaries and details: -->
+ <hr/>
+ <standard-changelists module-code-name="org.netbeans.api.web.webmodule"/>
+
+ <hr/><p>@FOOTER@</p>
+
+ </body>
+ </htmlcontents>
+
+</apichanges>
diff --git a/enterprise/api.web.webmodule/arch.xml b/enterprise/api.web.webmodule/arch.xml
new file mode 100644
index 0000000000..58a9161421
--- /dev/null
+++ b/enterprise/api.web.webmodule/arch.xml
@@ -0,0 +1,892 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.29"
+ author="pavel.buzek@sun.com"
+>
+
+ &api-questions;
+
+<!--
+ <question id="arch-what" when="init" >
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+
+<answer id="arch-what">
+<p>
+There are multiple IDE modules that need access to definition of web module.
+On one side there are modules that provide wizards, edititing, debugging etc.
+for JSPs, web.xml, servlets, and similar. On the other side there are also
+multiple project types that can contain web modules in them.
+This API/SPI exists for communication between these two types of modules.
+</p>
+</answer>
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+<answer id="arch-overall">
+<p>
+<api group="java" name="WebModuleAPI" type="export" category="devel">
+The API part provides access to web module properties and defines constants for use
+web module projects (such as action commands or source types).
+The SPI part can be implemented by modules that provide web module "project" support.
+It can be implemented with project APIs but other implementations are also possible.
+There is also an SPI which allows implementors to provides support for web frameworks
+such as Struts and JSF.
+</api>
+</p>
+</answer>
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it at
+ what circumstances and what will be the typical code to write
+ to use the module.
+ </question>
+-->
+<answer id="arch-usecases">
+ <usecase id="web-module-properties" name="Retrieving the propertis of a web module">
+ <p>
+ The <code>WebModule</code> class, which encapsulates a web module, has methods
+ for retrieving the module's properties:
+ </p>
+ <pre xml:space="preserve">
+ FileObject myServlet = ...;
+ WebModule wm1 = WebModule.getWebModule (myServlet);
+ String version = wm1.getJ2eePlatformVersion ();
+ System.out.println ("Servlet is in version:" + version + " web module");
+ </pre>
+ </usecase>
+ <usecase id="web-module-implementation" name="Implementing a web module">
+ <p>
+ Most often the web module is implemented inside a project:
+ </p>
+ <pre xml:space="preserve">
+ public class MyProjectType implements Project {
+ Lookup getLookup () {
+ return Lookups.fixed(new Object[] {
+ new MyProvider (),
+ ...
+ }
+ }
+ private class MyProvider implements WebModuleProvider {
+ WebModule findWebModule(FileObject file) {
+ if (isMyFile (file)) {
+ WebModule wm;
+ synchronized (this) {
+ wm = cachedWebModule (file);
+ if (wm == null) {
+ wm = WebModuleFactory.createWebModule (new WebModuleImpl ());
+ cache (file, wm);
+ }
+ }
+ return wm;
+ }
+ }
+ boolean isMyFile (FileObject file) {...}
+ WebModule cachedWebModule (FileObject file) {...}
+ cache (FileObject file, WebModule wm) {...}
+ }
+
+ private class WebModuleImpl implements WebModuleImplementation {
+ ...
+ }
+ }
+ </pre>
+ <p>
+ It is also possible to implement web modules backed by other means than
+ a project by implementing a <code>WebModuleProvider</code> and registering
+ it in the default lookup.
+ </p>
+ </usecase>
+ <usecase id="web-framework-implementation" name="Implementing support for a web framework">
+ <p>
+ Support for web frameworks, such as Struts and JSF, can
+ extend a <code>WebModule</code> with framework-specific features, such as configuration files. An implementor
+ wanting to provide such support implements <code>WebFrameworkProvider</code> and registers it in the
+ <code>j2ee/webtier/framework</code> in the default file system.
+ </p>
+ </usecase>
+</answer>
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone the work should be
+ ready.
+ </hint>
+ </question>
+-->
+<answer id="arch-time">
+The work scoped for promotion D is to make the API/SPI suite the needs of web
+apps and the new build system implementation. This work is done.
+</answer>
+<!--
+ <question id="arch-quality" when="init">
+ How the quality of your code will be tested and
+ how future regressions are going to be prevented?
+ <hint>
+ What kind of testing you want to use? What/how much area of functionality
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+<answer id="arch-quality">
+There are unit tests for registration of web module providers in global lookup.
+Additional tests in ant/freeform module test a provider that is registered in
+project lookup and test all properties of the web module on this provider.
+</answer>
+<!--
+ </category>
+ <category id="dep" name="Project and platform dependencies">
+ <question id="dep-nb" when="init" >
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported API using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+<answer id="dep-nb">
+<defaultanswer generate='here' />
+</answer>
+<!--
+ <question id="dep-non-nb" when="init" >
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+<answer id="dep-non-nb">
+None.
+</answer>
+<!--
+ <question id="dep-platform" when="init" >
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+<answer id="dep-platform">
+It should run anywhere.
+</answer>
+<!--
+ <question id="dep-jre" when="final" >
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+<answer id="dep-jre">
+JRE 1.3
+</answer>
+<!--
+ <question id="dep-jrejdk" when="final" >
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+<answer id="dep-jrejdk">
+JRE is enough.
+</answer>
+<!--
+ </category>
+ <category id="deploy" name="Deployment">
+ <question id="deploy-jar" when="impl" >
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+<answer id="deploy-jar">
+No other files are deployed.
+</answer>
+<!--
+ <question id="deploy-nbm" when="impl" >
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+<answer id="deploy-nbm">
+Yes
+</answer>
+<!--
+ <question id="deploy-shared" when="final" >
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+<answer id="deploy-shared">
+Anywhere.
+</answer>
+<!--
+ <question id="deploy-packages" when="init" >
+ Are packages of your module made inaccessible by not declaring them public?
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+<answer id="deploy-packages">
+<p>
+There are 2 public packages that are both specified in manifest:
+</p>
+<ul>
+<li>org.netbeans.modules.web.api.webmodule</li>
+<li>org.netbeans.modules.web.spi.webmodule</li>
+</ul>
+</answer>
+<answer id="deploy-dependencies">
+<p>
+Nothing.
+</p>
+</answer>
+<!--
+ </category>
+ <category id="compat" name="Compatibility with environment">
+ <question id="compat-i18n" when="impl" >
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+<answer id="compat-i18n">
+Not applicable.
+</answer>
+<!--
+ <question id="compat-standards" when="init" >
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+<answer id="compat-standards">
+No.
+</answer>
+<!--
+ <question id="compat-version" when="impl" >
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+<answer id="compat-version">
+This is the first version. Modules does not store any settings.
+</answer>
+<!--
+ </category>
+ <category id="resources" name="Access to resources">
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+<answer id="resources-file">
+No.
+</answer>
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+<answer id="resources-layer">
+No.
+</answer>
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+<answer id="resources-read">
+No.
+</answer>
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+ </category>
+-->
+<answer id="resources-mask">
+No.
+</answer>
+<!--
+ <category id="lookup" name="Lookup of components">
+ <question id="lookup-lookup" when="init" >
+ Does your module use <code>org.openide.util.Lookup</code>
+ to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract.
+ </hint>
+ </question>
+-->
+<answer id="lookup-lookup">
+<p>
+The module is looking for <code>org.netbeans.spi.web.webmodule.WebModuleProvider</code> instances
+and uses them to resolve <code>org.netbeans.api.web.webmodule.WebModule.getWebModule()</code> query.
+</p>
+</answer>
+<!--
+ <question id="lookup-register" when="final" >
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+<answer id="lookup-register">
+<p>
+The module registers an instance of <code>org.netbeans.spi.web.webmodule.WebModuleProvider</code>
+that implements the query based on projects - it delegates to <code>WebModuleProvider</code>
+instances found in lookup of the project that owns the given file.
+</p>
+</answer>
+<!--
+ <question id="lookup-remove" when="final" >
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+<answer id="lookup-remove">
+No.
+</answer>
+<!--
+ </category>
+-->
+ <!-- classification of interfaces -->
+ <!-- package names -->
+<!--
+ <category id="exec" name="Execution Environment">
+ <question id="exec-property" when="impl" >
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+<answer id="exec-property">
+No.
+</answer>
+<!--
+ <question id="exec-component" when="impl" >
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+<answer id="exec-component">
+No.
+</answer>
+<!--
+ <question id="exec-classloader" when="impl" >
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+<answer id="exec-classloader">
+No.
+</answer>
+<!--
+ <question id="exec-reflection" when="impl" >
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+<answer id="exec-reflection">
+No.
+</answer>
+<!--
+ <question id="exec-privateaccess" when="final" >
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+<answer id="exec-privateaccess">
+No.
+</answer>
+<!--
+ <question id="exec-process" when="impl" >
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+<answer id="exec-process">
+No.
+</answer>
+<!--
+ <question id="exec-introspection" when="impl" >
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+<answer id="exec-introspection">
+No.
+</answer>
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+<answer id="exec-threading">
+None.
+</answer>
+<!--
+ </category>
+ <category id="format" name="Format of files and protocols">
+ <question id="format-types" when="impl" >
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+<answer id="format-types">
+None.
+</answer>
+<!--
+ <question id="format-dnd" when="impl" >
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+<answer id="format-dnd">
+Not applicable.
+</answer>
+<!--
+ <question id="format-clipboard" when="impl" >
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+<answer id="format-clipboard">
+Not applicable.
+</answer>
+<!--
+ </category>
+ <category id="performance" name="Performance and Scalability">
+ <question id="perf-startup" when="final" >
+ Does your module run any code on startup?
+ </question>
+-->
+<answer id="perf-startup">
+No.
+</answer>
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+<answer id="perf-exit">
+No.
+</answer>
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+<answer id="perf-scale">
+Number of registered web module providers, number of open projects.
+No performance problems anticipated.
+</answer>
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+<answer id="perf-limit">
+Not aware of any.
+</answer>
+ <!-- multithreading -->
+<!--
+ <question id="perf-mem" when="final" >
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+<answer id="perf-mem">
+The memory consumption of this module does not grow with number of implementations,
+the memory would be consumed by the implementation modules.
+</answer>
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+<answer id="perf-wakeupp">
+No.
+</answer>
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+<answer id="perf-progress">
+No.
+</answer>
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+<answer id="perf-huge_dialogs">
+No.
+</answer>
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+<answer id="perf-menus">
+No.
+</answer>
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce, that it will behave correctly and fast and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+<answer id="perf-spi">
+<code>WebModuleProvider.findWebModule()</code> is the critical method for SPI performance
+(both time and memory). It is expected that implementations will cache the results
+and that the implementation will be reasonably fast.
+</answer>
+
+
+<!--
+ <question id="exec-ant-tasks" when="impl">
+ Do you define or register any ant tasks that other can use?
+
+ <hint>
+ If you provide an ant task that users can use, you need to be very
+ careful about its syntax and behaviour, as it most likely forms an
+ API for end users and as there is a lot of end users, their reaction
+ when such API gets broken can be pretty strong.
+ </hint>
+ </question>
+-->
+ <answer id="exec-ant-tasks">
+ <p>
+ No
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ No
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ No
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ No
+ </p>
+ </answer>
+
+
+
+
+
+
+<!--
+ <question id="arch-where" when="impl">
+ Where one can find sources for your module?
+ <hint>
+ Please provide link to the CVS web client at
+ http://www.netbeans.org/download/source_browse.html
+ or just use tag defaultanswer generate='here'
+ </hint>
+ </question>
+-->
+ <answer id="arch-where">
+ <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+ <question id="compat-deprecation" when="init">
+ How the introduction of your project influences functionality
+ provided by previous version of the product?
+ <hint>
+ If you are planning to deprecate/remove/change any existing APIs,
+ list them here accompanied with the reason explaining why you
+ are doing so.
+ </hint>
+ </question>
+-->
+ <answer id="compat-deprecation">
+ <p>
+ This module does not deprecate any existing APIs.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-preferences" when="final">
+ Does your module uses preferences via Preferences API? Does your module use NbPreferences or
+ or regular JDK Preferences ? Does it read, write or both ?
+ Does it share preferences with other modules ? If so, then why ?
+ <hint>
+ You may use
+ <api type="export" group="preferences"
+ name="preference node name" category="private">
+ description of individual keys, where it is used, what it
+ influences, whether the module reads/write it, etc.
+ </api>
+ Due to XML ID restrictions, rather than /org/netbeans/modules/foo give the "name" as org.netbeans.modules.foo.
+ Note that if you use NbPreferences this name will then be the same as the code name base of the module.
+ </hint>
+ </question>
+-->
+ <answer id="resources-preferences">
+ <p>
+ No.
+ </p>
+ </answer>
+
+</api-answers>
diff --git a/enterprise/api.web.webmodule/build.xml b/enterprise/api.web.webmodule/build.xml
new file mode 100644
index 0000000000..8038967f43
--- /dev/null
+++ b/enterprise/api.web.webmodule/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/api.web.webmodule">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/api.web.webmodule/manifest.mf b/enterprise/api.web.webmodule/manifest.mf
similarity index 100%
rename from api.web.webmodule/manifest.mf
rename to enterprise/api.web.webmodule/manifest.mf
diff --git a/api.web.webmodule/nbproject/org-netbeans-api-web-webmodule.sig b/enterprise/api.web.webmodule/nbproject/org-netbeans-api-web-webmodule.sig
similarity index 100%
rename from api.web.webmodule/nbproject/org-netbeans-api-web-webmodule.sig
rename to enterprise/api.web.webmodule/nbproject/org-netbeans-api-web-webmodule.sig
diff --git a/api.web.webmodule/nbproject/project.properties b/enterprise/api.web.webmodule/nbproject/project.properties
similarity index 100%
rename from api.web.webmodule/nbproject/project.properties
rename to enterprise/api.web.webmodule/nbproject/project.properties
diff --git a/api.web.webmodule/nbproject/project.xml b/enterprise/api.web.webmodule/nbproject/project.xml
similarity index 100%
rename from api.web.webmodule/nbproject/project.xml
rename to enterprise/api.web.webmodule/nbproject/project.xml
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/ExtenderController.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/ExtenderController.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/ExtenderController.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/ExtenderController.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/RequestParametersQuery.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/RequestParametersQuery.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/RequestParametersQuery.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/RequestParametersQuery.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebFrameworks.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebFrameworks.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebFrameworks.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebFrameworks.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebModule.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/WebProjectConstants.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/package.html b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/package.html
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/package.html
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/api/webmodule/package.html
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/FrameworkConfigurationPanel.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/FrameworkConfigurationPanel.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/FrameworkConfigurationPanel.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/FrameworkConfigurationPanel.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/RequestParametersQueryImplementation.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/RequestParametersQueryImplementation.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/RequestParametersQueryImplementation.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/RequestParametersQueryImplementation.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebFrameworkProvider.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebFrameworkProvider.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebFrameworkProvider.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebFrameworkProvider.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleExtender.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleExtender.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleExtender.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleExtender.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleFactory.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation2.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation2.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation2.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleImplementation2.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleProvider.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleProvider.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleProvider.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebModuleProvider.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebPrivilegedTemplates.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebPrivilegedTemplates.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebPrivilegedTemplates.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/WebPrivilegedTemplates.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/package.html b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/package.html
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/package.html
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/spi/webmodule/package.html
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/webmodule/Bundle.properties b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/Bundle.properties
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/webmodule/Bundle.properties
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/Bundle.properties
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/webmodule/ProjectWebModuleProvider.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/ProjectWebModuleProvider.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/webmodule/ProjectWebModuleProvider.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/ProjectWebModuleProvider.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleAccessor.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleAccessor.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleAccessor.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleAccessor.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java
diff --git a/api.web.webmodule/src/org/netbeans/modules/web/webmodule/resources/layer.xml b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/resources/layer.xml
similarity index 100%
rename from api.web.webmodule/src/org/netbeans/modules/web/webmodule/resources/layer.xml
rename to enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/resources/layer.xml
diff --git a/api.web.webmodule/test/unit/data/WEB-INF/web.xml b/enterprise/api.web.webmodule/test/unit/data/WEB-INF/web.xml
similarity index 100%
rename from api.web.webmodule/test/unit/data/WEB-INF/web.xml
rename to enterprise/api.web.webmodule/test/unit/data/WEB-INF/web.xml
diff --git a/api.web.webmodule/test/unit/data/a.foo b/enterprise/api.web.webmodule/test/unit/data/a.foo
similarity index 100%
rename from api.web.webmodule/test/unit/data/a.foo
rename to enterprise/api.web.webmodule/test/unit/data/a.foo
diff --git a/api.web.webmodule/test/unit/data/b.bar b/enterprise/api.web.webmodule/test/unit/data/b.bar
similarity index 100%
rename from api.web.webmodule/test/unit/data/b.bar
rename to enterprise/api.web.webmodule/test/unit/data/b.bar
diff --git a/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/RequestParametersQueryTest.java b/enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/RequestParametersQueryTest.java
similarity index 100%
rename from api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/RequestParametersQueryTest.java
rename to enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/RequestParametersQueryTest.java
diff --git a/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/SimpleWebModuleImpl.java b/enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/SimpleWebModuleImpl.java
similarity index 100%
rename from api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/SimpleWebModuleImpl.java
rename to enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/SimpleWebModuleImpl.java
diff --git a/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridgeTest.java b/enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridgeTest.java
similarity index 100%
rename from api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridgeTest.java
rename to enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridgeTest.java
diff --git a/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleTest.java b/enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleTest.java
similarity index 100%
rename from api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleTest.java
rename to enterprise/api.web.webmodule/test/unit/src/org/netbeans/modules/web/webmodule/WebModuleTest.java
diff --git a/enterprise/cloud.amazon/build.xml b/enterprise/cloud.amazon/build.xml
new file mode 100644
index 0000000000..14c653953d
--- /dev/null
+++ b/enterprise/cloud.amazon/build.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/cloud.amazon">
+ <description>Builds, tests, and runs the project org.netbeans.modules.cloud.amazon</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+ <property name="resourcesdir" value="./src/org/netbeans/modules/cloud/amazon/resources/"/>
+
+ <war destfile = "${resourcesdir}/empty.war" webxml = "${resourcesdir}/web.xml">
+ <fileset dir="${resourcesdir}/">
+ <include name="welcome.jsp"/>
+ </fileset>
+ <classes dir="${resourcesdir}/">
+ <exclude name="**/*"/>
+ </classes>
+ </war>
+</project>
diff --git a/cloud.amazon/licenseinfo.xml b/enterprise/cloud.amazon/licenseinfo.xml
similarity index 100%
rename from cloud.amazon/licenseinfo.xml
rename to enterprise/cloud.amazon/licenseinfo.xml
diff --git a/cloud.amazon/manifest.mf b/enterprise/cloud.amazon/manifest.mf
similarity index 100%
rename from cloud.amazon/manifest.mf
rename to enterprise/cloud.amazon/manifest.mf
diff --git a/cloud.amazon/nbproject/project.properties b/enterprise/cloud.amazon/nbproject/project.properties
similarity index 100%
rename from cloud.amazon/nbproject/project.properties
rename to enterprise/cloud.amazon/nbproject/project.properties
diff --git a/cloud.amazon/nbproject/project.xml b/enterprise/cloud.amazon/nbproject/project.xml
similarity index 100%
rename from cloud.amazon/nbproject/project.xml
rename to enterprise/cloud.amazon/nbproject/project.xml
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstance.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstance.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstance.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstance.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstanceManager.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstanceManager.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstanceManager.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonInstanceManager.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceImplementation.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceImplementation.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceImplementation.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceImplementation.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceProvider.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceProvider.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceProvider.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerInstanceProvider.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerWizardProvider.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerWizardProvider.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerWizardProvider.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/AmazonServerWizardProvider.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/Bundle.properties b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/Bundle.properties
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/Bundle.properties
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/Bundle.properties
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/layer.xml b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/layer.xml
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/layer.xml
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/layer.xml
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/nbdep.xml b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/nbdep.xml
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/nbdep.xml
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/nbdep.xml
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/web.xml b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/web.xml
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/web.xml
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/web.xml
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/welcome.jsp b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/welcome.jsp
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/welcome.jsp
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/resources/welcome.jsp
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentFactory.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentFactory.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentFactory.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentFactory.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentManager.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentManager.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentManager.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonDeploymentManager.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEInstance.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEInstance.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEInstance.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEInstance.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceImplementation.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceImplementation.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceImplementation.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceImplementation.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceProvider.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceProvider.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceProvider.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerInstanceProvider.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerWizardProvider.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerWizardProvider.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerWizardProvider.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2EEServerWizardProvider.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformFactory.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformFactory.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformFactory.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformFactory.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformImpl2.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformImpl2.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformImpl2.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonJ2eePlatformImpl2.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonOptionalDeploymentManagerFactory.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonOptionalDeploymentManagerFactory.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonOptionalDeploymentManagerFactory.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/AmazonOptionalDeploymentManagerFactory.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/Bundle.properties b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/Bundle.properties
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/Bundle.properties
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/serverplugin/Bundle.properties
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonInstanceNode.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonInstanceNode.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonInstanceNode.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonInstanceNode.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonJ2EEInstanceNode.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonJ2EEInstanceNode.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonJ2EEInstanceNode.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonJ2EEInstanceNode.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.form b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.form
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.form
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.form
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardComponent.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardIterator.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardIterator.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardIterator.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardIterator.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardPanel.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardPanel.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardPanel.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/AmazonWizardPanel.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/Bundle.properties b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/Bundle.properties
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/Bundle.properties
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/Bundle.properties
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/PropertiesAction.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/PropertiesAction.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/PropertiesAction.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/PropertiesAction.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RefreshAmazonInstanceNodeAction.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RefreshAmazonInstanceNodeAction.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RefreshAmazonInstanceNodeAction.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RefreshAmazonInstanceNodeAction.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoteServerPropertiesAction.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoteServerPropertiesAction.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoteServerPropertiesAction.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoteServerPropertiesAction.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoveAmazonInstanceAction.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoveAmazonInstanceAction.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoveAmazonInstanceAction.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/RemoveAmazonInstanceAction.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/ViewAdminConsoleAction.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/ViewAdminConsoleAction.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/ViewAdminConsoleAction.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/ViewAdminConsoleAction.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/amazon.png b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/amazon.png
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/amazon.png
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/amazon.png
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/running.png b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/running.png
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/running.png
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/running.png
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/terminated.png b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/terminated.png
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/terminated.png
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/terminated.png
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/tomcat.png b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/tomcat.png
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/tomcat.png
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/tomcat.png
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/waiting.png b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/waiting.png
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/waiting.png
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/resources/waiting.png
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.form b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.form
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.form
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.form
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardComponent.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardIterator.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardIterator.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardIterator.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardIterator.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardPanel.java b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardPanel.java
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardPanel.java
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/AmazonJ2EEServerWizardPanel.java
diff --git a/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle.properties b/enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle.properties
similarity index 100%
rename from cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle.properties
rename to enterprise/cloud.amazon/src/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle.properties
diff --git a/enterprise/cloud.common/build.xml b/enterprise/cloud.common/build.xml
new file mode 100644
index 0000000000..49c1d3f491
--- /dev/null
+++ b/enterprise/cloud.common/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/cloud.common">
+ <description>Builds, tests, and runs the project org.netbeans.modules.cloud.common</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/cloud.common/manifest.mf b/enterprise/cloud.common/manifest.mf
similarity index 100%
rename from cloud.common/manifest.mf
rename to enterprise/cloud.common/manifest.mf
diff --git a/cloud.common/nbproject/project.properties b/enterprise/cloud.common/nbproject/project.properties
similarity index 100%
rename from cloud.common/nbproject/project.properties
rename to enterprise/cloud.common/nbproject/project.properties
diff --git a/cloud.common/nbproject/project.xml b/enterprise/cloud.common/nbproject/project.xml
similarity index 100%
rename from cloud.common/nbproject/project.xml
rename to enterprise/cloud.common/nbproject/project.xml
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/Bundle.properties b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/Bundle.properties
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/Bundle.properties
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/Bundle.properties
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatus.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatus.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatus.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatus.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatusImpl.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatusImpl.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatusImpl.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/DeploymentStatusImpl.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/InstanceState.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/InstanceState.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/InstanceState.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/InstanceState.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationFactoryImpl.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationFactoryImpl.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationFactoryImpl.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationFactoryImpl.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationImpl.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationImpl.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationImpl.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ModuleConfigurationImpl.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ProgressObjectImpl.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ProgressObjectImpl.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ProgressObjectImpl.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/ProgressObjectImpl.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/RegistryNodeFactoryImpl.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/RegistryNodeFactoryImpl.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/RegistryNodeFactoryImpl.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/RegistryNodeFactoryImpl.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/TargetImpl.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/TargetImpl.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/TargetImpl.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/serverplugin/TargetImpl.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/Bundle.properties b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/Bundle.properties
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/Bundle.properties
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/Bundle.properties
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.form b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.form
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.form
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.form
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardComponent.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardPanel.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardPanel.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardPanel.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/CloudResourcesWizardPanel.java
diff --git a/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/ServerResourceDescriptor.java b/enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/ServerResourceDescriptor.java
similarity index 100%
rename from cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/ServerResourceDescriptor.java
rename to enterprise/cloud.common/src/org/netbeans/modules/cloud/common/spi/support/ui/ServerResourceDescriptor.java
diff --git a/enterprise/el.lexer/build.xml b/enterprise/el.lexer/build.xml
new file mode 100644
index 0000000000..c61227fdbd
--- /dev/null
+++ b/enterprise/el.lexer/build.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<project basedir="." default="build" name="enterprise/el.lexer">
+
+ <import file="../../nbbuild/templates/projectized.xml"/>
+
+</project>
diff --git a/el.lexer/manifest.mf b/enterprise/el.lexer/manifest.mf
similarity index 100%
rename from el.lexer/manifest.mf
rename to enterprise/el.lexer/manifest.mf
diff --git a/el.lexer/nbproject/project.properties b/enterprise/el.lexer/nbproject/project.properties
similarity index 100%
rename from el.lexer/nbproject/project.properties
rename to enterprise/el.lexer/nbproject/project.properties
diff --git a/el.lexer/nbproject/project.xml b/enterprise/el.lexer/nbproject/project.xml
similarity index 100%
rename from el.lexer/nbproject/project.xml
rename to enterprise/el.lexer/nbproject/project.xml
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/Bundle.properties b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/Bundle.properties
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/Bundle.properties
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/Bundle.properties
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/ELLexer.java b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/ELLexer.java
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/ELLexer.java
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/ELLexer.java
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/ELState.java b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/ELState.java
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/ELState.java
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/ELState.java
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/api/ELTokenId.java b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/api/ELTokenId.java
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/api/ELTokenId.java
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/api/ELTokenId.java
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/resources/Bundle.properties b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/resources/Bundle.properties
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/resources/Bundle.properties
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/resources/Bundle.properties
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/resources/fontsColors.xml b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/resources/fontsColors.xml
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/resources/fontsColors.xml
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/resources/fontsColors.xml
diff --git a/el.lexer/src/org/netbeans/modules/el/lexer/resources/layer.xml b/enterprise/el.lexer/src/org/netbeans/modules/el/lexer/resources/layer.xml
similarity index 100%
rename from el.lexer/src/org/netbeans/modules/el/lexer/resources/layer.xml
rename to enterprise/el.lexer/src/org/netbeans/modules/el/lexer/resources/layer.xml
diff --git a/el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerBatchTest.java b/enterprise/el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerBatchTest.java
similarity index 100%
rename from el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerBatchTest.java
rename to enterprise/el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerBatchTest.java
diff --git a/el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerRandomTest.java b/enterprise/el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerRandomTest.java
similarity index 100%
rename from el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerRandomTest.java
rename to enterprise/el.lexer/test/unit/src/org/netbeans/modules/el/lexer/ELLexerRandomTest.java
diff --git a/enterprise/glassfish.common/build.xml b/enterprise/glassfish.common/build.xml
new file mode 100644
index 0000000000..305ac23337
--- /dev/null
+++ b/enterprise/glassfish.common/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<project basedir="." default="build" name="enterprise/glassfish.common">
+ <description>Builds, tests, and runs the project org.netbeans.modules.glassfish.common</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/glassfish.common/manifest.mf b/enterprise/glassfish.common/manifest.mf
similarity index 100%
rename from glassfish.common/manifest.mf
rename to enterprise/glassfish.common/manifest.mf
diff --git a/glassfish.common/nbproject/project.properties b/enterprise/glassfish.common/nbproject/project.properties
similarity index 100%
rename from glassfish.common/nbproject/project.properties
rename to enterprise/glassfish.common/nbproject/project.properties
diff --git a/glassfish.common/nbproject/project.xml b/enterprise/glassfish.common/nbproject/project.xml
similarity index 100%
rename from glassfish.common/nbproject/project.xml
rename to enterprise/glassfish.common/nbproject/project.xml
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/AdminAuthenticator.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/AdminAuthenticator.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/AdminAuthenticator.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/AdminAuthenticator.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/BasicTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/BasicTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/BasicTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/BasicTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/CommonServerSupport.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CommonServerSupport.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/CommonServerSupport.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CommonServerSupport.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/EnableComet.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/EnableComet.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/EnableComet.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/EnableComet.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishExecutors.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishExecutors.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishExecutors.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishExecutors.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishJvmMode.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishJvmMode.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishJvmMode.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishJvmMode.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishLogger.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishLogger.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishLogger.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishLogger.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishSettings.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishSettings.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishSettings.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishSettings.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishState.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishState.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishState.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassFishState.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/Installer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Installer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/Installer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Installer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/KillTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/KillTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/KillTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/KillTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/NoopTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/NoopTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/NoopTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/NoopTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/PartialCompletionException.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/PartialCompletionException.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/PartialCompletionException.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/PartialCompletionException.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/PortCollection.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/PortCollection.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/PortCollection.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/PortCollection.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ProcessCreationException.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ProcessCreationException.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ProcessCreationException.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ProcessCreationException.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ProxySettings.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ProxySettings.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ProxySettings.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ProxySettings.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/RegisteredDerbyServerImpl.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/RegisteredDerbyServerImpl.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/RegisteredDerbyServerImpl.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/RegisteredDerbyServerImpl.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/RestartTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/RestartTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/RestartTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/RestartTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/SimpleIO.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/SimpleIO.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/SimpleIO.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/SimpleIO.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/StartTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/StartTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/StartTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/StartTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/StopProfilingTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/StopProfilingTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/StopProfilingTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/StopProfilingTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/StopTask.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/StopTask.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/StopTask.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/StopTask.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/AbstractOutputAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/AbstractOutputAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/AbstractOutputAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/AbstractOutputAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/DebugAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/DebugAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/DebugAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/DebugAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/KillServerAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/KillServerAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/KillServerAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/KillServerAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ProfileAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ProfileAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ProfileAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ProfileAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/PropertiesAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/PropertiesAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/PropertiesAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/PropertiesAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RefreshAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RefreshAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RefreshAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RefreshAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RemoveServerAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RemoveServerAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RemoveServerAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RemoveServerAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RestartAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RestartAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RestartAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/RestartAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StartServerAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StartServerAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StartServerAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StartServerAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StopServerAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StopServerAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StopServerAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/StopServerAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewAdminConsoleAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewAdminConsoleAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewAdminConsoleAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewAdminConsoleAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewServerLogAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewServerLogAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewServerLogAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewServerLogAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewUpdateCenterAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewUpdateCenterAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewUpdateCenterAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/actions/ViewUpdateCenterAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/layer.xml b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/layer.xml
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/layer.xml
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/layer.xml
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/DecoratorManager.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/DecoratorManager.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/DecoratorManager.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/DecoratorManager.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationNode.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationNode.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationNode.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationNode.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceChildren.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceChildren.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceChildren.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceNode.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceNode.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceNode.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2InstanceNode.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ItemNode.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ItemNode.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ItemNode.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ItemNode.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceNode.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceNode.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceNode.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceNode.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSNode.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSNode.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSNode.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSNode.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/NodeTypes.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/NodeTypes.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/NodeTypes.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/NodeTypes.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Refreshable.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Refreshable.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Refreshable.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Refreshable.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DeployDirectoryCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/DisableModulesCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EditDetailsCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenTestURLAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenTestURLAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenTestURLAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenTestURLAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLActionCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLActionCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLActionCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/OpenURLActionCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/RefreshModulesCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UndeployModuleCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceAction.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceAction.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceAction.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceAction.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/actions/UnregisterResourceCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/DomainXMLChangeListener.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/DomainXMLChangeListener.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/parser/DomainXMLChangeListener.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/DomainXMLChangeListener.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/JvmConfigReader.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/JvmConfigReader.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/parser/JvmConfigReader.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/JvmConfigReader.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/UpdateCenter.gif b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/UpdateCenter.gif
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/UpdateCenter.gif
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/UpdateCenter.gif
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debug.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debug.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debug.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debug.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debugging.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debugging.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debugging.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/debugging.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/disabled-badge.gif b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/disabled-badge.gif
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/disabled-badge.gif
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/disabled-badge.gif
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profilerblocking.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profilerblocking.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profilerblocking.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profilerblocking.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profiling.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profiling.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profiling.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/profiling.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/refresh.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/refresh.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/refresh.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/refresh.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/resources.gif b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/resources.gif
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/resources.gif
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/resources.gif
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/restart.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/restart.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/restart.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/restart.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/running.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/running.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/running.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/running.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/server.gif b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/server.gif
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/server.gif
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/server.gif
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/start.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/start.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/start.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/start.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/stop.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/stop.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/stop.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/stop.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/suspended.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/suspended.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/suspended.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/suspended.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/waiting.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/waiting.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/waiting.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/waiting.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/webservice.png b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/webservice.png
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/resources/webservice.png
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/resources/webservice.png
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/status/AuthFailureStateListener.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/AuthFailureStateListener.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/status/AuthFailureStateListener.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/AuthFailureStateListener.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/status/BasicStateListener.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/BasicStateListener.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/status/BasicStateListener.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/BasicStateListener.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/status/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/status/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/status/MonitoringInitStateListener.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/MonitoringInitStateListener.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/status/MonitoringInitStateListener.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/MonitoringInitStateListener.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/status/WakeUpStateListener.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/WakeUpStateListener.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/status/WakeUpStateListener.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/status/WakeUpStateListener.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/AdminObjectCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/CommonPasswordPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/CommonPasswordPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/CommonPasswordPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/CommonPasswordPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ComponentFieldListener.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ComponentFieldListener.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ComponentFieldListener.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ComponentFieldListener.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectionPoolCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorConnectionPoolCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/ConnectorCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Filter.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Filter.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Filter.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/Filter.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishCredentials.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPassword.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPropertiesCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPropertiesCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPropertiesCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/GlassFishPropertiesCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceLocalPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceLocalPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceLocalPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceLocalPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstancePanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceRemotePanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceRemotePanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceRemotePanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/InstanceRemotePanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/IpComboBox.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaMailCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaPlatformsComboBox.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JavaSEPlatformPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/JdbcResourceCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/VmCustomizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/WarnPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/AdminKeyFile.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/AdminKeyFile.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/utils/AdminKeyFile.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/AdminKeyFile.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/JavaUtils.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/JavaUtils.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/utils/JavaUtils.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/JavaUtils.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/ServerUtils.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/ServerUtils.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/utils/ServerUtils.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/ServerUtils.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.form b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.form
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.form
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.form
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationVisualPanel.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Retriever.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Retriever.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Retriever.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Retriever.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/ServerWizardIterator.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/ServerWizardIterator.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/ServerWizardIterator.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/ServerWizardIterator.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Util.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Util.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Util.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Util.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/AppDesc.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/AppDesc.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/AppDesc.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/AppDesc.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/CommandFactory.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/CommandFactory.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/CommandFactory.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/CommandFactory.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/CustomizerCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/CustomizerCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/CustomizerCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/CustomizerCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/Decorator.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/Decorator.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/Decorator.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/Decorator.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/DecoratorFactory.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/DecoratorFactory.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/DecoratorFactory.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/DecoratorFactory.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule2.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule2.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule2.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule2.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule3.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule3.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule3.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModule3.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModuleFactory.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModuleFactory.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModuleFactory.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/GlassfishModuleFactory.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/JrePicker.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/JrePicker.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/JrePicker.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/JrePicker.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/PluggableNodeProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/PluggableNodeProvider.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/PluggableNodeProvider.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/PluggableNodeProvider.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/Recognizer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/Recognizer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/Recognizer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/Recognizer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/RecognizerCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RecognizerCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/RecognizerCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RecognizerCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisterDatabase.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisterDatabase.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisterDatabase.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisterDatabase.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDDCatalog.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDDCatalog.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDDCatalog.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDDCatalog.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDerbyServer.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDerbyServer.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDerbyServer.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RegisteredDerbyServer.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/RemoveCookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RemoveCookie.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/RemoveCookie.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/RemoveCookie.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDecorator.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDecorator.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDecorator.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDecorator.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDesc.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDesc.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDesc.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ResourceDesc.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/Utils.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/Utils.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/Utils.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/Utils.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/VMIntrospector.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/VMIntrospector.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/VMIntrospector.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/VMIntrospector.java
diff --git a/glassfish.common/src/org/netbeans/modules/glassfish/spi/WSDesc.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/WSDesc.java
similarity index 100%
rename from glassfish.common/src/org/netbeans/modules/glassfish/spi/WSDesc.java
rename to enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/WSDesc.java
diff --git a/glassfish.common/test/unit/data/modules/endorsed/nottaDirE b/enterprise/glassfish.common/test/unit/data/modules/endorsed/nottaDirE
similarity index 100%
rename from glassfish.common/test/unit/data/modules/endorsed/nottaDirE
rename to enterprise/glassfish.common/test/unit/data/modules/endorsed/nottaDirE
diff --git a/glassfish.common/test/unit/data/modules/nottaDir b/enterprise/glassfish.common/test/unit/data/modules/nottaDir
similarity index 100%
rename from glassfish.common/test/unit/data/modules/nottaDir
rename to enterprise/glassfish.common/test/unit/data/modules/nottaDir
diff --git a/glassfish.common/test/unit/data/nottaDir b/enterprise/glassfish.common/test/unit/data/nottaDir
similarity index 100%
rename from glassfish.common/test/unit/data/nottaDir
rename to enterprise/glassfish.common/test/unit/data/nottaDir
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/TestServer.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/TestServer.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/TestServer.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/TestServer.java
diff --git a/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
similarity index 100%
rename from glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
rename to enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
diff --git a/enterprise/glassfish.eecommon/build.xml b/enterprise/glassfish.eecommon/build.xml
new file mode 100644
index 0000000000..5a6c1697f7
--- /dev/null
+++ b/enterprise/glassfish.eecommon/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/glassfish.eecommon">
+ <description>Builds, tests, and runs the project org.netbeans.modules.glassfish.eecommon</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/glassfish.eecommon/manifest.mf b/enterprise/glassfish.eecommon/manifest.mf
similarity index 100%
rename from glassfish.eecommon/manifest.mf
rename to enterprise/glassfish.eecommon/manifest.mf
diff --git a/glassfish.eecommon/nbproject/project.properties b/enterprise/glassfish.eecommon/nbproject/project.properties
similarity index 100%
rename from glassfish.eecommon/nbproject/project.properties
rename to enterprise/glassfish.eecommon/nbproject/project.properties
diff --git a/glassfish.eecommon/nbproject/project.xml b/enterprise/glassfish.eecommon/nbproject/project.xml
similarity index 100%
rename from glassfish.eecommon/nbproject/project.xml
rename to enterprise/glassfish.eecommon/nbproject/project.xml
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Bundle.properties b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Bundle.properties
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Bundle.properties
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Bundle.properties
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Status.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Status.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Status.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/Status.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Bundle.properties b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Bundle.properties
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Bundle.properties
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Bundle.properties
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ExecSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ExecSupport.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ExecSupport.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ExecSupport.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelper.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelper.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelper.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/LogHyperLinkSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/LogHyperLinkSupport.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/LogHyperLinkSupport.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/LogHyperLinkSupport.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/UrlData.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/UrlData.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/UrlData.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/UrlData.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/XmlFileCreator.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/XmlFileCreator.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/XmlFileCreator.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/XmlFileCreator.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/Bundle.properties b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/Bundle.properties
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/Bundle.properties
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/Bundle.properties
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/EjbJarVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/EjbJarVersion.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/EjbJarVersion.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/EjbJarVersion.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/FolderListener.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/FolderListener.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/FolderListener.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/FolderListener.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEBaseVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEBaseVersion.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEBaseVersion.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEBaseVersion.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/JavaEEModule.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/JavaEEModule.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/JavaEEModule.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/JavaEEModule.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
diff --git a/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/layer.xml b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/layer.xml
similarity index 100%
rename from glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/layer.xml
rename to enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/layer.xml
diff --git a/glassfish.eecommon/test/unit/data/default-web.xml b/enterprise/glassfish.eecommon/test/unit/data/default-web.xml
similarity index 100%
rename from glassfish.eecommon/test/unit/data/default-web.xml
rename to enterprise/glassfish.eecommon/test/unit/data/default-web.xml
diff --git a/glassfish.eecommon/test/unit/data/domain1/config/default-web.xml b/enterprise/glassfish.eecommon/test/unit/data/domain1/config/default-web.xml
similarity index 100%
rename from glassfish.eecommon/test/unit/data/domain1/config/default-web.xml
rename to enterprise/glassfish.eecommon/test/unit/data/domain1/config/default-web.xml
diff --git a/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/FindJspServletHelperTest.java b/enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/FindJspServletHelperTest.java
similarity index 100%
rename from glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/FindJspServletHelperTest.java
rename to enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/FindJspServletHelperTest.java
diff --git a/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelperTest.java b/enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelperTest.java
similarity index 100%
rename from glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelperTest.java
rename to enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/HttpMonitorHelperTest.java
diff --git a/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/UrlDataTest.java b/enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/UrlDataTest.java
similarity index 100%
rename from glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/UrlDataTest.java
rename to enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/UrlDataTest.java
diff --git a/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GFTestEEModuleImpl.java b/enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GFTestEEModuleImpl.java
similarity index 100%
rename from glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GFTestEEModuleImpl.java
rename to enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GFTestEEModuleImpl.java
diff --git a/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfigurationTest.java b/enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfigurationTest.java
similarity index 100%
rename from glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfigurationTest.java
rename to enterprise/glassfish.eecommon/test/unit/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfigurationTest.java
diff --git a/enterprise/glassfish.javaee/build.xml b/enterprise/glassfish.javaee/build.xml
new file mode 100644
index 0000000000..ac5c88b773
--- /dev/null
+++ b/enterprise/glassfish.javaee/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<project basedir="." default="build" name="enterprise/glassfish.javaee">
+ <description>Builds, tests, and runs the project org.netbeans.modules.glassfish.javaee</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/glassfish.javaee/licenseinfo.xml b/enterprise/glassfish.javaee/licenseinfo.xml
similarity index 100%
rename from glassfish.javaee/licenseinfo.xml
rename to enterprise/glassfish.javaee/licenseinfo.xml
diff --git a/glassfish.javaee/manifest.mf b/enterprise/glassfish.javaee/manifest.mf
similarity index 100%
rename from glassfish.javaee/manifest.mf
rename to enterprise/glassfish.javaee/manifest.mf
diff --git a/glassfish.javaee/nbproject/project.properties b/enterprise/glassfish.javaee/nbproject/project.properties
similarity index 100%
rename from glassfish.javaee/nbproject/project.properties
rename to enterprise/glassfish.javaee/nbproject/project.properties
diff --git a/glassfish.javaee/nbproject/project.xml b/enterprise/glassfish.javaee/nbproject/project.xml
similarity index 100%
rename from glassfish.javaee/nbproject/project.xml
rename to enterprise/glassfish.javaee/nbproject/project.xml
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AntDeploymentProviderImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AntDeploymentProviderImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AntDeploymentProviderImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AntDeploymentProviderImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ApplicationScopedResourcesUtils.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ApplicationScopedResourcesUtils.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ApplicationScopedResourcesUtils.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ApplicationScopedResourcesUtils.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2Configuration.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2Configuration.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2Configuration.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2Configuration.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentManager.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentManager.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentManager.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentManager.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxRpcStack.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxRpcStack.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxRpcStack.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxRpcStack.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JpaSupportImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JpaSupportImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JpaSupportImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JpaSupportImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2MessageDestinationManager.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2MessageDestinationManager.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2MessageDestinationManager.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2MessageDestinationManager.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ModuleConfigFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ModuleConfigFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ModuleConfigFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ModuleConfigFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ServerInstanceDescriptor.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ServerInstanceDescriptor.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ServerInstanceDescriptor.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2ServerInstanceDescriptor.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2StartServer.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2StartServer.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2StartServer.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2StartServer.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/InstanceProperties.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/InstanceProperties.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/InstanceProperties.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/InstanceProperties.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEDecoratorFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEDecoratorFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEDecoratorFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEDecoratorFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModule.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModule.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModule.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModule.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceModifier.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceModifier.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceModifier.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceModifier.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceRegistrationHelper.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceRegistrationHelper.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceRegistrationHelper.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ResourceRegistrationHelper.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/SunMessageDestination.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/SunMessageDestination.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/SunMessageDestination.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/SunMessageDestination.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1Configuration.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1Configuration.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1Configuration.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1Configuration.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1ModuleConfigFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1ModuleConfigFactory.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1ModuleConfigFactory.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Three1ModuleConfigFactory.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ant-deploy.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ant-deploy.xml
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ant-deploy.xml
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ant-deploy.xml
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DataSourcesReader.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DataSourcesReader.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DataSourcesReader.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DataSourcesReader.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DbUtil.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DbUtil.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DbUtil.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DbUtil.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManager.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManager.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManager.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManager.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCConnectionPool.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCConnectionPool.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCConnectionPool.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCConnectionPool.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCResource.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCResource.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCResource.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JDBCResource.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JndiNameResolver.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JndiNameResolver.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JndiNameResolver.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/JndiNameResolver.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/SunDatasource.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/SunDatasource.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/SunDatasource.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/SunDatasource.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Bundle.properties b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Bundle.properties
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Bundle.properties
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Bundle.properties
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/DummyProgressObject.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/DummyProgressObject.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/DummyProgressObject.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/DummyProgressObject.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/FastDeploy.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/FastDeploy.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/FastDeploy.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/FastDeploy.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2DeploymentStatus.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2DeploymentStatus.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2DeploymentStatus.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2DeploymentStatus.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Logger.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Logger.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Logger.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Logger.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginProperties.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginProperties.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginProperties.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginProperties.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Target.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Target.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Target.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2Target.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/RegisteredDDCatalogImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/RegisteredDDCatalogImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/RegisteredDDCatalogImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/RegisteredDDCatalogImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/UpdateContextRoot.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/UpdateContextRoot.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/UpdateContextRoot.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/UpdateContextRoot.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/VMIntrospectorImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/VMIntrospectorImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/VMIntrospectorImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/VMIntrospectorImpl.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdep.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdep.xml
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdep.xml
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdep.xml
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6.xml
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6.xml
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6.xml
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6wc.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6wc.xml
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6wc.xml
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee6wc.xml
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ConfigFile.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ConfigFile.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ConfigFile.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ConfigFile.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ServerInstanceIcon.png b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ServerInstanceIcon.png
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ServerInstanceIcon.png
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/ServerInstanceIcon.png
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/appclient.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/appclient.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/appclient.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/appclient.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/connector.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/connector.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/connector.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/connector.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/javamail.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/javamail.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/javamail.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/javamail.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jdbc.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jdbc.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jdbc.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jdbc.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jms.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jms.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jms.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jms.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jndi.gif b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jndi.gif
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jndi.gif
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/resources/jndi.gif
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/Bundle.properties b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/Bundle.properties
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/Bundle.properties
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/Bundle.properties
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.form b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.form
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.form
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.form
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDVisualPanel.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardIterator.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/weblogicDD.html b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/weblogicDD.html
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/weblogicDD.html
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/weblogicDD.html
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/Bundle.properties b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/Bundle.properties
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/Bundle.properties
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/Bundle.properties
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.form b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.form
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.form
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.form
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ui/DebugPortQuery.java
diff --git a/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/verifier/VerifierImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/verifier/VerifierImpl.java
similarity index 100%
rename from glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/verifier/VerifierImpl.java
rename to enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/verifier/VerifierImpl.java
diff --git a/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/AddRemoveV3InstanceMethods.java b/enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/AddRemoveV3InstanceMethods.java
similarity index 100%
rename from glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/AddRemoveV3InstanceMethods.java
rename to enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/AddRemoveV3InstanceMethods.java
diff --git a/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerResourceProperties.java b/enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerResourceProperties.java
similarity index 100%
rename from glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerResourceProperties.java
rename to enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerResourceProperties.java
diff --git a/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerTest.java b/enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerTest.java
similarity index 100%
rename from glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerTest.java
rename to enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/ServerTest.java
diff --git a/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/StartStopServer.java b/enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/StartStopServer.java
similarity index 100%
rename from glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/StartStopServer.java
rename to enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/StartStopServer.java
diff --git a/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/Util.java b/enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/Util.java
similarity index 100%
rename from glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/Util.java
rename to enterprise/glassfish.javaee/test/qa-functional/src/org/netbeans/modules/glassfish/javaee/test/Util.java
diff --git a/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/HK2TestEEModuleImpl.java b/enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/HK2TestEEModuleImpl.java
similarity index 100%
rename from glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/HK2TestEEModuleImpl.java
rename to enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/HK2TestEEModuleImpl.java
diff --git a/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManagerTest.java b/enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManagerTest.java
similarity index 100%
rename from glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManagerTest.java
rename to enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/Hk2DatasourceManagerTest.java
diff --git a/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/SunDatasourceTest.java b/enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/SunDatasourceTest.java
similarity index 100%
rename from glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/SunDatasourceTest.java
rename to enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/db/SunDatasourceTest.java
diff --git a/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginPropertiesTest.java b/enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginPropertiesTest.java
similarity index 100%
rename from glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginPropertiesTest.java
rename to enterprise/glassfish.javaee/test/unit/src/org/netbeans/modules/glassfish/javaee/ide/Hk2PluginPropertiesTest.java
diff --git a/enterprise/glassfish.tooling/build.xml b/enterprise/glassfish.tooling/build.xml
new file mode 100644
index 0000000000..890caa24bf
--- /dev/null
+++ b/enterprise/glassfish.tooling/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/glassfish.tooling">
+ <description>Builds, tests, and runs the project org.netbeans.modules.glassfish.tooling</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/glassfish.tooling/licenseinfo.xml b/enterprise/glassfish.tooling/licenseinfo.xml
similarity index 100%
rename from glassfish.tooling/licenseinfo.xml
rename to enterprise/glassfish.tooling/licenseinfo.xml
diff --git a/glassfish.tooling/manifest.mf b/enterprise/glassfish.tooling/manifest.mf
similarity index 100%
rename from glassfish.tooling/manifest.mf
rename to enterprise/glassfish.tooling/manifest.mf
diff --git a/glassfish.tooling/nbproject/project.properties b/enterprise/glassfish.tooling/nbproject/project.properties
similarity index 100%
rename from glassfish.tooling/nbproject/project.properties
rename to enterprise/glassfish.tooling/nbproject/project.properties
diff --git a/glassfish.tooling/nbproject/project.xml b/enterprise/glassfish.tooling/nbproject/project.xml
similarity index 100%
rename from glassfish.tooling/nbproject/project.xml
rename to enterprise/glassfish.tooling/nbproject/project.xml
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/Bundle.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/Bundle.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/Bundle.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/Bundle.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/ExceptionMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/ExceptionMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/ExceptionMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/ExceptionMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishIdeException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishIdeException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishIdeException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishIdeException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatus.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatus.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatus.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatus.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatusListener.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatusListener.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatusListener.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishStatusListener.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishToolsConfig.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishToolsConfig.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishToolsConfig.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/GlassFishToolsConfig.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskStateListener.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskStateListener.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskStateListener.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskStateListener.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ActionReport.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ActionReport.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ActionReport.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ActionReport.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryHttp.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryHttp.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryHttp.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryHttp.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryRest.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryRest.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryRest.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryRest.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Command.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Command.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Command.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Command.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandAddResources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandAddResources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandAddResources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandAddResources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandChangeAdminPassword.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandChangeAdminPassword.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandChangeAdminPassword.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandChangeAdminPassword.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateAdminObject.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateAdminObject.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateAdminObject.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateAdminObject.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnector.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnector.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnector.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnector.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnectorConnectionPool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnectorConnectionPool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnectorConnectionPool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateConnectorConnectionPool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCConnectionPool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCConnectionPool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCConnectionPool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCConnectionPool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCResource.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCResource.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCResource.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandCreateJDBCResource.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteResource.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteResource.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteResource.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeleteResource.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDisable.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDisable.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDisable.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandDisable.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandEnable.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandEnable.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandEnable.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandEnable.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandFetchLogData.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandFetchLogData.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandFetchLogData.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandFetchLogData.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandGetProperty.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandGetProperty.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandGetProperty.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandGetProperty.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJava.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJava.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJava.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJava.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJavaClassPath.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJavaClassPath.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJavaClassPath.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandJavaClassPath.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListComponents.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListComponents.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListComponents.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListComponents.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListResources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListResources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListResources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListResources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListWebServices.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListWebServices.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListWebServices.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandListWebServices.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandLocation.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandLocation.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandLocation.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandLocation.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRedeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRedeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRedeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRedeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestartDAS.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestartDAS.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestartDAS.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestartDAS.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestoreDomain.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestoreDomain.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestoreDomain.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestoreDomain.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandSetProperty.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandSetProperty.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandSetProperty.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandSetProperty.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartDAS.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartDAS.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartDAS.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartDAS.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStartInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopDAS.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopDAS.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopDAS.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopDAS.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandStopInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTarget.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTarget.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTarget.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTarget.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTargetName.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTargetName.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTargetName.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandTargetName.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandUndeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandUndeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandUndeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandUndeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandVersion.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandVersion.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/CommandVersion.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ExceptionMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ExceptionMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ExceptionMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ExceptionMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/MessagePart.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/MessagePart.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/MessagePart.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/MessagePart.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/PasswordFile.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/PasswordFile.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/PasswordFile.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/PasswordFile.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOContent.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOContent.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOContent.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOContent.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOParser.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOParser.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOParser.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOResult.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOResult.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOResult.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOResult.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Result.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Result.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Result.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Result.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultList.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultList.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultList.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultList.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultLog.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultLog.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultLog.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultLog.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultMap.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultMap.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultMap.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultMap.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultProcess.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultProcess.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultProcess.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultProcess.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultString.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultString.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultString.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ResultString.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Runner.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Runner.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Runner.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/Runner.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadmin.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadmin.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadmin.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadmin.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminChangeAdminPassword.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminChangeAdminPassword.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminChangeAdminPassword.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminChangeAdminPassword.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminRestoreDomain.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminRestoreDomain.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminRestoreDomain.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerAsadminRestoreDomain.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttp.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttp.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttp.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttp.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpAddResources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpAddResources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpAddResources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpAddResources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpClass.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpClass.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpClass.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpClass.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateAdminObject.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateAdminObject.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateAdminObject.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateAdminObject.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnector.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnector.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnector.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnector.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnectorConnectionPool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnectorConnectionPool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnectorConnectionPool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateConnectorConnectionPool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCConnectionPool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCConnectionPool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCConnectionPool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCConnectionPool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCResource.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCResource.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCResource.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpCreateJDBCResource.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteResource.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteResource.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteResource.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeleteResource.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpDeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpEnableDisable.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpEnableDisable.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpEnableDisable.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpEnableDisable.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpGetProperty.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpGetProperty.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpGetProperty.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpGetProperty.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListComponents.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListComponents.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListComponents.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListComponents.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListResources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListResources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListResources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListResources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListWebServices.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListWebServices.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListWebServices.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpListWebServices.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpLocation.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpLocation.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpLocation.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpLocation.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRedeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRedeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRedeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRedeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRestartDAS.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRestartDAS.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRestartDAS.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpRestartDAS.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpSetProperty.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpSetProperty.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpSetProperty.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpSetProperty.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpTarget.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpTarget.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpTarget.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpTarget.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpUndeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpUndeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpUndeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerHttpUndeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerJava.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerJava.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerJava.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerJava.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerLocal.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerLocal.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerLocal.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerLocal.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRest.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRest.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRest.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRest.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestAddResources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestAddResources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestAddResources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestAddResources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestClass.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestClass.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestClass.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestClass.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnector.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnector.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnector.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnector.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnectorPool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnectorPool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnectorPool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateConnectorPool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCConnectionPool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCConnectionPool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCConnectionPool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCConnectionPool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCResource.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCResource.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCResource.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestCreateJDBCResource.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteResource.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteResource.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteResource.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeleteResource.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDisable.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDisable.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDisable.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestDisable.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestEnable.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestEnable.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestEnable.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestEnable.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestGetProperty.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestGetProperty.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestGetProperty.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestGetProperty.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestList.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestList.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestList.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestList.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListApplications.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListApplications.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListApplications.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListApplications.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListResources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListResources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListResources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListResources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListWebServices.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListWebServices.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListWebServices.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestListWebServices.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestLocation.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestLocation.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestLocation.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestLocation.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestSetProperty.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestSetProperty.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestSetProperty.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestSetProperty.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStartInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopCluster.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopCluster.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopCluster.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopCluster.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopDAS.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopDAS.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopDAS.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopDAS.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopInstance.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopInstance.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopInstance.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestStopInstance.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestUndeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestUndeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestUndeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestUndeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ServerAdmin.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ServerAdmin.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ServerAdmin.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ServerAdmin.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueLog.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueLog.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueLog.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueLog.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueProcess.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueProcess.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueProcess.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/ValueProcess.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CloudTasks.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CloudTasks.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CloudTasks.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CloudTasks.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloud.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloud.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloud.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloud.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerHttpCloud.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerHttpCloud.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerHttpCloud.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerHttpCloud.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloud.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloud.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloud.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloud.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloudDeploy.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloudDeploy.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloudDeploy.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/cloud/RunnerRestCloudDeploy.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ActionReport.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ActionReport.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ActionReport.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ActionReport.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/MessagePart.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/MessagePart.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/MessagePart.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/MessagePart.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseContentType.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseContentType.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseContentType.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseContentType.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParser.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParser.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParser.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserFactory.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserFactory.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserFactory.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserFactory.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestActionReport.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestActionReport.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestActionReport.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestActionReport.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestJSONResponseParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestJSONResponseParser.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestJSONResponseParser.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestJSONResponseParser.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/DataException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/DataException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/DataException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/DataException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ExceptionMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ExceptionMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ExceptionMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ExceptionMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishAdminInterface.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishAdminInterface.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishAdminInterface.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishAdminInterface.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishConfig.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishConfig.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishConfig.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishConfig.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishContainer.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishContainer.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishContainer.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishContainer.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaEEConfig.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaEEConfig.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaEEConfig.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaEEConfig.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaSEConfig.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaSEConfig.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaSEConfig.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishJavaSEConfig.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishLibrary.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishLibrary.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishLibrary.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishLibrary.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServer.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServer.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServer.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServer.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerEntity.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerEntity.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerEntity.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerEntity.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerStatus.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerStatus.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerStatus.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishServerStatus.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheckResult.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheckResult.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheckResult.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheckResult.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusTask.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusTask.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusTask.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusTask.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/IdeContext.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/IdeContext.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/IdeContext.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/IdeContext.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgs.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgs.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgs.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgs.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgsEntity.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgsEntity.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgsEntity.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/StartupArgsEntity.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolConfig.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolConfig.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolConfig.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolConfig.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolsConfig.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolsConfig.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolsConfig.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/ToolsConfig.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccount.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccount.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccount.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccount.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccountEntity.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccountEntity.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccountEntity.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishAccountEntity.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloud.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloud.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloud.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloud.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloudEntity.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloudEntity.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloudEntity.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/cloud/GlassFishCloudEntity.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/logging/Logger.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ExceptionMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ExceptionMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ExceptionMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ExceptionMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLog.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLog.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLog.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLog.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEvent.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEvent.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEvent.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEvent.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEventListener.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEventListener.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEventListener.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogEventListener.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogLocal.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogLocal.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogLocal.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogLocal.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogPiped.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogPiped.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogPiped.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogPiped.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogRemote.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogRemote.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogRemote.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogRemote.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogSimple.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogSimple.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogSimple.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/FetchLogSimple.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/JpaSupport.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/JpaSupport.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/JpaSupport.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/JpaSupport.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/AsadminTool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/AsadminTool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/AsadminTool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/AsadminTool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Config.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Config.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Config.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Config.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilder.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilder.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilder.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilder.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigUtils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigUtils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigUtils.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/FileSet.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/FileSet.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/FileSet.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/FileSet.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigManager.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigManager.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigManager.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigManager.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigXMLImpl.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigXMLImpl.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigXMLImpl.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishConfigXMLImpl.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishTool.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishTool.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishTool.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishTool.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV3.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV3.xml
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV3.xml
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV3.xml
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEESet.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEESet.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEESet.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEESet.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSESet.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSESet.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSESet.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSESet.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSet.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSet.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSet.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSet.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/LibraryNode.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/LibraryNode.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/LibraryNode.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/LibraryNode.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ModuleType.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ModuleType.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ModuleType.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ModuleType.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ServerConfigException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ServerConfigException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ServerConfigException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ServerConfigException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Tools.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Tools.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Tools.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/Tools.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/AbstractReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/AbstractReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/AbstractReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/AbstractReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderClasspath.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderClasspath.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderClasspath.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderClasspath.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJava.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJava.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJava.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJava.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaEE.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaEE.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaEE.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaEE.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaSE.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaSE.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaSE.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavaSE.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavadocs.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavadocs.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavadocs.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderJavadocs.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderServer.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderServer.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderServer.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderServer.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderSources.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderSources.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderSources.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderSources.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderTools.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderTools.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderTools.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ConfigReaderTools.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/FilesetReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/FilesetReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/FilesetReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/FilesetReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpData.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpData.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpData.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpData.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpListenerReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpListenerReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpListenerReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/HttpListenerReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEModuleReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEModuleReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEModuleReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEModuleReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileCheckReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileCheckReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileCheckReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileCheckReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaEEProfileReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaSEPlatformReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaSEPlatformReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaSEPlatformReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JavaSEPlatformReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JmxConnectorReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JmxConnectorReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JmxConnectorReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JmxConnectorReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JvmConfigReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JvmConfigReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JvmConfigReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/JvmConfigReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LinkReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LinkReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LinkReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LinkReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LookupReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LookupReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LookupReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/LookupReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/NetworkListenerReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/NetworkListenerReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/NetworkListenerReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/NetworkListenerReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/PathReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/PathReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/PathReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/PathReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ResourcesReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ResourcesReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ResourcesReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ResourcesReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigNameReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigNameReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigNameReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigNameReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TargetConfigReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ToolsAsadminReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ToolsAsadminReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ToolsAsadminReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/ToolsAsadminReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/XMLReader.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/XMLReader.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/XMLReader.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/XMLReader.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AbstractTask.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AbstractTask.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AbstractTask.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AbstractTask.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AdminPortTask.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AdminPortTask.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AdminPortTask.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/AdminPortTask.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ExceptionMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ExceptionMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ExceptionMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ExceptionMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusEntity.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusEntity.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusEntity.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusEntity.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/RunnerTask.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/RunnerTask.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/RunnerTask.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/RunnerTask.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ServerStateException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ServerStateException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ServerStateException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/ServerStateException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJob.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJob.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJob.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJob.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJobState.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJobState.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJobState.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusJobState.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResult.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResult.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResult.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResult.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultLocations.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultLocations.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultLocations.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultLocations.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultVersion.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultVersion.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusResultVersion.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusScheduler.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusScheduler.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusScheduler.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/state/StatusScheduler.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBuffer.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBuffer.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBuffer.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBuffer.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtils.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ExceptionMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ExceptionMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ExceptionMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ExceptionMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Jar.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Jar.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Jar.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Jar.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JarException.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JarException.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JarException.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JarException.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtils.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LinkedList.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LinkedList.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LinkedList.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LinkedList.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LogMessages.properties b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LogMessages.properties
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LogMessages.properties
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/LogMessages.properties
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/NetUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/NetUtils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/NetUtils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/NetUtils.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/OsUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/OsUtils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/OsUtils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/OsUtils.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTree.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTree.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTree.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTree.java
diff --git a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Utils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Utils.java
similarity index 100%
rename from glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Utils.java
rename to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/Utils.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/CommonTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/CommonTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/CommonTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/CommonTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/ExceptionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/ExceptionTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/ExceptionTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/ExceptionTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV3Constants.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV3Constants.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV3Constants.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV3Constants.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV4Constants.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV4Constants.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV4Constants.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/TestDomainV4Constants.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandAsadminTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandAsadminTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandAsadminTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandAsadminTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandDASTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandDASTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandDASTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandDASTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpEnableDisableTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpEnableDisableTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpEnableDisableTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpEnableDisableTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpGetPropertyTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpGetPropertyTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpGetPropertyTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpGetPropertyTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLifeCycleTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLifeCycleTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLifeCycleTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLifeCycleTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListComponentsTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListComponentsTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListComponentsTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListComponentsTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListWebServicesTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListWebServicesTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListWebServicesTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpListWebServicesTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLocationTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLocationTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLocationTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpLocationTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpResourcesTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpResourcesTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpResourcesTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpResourcesTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpSetPropertyTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpSetPropertyTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpSetPropertyTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpSetPropertyTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpVersionTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpVersionTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandHttpVersionTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestApplicationTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestApplicationTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestApplicationTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestApplicationTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestClusterTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestClusterTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestClusterTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestClusterTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestFetchLogDataTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestFetchLogDataTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestFetchLogDataTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestFetchLogDataTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestInstanceTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestInstanceTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestInstanceTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestInstanceTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListApplicationsTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListApplicationsTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListApplicationsTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListApplicationsTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListWebServicesTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListWebServicesTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListWebServicesTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestListWebServicesTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestLocationTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestLocationTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestLocationTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestLocationTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestPropertiesTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestPropertiesTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestPropertiesTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestPropertiesTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestResourcesTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestResourcesTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestResourcesTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestResourcesTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestStopDASTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestStopDASTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestStopDASTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestStopDASTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestVersionTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestVersionTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandRestVersionTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/CommandTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/ProcessIOTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/TaskStateTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/TaskStateTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/TaskStateTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/TaskStateTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeployTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeployTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeployTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/cloud/CommandCloudDeployTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/ResponseParserTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.json b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.json
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.json
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.json
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/location.json b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/location.json
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/location.json
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/location.json
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/FetchLogTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/FetchLogTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/FetchLogTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/FetchLogTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/GF.properties b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/GF.properties
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/GF.properties
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/GF.properties
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/HttpPostTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/HttpPostTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/HttpPostTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/HttpPostTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerStatusTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerStatusTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerStatusTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerStatusTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/DomainConfigReadersTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/DomainConfigReadersTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/DomainConfigReadersTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/DomainConfigReadersTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/GlassfishConfigTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/GlassfishConfigTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/GlassfishConfigTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/GlassfishConfigTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/state/GlassFishStatusTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBufferTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBufferTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBufferTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/CyclicStringBufferTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JarTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JarTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JarTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JarTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtilTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtilTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtilTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/JavaUtilTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtilTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtilTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtilTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtilTest.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StreamLinesList.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StreamLinesList.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StreamLinesList.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StreamLinesList.java
diff --git a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTreeTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTreeTest.java
similarity index 100%
rename from glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTreeTest.java
rename to enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/StringPrefixTreeTest.java
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Bundle.properties b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Bundle.properties
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Bundle.properties
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Bundle.properties
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Deploy.java
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartProfiledServer.java b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartProfiledServer.java
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartProfiledServer.java
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartProfiledServer.java
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartServer.java b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartServer.java
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartServer.java
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/StartServer.java
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Undeploy.java b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Undeploy.java
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Undeploy.java
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Undeploy.java
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Verify.java b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Verify.java
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Verify.java
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/Verify.java
diff --git a/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/antlib.xml b/enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/antlib.xml
similarity index 100%
rename from j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/antlib.xml
rename to enterprise/j2ee.ant/antsrc/org/netbeans/modules/j2ee/ant/antlib.xml
diff --git a/enterprise/j2ee.ant/build.xml b/enterprise/j2ee.ant/build.xml
new file mode 100644
index 0000000000..62a15b9454
--- /dev/null
+++ b/enterprise/j2ee.ant/build.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.ant">
+
+ <import file="../../nbbuild/templates/projectized.xml"/>
+
+ <target name="nblib" depends="init">
+ <mkdir dir="build/antclasses"/>
+ <javac srcdir="antsrc" destdir="build/antclasses" source="1.4" debug="true" deprecation="true">
+ <classpath>
+ <path refid="cp"/>
+ <pathelement location="${ant.jar}"/>
+ <pathelement location="${tools.jar}"/>
+ <fileset dir="../j2eeapis/external">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
+ <copy todir="build/antclasses">
+ <fileset dir="antsrc" excludes="${jar-excludes}"/>
+ </copy>
+ <mkdir dir="${cluster}/ant/nblib"/>
+ <jar jarfile="${cluster}/ant/nblib/org-netbeans-modules-j2ee-ant.jar" compress="false">
+ <fileset dir="build/antclasses"/>
+ </jar>
+ </target>
+
+ <target name="netbeans-extra" depends="nblib"/>
+
+</project>
diff --git a/j2ee.ant/l10n.list b/enterprise/j2ee.ant/l10n.list
similarity index 100%
rename from j2ee.ant/l10n.list
rename to enterprise/j2ee.ant/l10n.list
diff --git a/j2ee.ant/manifest.mf b/enterprise/j2ee.ant/manifest.mf
similarity index 100%
rename from j2ee.ant/manifest.mf
rename to enterprise/j2ee.ant/manifest.mf
diff --git a/j2ee.ant/nbproject/project.properties b/enterprise/j2ee.ant/nbproject/project.properties
similarity index 100%
rename from j2ee.ant/nbproject/project.properties
rename to enterprise/j2ee.ant/nbproject/project.properties
diff --git a/j2ee.ant/nbproject/project.xml b/enterprise/j2ee.ant/nbproject/project.xml
similarity index 100%
rename from j2ee.ant/nbproject/project.xml
rename to enterprise/j2ee.ant/nbproject/project.xml
diff --git a/j2ee.ant/src/org/netbeans/modules/j2ee/ant/Bundle.properties b/enterprise/j2ee.ant/src/org/netbeans/modules/j2ee/ant/Bundle.properties
similarity index 100%
rename from j2ee.ant/src/org/netbeans/modules/j2ee/ant/Bundle.properties
rename to enterprise/j2ee.ant/src/org/netbeans/modules/j2ee/ant/Bundle.properties
diff --git a/enterprise/j2ee.api.ejbmodule/apichanges.xml b/enterprise/j2ee.api.ejbmodule/apichanges.xml
new file mode 100644
index 0000000000..8abfcf2658
--- /dev/null
+++ b/enterprise/j2ee.api.ejbmodule/apichanges.xml
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+ <api name="compiler"/>
+ <summary>Some brief description here, can use <b>XHTML</b></summary>
+ <version major="1" minor="99"/>
+ <date day="13" month="6" year="2001"/>
+ <author login="jrhacker"/>
+ <compatibility addition="yes"/>
+ <description>
+ The main description of the change here.
+ Again can use full <b>XHTML</b> as needed.
+ </description>
+ <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+ <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+ <!-- First, a list of API names you may use: -->
+ <apidefs>
+ <apidef name="EjbJarAPI">J2EE Module and Application API</apidef>
+ </apidefs>
+
+ <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+ <changes>
+ <change id="addCarModule">
+ <api name="EjbJarAPI"/>
+ <summary>Added API method to add application client (car) module into the Ear</summary>
+ <version major="1" minor="2"/>
+ <date day="14" month="4" year="2006"/>
+ <author login="jungi"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="yes"/>
+ <description>
+ <p>
+ The <code>void Ear.addCarModule(Car carModule)</code> method allows to add
+ application client (car) module to Ear module.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.api.ejbjar" name="Ear"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="EarImplementation"/>
+ </change>
+
+ <change id="appClientsSupport">
+ <api name="EjbJarAPI"/>
+ <summary>Added API to support application client (Car) modules</summary>
+ <version major="1" minor="2"/>
+ <date day="14" month="4" year="2006"/>
+ <author login="jungi"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ The API part provides access to Application client (car) module properties and defines
+ constants for use Application client (car) module projects (such as action commands,
+ artifact types, or source types)
+ The SPI part can be implemented by modules that provide Application client (car)
+ "project" support. It can be implemented with buildsystem APIs but other
+ implementations are also possible.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.api.ejbjar" name="Car"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="CarFactory"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="CarImplementation"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="CarProvider"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="CarsInProject"/>
+ </change>
+
+ <change id="ejbReferenceInJavaEE5">
+ <api name="EjbJarAPI"/>
+ <summary>Changed interface for creating EJB references to enable also Java EE 5 style</summary>
+ <version major="1" minor="2"/>
+ <date day="13" month="4" year="2006"/>
+ <author login="madamek"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible" modification="yes"/>
+ <description>
+ <p>
+ In Java EE 5 there is possibility to have reference to EJB in code as annotated field or
+ combination of field and annotated setter. This was not possible with previous <code>EjbReference</code>
+ interface, which was allowing only to create one single method to access reference to EJB. Also
+ references to service locators are now part of API. Old <code>EjbReference</code> interface is now deprecated
+ because it doesn't fully support features of Java EE 5.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.api.ejbjar" name="EjbReference"/>
+ </change>
+
+ <change id="getEjbJarsInProject">
+ <api name="EjbJarAPI"/>
+ <summary>Added API method to get all ejb modules per project and corresponding SPI interface</summary>
+ <version major="1" minor="2"/>
+ <date day="22" month="8" year="2005"/>
+ <author login="pbuzek"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ The <code>EjbJar [] EjbJar.getEjbJarsInProject(Project project)</code> method allows to get
+ all ejb module form a project. Previously clients of this API needed a file in ejb module
+ to get the EjbJar. <code>spi.ejbjar.EjbJarsInProject</code> was added to be implemented by EJB
+ module project types.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.api.ejbjar" name="EjbJar"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="EjbJarsInProject"/>
+ </change>
+
+ <change id="ProjectView">
+ <api name="EjbJarAPI"/>
+ <summary>Added support class for creating project view nodes for J2EE modules and a corresponding SPI class.</summary>
+ <version major="1" minor="2"/>
+ <date day="22" month="8" year="2005"/>
+ <author login="pbuzek"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ The <code>J2eeProjectView</code> allows j2ee modules to create project view nodes (Enterprise Beans
+ node, Server Resources node and Config Files node). The <code>EjbNodesFactory</code> defines
+ an API for modules that create nodes for individual EJBs. <code>EjbNodesFactory</code> is used
+ by the <code>J2eeProjectView</code> but can also be used by other modules to create EJB nodes.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar.support" name="J2eeProjectView"/>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar" name="EjbNodesFactory"/>
+ </change>
+ <change id="EjbEnterpriseReferenceContainerSupport">
+ <api name="EjbJarAPI"/>
+ <summary>Added default implementation of EjbEnterpriseReferenceContainer.</summary>
+ <version major="1" minor="2"/>
+ <date day="22" month="8" year="2005"/>
+ <author login="pbuzek"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ The <code>EjbEnterpriseReferenceContainerSupport</code> provides default implementation of
+ EjbEnterpriseReferenceContainer.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.spi.ejbjar.support" name="EjbEnterpriseReferenceContainerSupport"/>
+ </change>
+ </changes>
+
+ <!-- Now the surrounding HTML text and document structure: -->
+
+ <htmlcontents>
+<!--
+
+ NO NO NO NO NO!
+
+ ==============> DO NOT EDIT ME! <==============
+
+ AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+ SEE j2eeserver/apichanges.xml
+
+-->
+ <head>
+ <title>Change History for the EjbJar API</title>
+ <link rel="stylesheet" href="prose.css" type="text/css"/>
+ </head>
+ <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the EjbJar API.</p>
+
+<!-- The actual lists of changes, as summaries and details: -->
+ <hr/>
+ <standard-changelists module-code-name="org.netbeans.modules.j2ee.api.ejbmodule"/>
+
+ <hr/><p>@FOOTER@</p>
+
+ </body>
+ </htmlcontents>
+
+</apichanges>
diff --git a/enterprise/j2ee.api.ejbmodule/arch.xml b/enterprise/j2ee.api.ejbmodule/arch.xml
new file mode 100644
index 0000000000..871a9e3960
--- /dev/null
+++ b/enterprise/j2ee.api.ejbmodule/arch.xml
@@ -0,0 +1,850 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.26"
+ author="ludovic.champenois@sun.com, pbuzek@netbeans.org"
+>
+
+ &api-questions;
+
+<!--
+ <question id="arch-what" when="init" >
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+
+<answer id="arch-what">
+<p>
+There are multiple IDE modules that need access to definition of an EJB module.
+On one side there are modules that provide wizards, edititing, debugging etc.
+for Ejbs, ejb-jar.xml, and similar. On the other side there are also
+multiple project types that can contain ejb modules in them, like J2EE Application projects/
+This API/SPI exists for communication between these two types of modules.
+This module has been based on existing similar work in the web module area.
+Most of the same patterns use in the web module project apis have beeing reused.
+
+</p>
+</answer>
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+<answer id="arch-overall">
+<p>
+<api group="java" name="EjbJarAPI" type="export" category="friend" url="index.html">
+The API part provides access to EJB module properties, defines constants for use
+EJB module projects (such as action commands, artifact types, or source types) and
+handles adding EJB references to J2EE modules.
+The SPI part can be implemented by modules that provide EJB module "project" support.
+It can be implemented with buildsystem APIs but other implementations are also possible.
+</api>
+</p>
+</answer>
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it at
+ what circumstances and what will be the typical code to write
+ to use the module.
+ </question>
+-->
+<answer id="arch-usecases">
+
+<p><b>Use Cases - API</b></p>
+
+Examples of usage of this API:
+
+<usecase id="EjbJar" name="Find EJB Module and its Properties">
+To find an EJB module that "owns" given file use <code>EjbJar.getEjbJar (FileObject fo)</code>.
+The EjbJar class provides access to deployment descriptor and J2EE specification version of module.
+<p>
+PENDING: Note that an EJB modules do not necessarilly need to have 1-1 relatioship with projects.
+Freeform project, for example, should be able to contain multiple EJB modules.
+SourceRoots could be used to get the list of modules, similarly as it is done in web module.
+This is not implemented.
+</p>
+</usecase>
+
+<usecase id="artifacts" name="Add Dependency on EjbJar Module">
+To add build dependency on a project that provides EJB module(s) use the AntArtifact API
+and the constants defined in <code>EjbProjectConstants</code>.
+</usecase>
+
+<usecase id="createEjbReferences" name="Create EJB References">
+EJB module or web module can have reference to EJBs. This API allows creating
+these references and adding them to module.
+Adding an EJB reference from Java EE 5 version is just adding annotated field or combination
+of field and annotated setter method. For non-managed classes JNDI lookup is still the only
+way to get reference to EJB. For backward compatibility it also
+includes both adding an entry into deployment descriptor and
+adding a convenience method that does the JNDI lookup of the EJB.
+An EJB module defines <code>EjbReference</code> instances for its EJBs.
+<code>EjbReferenceContainer</code> is implemented by projects that can consume EJB references.
+</usecase>
+
+<p><b>Use cases - SPI</b></p>
+
+<usecase id="registerProvider" name="Register EJB Module Provider">
+The SPI allows implementation project types that support ejb module development
+to register their ejb modules and make when work with the ejb support provided
+in NetBeans EJB editing support, ejb-jar.xml editing, wizards, debugging, etc.).
+The SPI is currently implemented in j2ee/ejbapi where it registers a provider that
+looks for a project that owns given file, searches for provides in project lookup
+and delegates to them. Implementors of ejb projects can then just register providers
+into project lookup.
+</usecase>
+
+<p>
+Examples of usage of this SPI:
+</p>
+<pre xml:space="preserve">
+
+//find deployment descriptor of an EJB module for
+// a given Java source file
+
+EjbJar ejbJar = EjbJar.getEjbJar (sourceFileObject);
+FileObject dd = ejbJar.getDeploymentDescriptor ();
+
+</pre>
+</answer>
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone the work should be
+ ready.
+ </hint>
+ </question>
+-->
+<answer id="arch-time">
+The work scoped for promotion E is to make the API/SPI suite the needs of EJB Module
+projects and the new build system implementation.
+</answer>
+<!--
+ <question id="arch-quality" when="init">
+ How the quality of your code will be tested and
+ how future regressions are going to be prevented?
+ <hint>
+ What kind of testing you want to use? What/how much area of functionality
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+<answer id="arch-quality">
+Based on similar work for the Web Module project type. I expect the quality to be good...
+</answer>
+<!--
+ </category>
+ <category id="dep" name="Project and platform dependencies">
+ <question id="dep-nb" when="init" >
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported API using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+<answer id="dep-nb">
+<defaultanswer generate='here' />
+</answer>
+<!--
+ <question id="dep-non-nb" when="init" >
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+<answer id="dep-non-nb">
+None.
+</answer>
+<!--
+ <question id="dep-platform" when="init" >
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+<answer id="dep-platform">
+It should run anywhere.
+</answer>
+<!--
+ <question id="dep-jre" when="final" >
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+<answer id="dep-jre">
+JRE 1.3
+</answer>
+<!--
+ <question id="dep-jrejdk" when="final" >
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+<answer id="dep-jrejdk">
+JRE is enough.
+</answer>
+<!--
+ </category>
+ <category id="deploy" name="Deployment">
+ <question id="deploy-jar" when="impl" >
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+<answer id="deploy-jar">
+No other files are deployed.
+</answer>
+<!--
+ <question id="deploy-nbm" when="impl" >
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+<answer id="deploy-nbm">
+Yes
+</answer>
+<!--
+ <question id="deploy-shared" when="final" >
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+<answer id="deploy-shared">
+Anywhere.
+</answer>
+<!--
+ <question id="deploy-packages" when="init" >
+ Are packages of your module made inaccessible by not declaring them public?
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+<answer id="deploy-packages">
+<p>
+There are 3 public packages that are both specified in manifest:
+</p>
+<ul>
+<li>org.netbeans.modules.j2ee.api.ejbjar</li>
+<li>org.netbeans.modules.j2ee.spi.ejbjar</li>
+<li>org.netbeans.modules.j2ee.spi.ejbjar.support</li>
+</ul>
+</answer>
+<answer id="deploy-dependencies">
+<p>
+Nothing.
+</p>
+</answer>
+<!--
+ </category>
+ <category id="compat" name="Compatibility with environment">
+ <question id="compat-i18n" when="impl" >
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+<answer id="compat-i18n">
+Not applicable.
+</answer>
+<!--
+ <question id="compat-standards" when="init" >
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+<answer id="compat-standards">
+No.
+</answer>
+<!--
+ <question id="compat-version" when="impl" >
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+<answer id="compat-version">
+This is the first version. Modules does not store any settings.
+</answer>
+<!--
+ </category>
+ <category id="resources" name="Access to resources">
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+<answer id="resources-file">
+No.
+</answer>
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+<answer id="resources-layer">
+No.
+</answer>
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+<answer id="resources-read">
+No.
+</answer>
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+ </category>
+-->
+<answer id="resources-mask">
+No.
+</answer>
+<!--
+ <category id="lookup" name="Lookup of components">
+ <question id="lookup-lookup" when="init" >
+ Does your module use <code>org.openide.util.Lookup</code>
+ to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract.
+ </hint>
+ </question>
+-->
+<answer id="lookup-lookup">
+<p>
+Modules is looking for <api name="org.netbeans.modules.j2ee.spi.ejbjar.EjbJarProvider" category="friend" group="lookup" type="export">
+instances that implement mapping from FileObject to EJB module. One such instance is registered by this module, see
+answer to <i>lookup-register</i> question.
+</api>
+</p>
+<p>
+Modules is looking for <api name="org.netbeans.modules.j2ee.spi.ejbjar.EjbNodesFactory" category="friend" group="lookup" type="export">
+instances that create nodes for EJBs. Only one instance is expected.</api>
+</p>
+</answer>
+<!--
+ <question id="lookup-register" when="final" >
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+<answer id="lookup-register">
+<p>
+<api category="friend" group="lookup" name="DefaultEjbJarProvider" type="export">
+Module registers an instance of org.netbeans.modules.j2ee.spi.ejbjar.EjbJarProvider
+that implements the query based on projects - it delegates to EjbJarProvider
+instances found in lookup of a project that owns the given file.</api>
+</p>
+</answer>
+<!--
+ <question id="lookup-remove" when="final" >
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+<answer id="lookup-remove">
+No.
+</answer>
+<!--
+ </category>
+-->
+ <!-- classification of interfaces -->
+ <!-- package names -->
+<!--
+ <category id="exec" name="Execution Environment">
+ <question id="exec-property" when="impl" >
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+<answer id="exec-property">
+No.
+</answer>
+<!--
+ <question id="exec-component" when="impl" >
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+<answer id="exec-component">
+No.
+</answer>
+<!--
+ <question id="exec-classloader" when="impl" >
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+<answer id="exec-classloader">
+No.
+</answer>
+<!--
+ <question id="exec-reflection" when="impl" >
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+<answer id="exec-reflection">
+No.
+</answer>
+<!--
+ <question id="exec-privateaccess" when="final" >
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+<answer id="exec-privateaccess">
+No.
+</answer>
+<!--
+ <question id="exec-process" when="impl" >
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+<answer id="exec-process">
+No.
+</answer>
+<!--
+ <question id="exec-introspection" when="impl" >
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+<answer id="exec-introspection">
+No.
+</answer>
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+<answer id="exec-threading">
+None.
+</answer>
+<!--
+ </category>
+ <category id="format" name="Format of files and protocols">
+ <question id="format-types" when="impl" >
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+<answer id="format-types">
+None.
+</answer>
+<!--
+ <question id="format-dnd" when="impl" >
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+<answer id="format-dnd">
+Not applicable.
+</answer>
+<!--
+ <question id="format-clipboard" when="impl" >
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+<answer id="format-clipboard">
+Not applicable.
+</answer>
+<!--
+ </category>
+ <category id="performance" name="Performance and Scalability">
+ <question id="perf-startup" when="final" >
+ Does your module run any code on startup?
+ </question>
+-->
+<answer id="perf-startup">
+No.
+</answer>
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+<answer id="perf-exit">
+No.
+</answer>
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+<answer id="perf-scale">
+Number of registered ejb module providers, number of open projects.
+No performance problems anticipated.
+</answer>
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+<answer id="perf-limit">
+Not aware of any.
+</answer>
+ <!-- multithreading -->
+<!--
+ <question id="perf-mem" when="final" >
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+<answer id="perf-mem">
+The memory consumption of this module does not grow with number of implementations,
+the memory would be consumed by the implementation modules.
+</answer>
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+<answer id="perf-wakeupp">
+No.
+</answer>
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+<answer id="perf-progress">
+No.
+</answer>
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+<answer id="perf-huge_dialogs">
+No.
+</answer>
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+<answer id="perf-menus">
+No.
+</answer>
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce, that it will behave correctly and fast and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+<answer id="perf-spi">
+no.
+</answer>
+<!--
+ </category>
+-->
+
+<!-- Copy this above the tag! -->
+
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ No.
+ </p>
+ </answer>
+
+<!--
+ <question id="arch-where" when="init">
+ Where one can find sources for your module?
+ <hint>
+ Please provide link to the CVS web client at
+ http://www.netbeans.org/download/source_browse.html
+ or just use tag defaultanswer generate='here'
+ </hint>
+ </question>
+-->
+ <answer id="arch-where">
+ <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+ <question id="exec-ant-tasks" when="impl">
+ Do you define or register any ant tasks that other can use?
+
+ <hint>
+ If you provide an ant task that users can use, you need to be very
+ careful about its syntax and behaviour, as it most likely forms an
+ API for end users and as there is a lot of end users, their reaction
+ when such API gets broken can be pretty strong.
+ </hint>
+ </question>
+-->
+ <answer id="exec-ant-tasks">
+ <p>
+ XXX no answer for exec-ant-tasks
+ </p>
+ </answer>
+
+</api-answers>
diff --git a/j2ee.api.ejbmodule/arch/overview.html b/enterprise/j2ee.api.ejbmodule/arch/overview.html
similarity index 100%
rename from j2ee.api.ejbmodule/arch/overview.html
rename to enterprise/j2ee.api.ejbmodule/arch/overview.html
diff --git a/enterprise/j2ee.api.ejbmodule/build.xml b/enterprise/j2ee.api.ejbmodule/build.xml
new file mode 100644
index 0000000000..3b1fc04afb
--- /dev/null
+++ b/enterprise/j2ee.api.ejbmodule/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.api.ejbmodule">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/j2ee.api.ejbmodule/licenseinfo.xml b/enterprise/j2ee.api.ejbmodule/licenseinfo.xml
similarity index 100%
rename from j2ee.api.ejbmodule/licenseinfo.xml
rename to enterprise/j2ee.api.ejbmodule/licenseinfo.xml
diff --git a/j2ee.api.ejbmodule/manifest.mf b/enterprise/j2ee.api.ejbmodule/manifest.mf
similarity index 100%
rename from j2ee.api.ejbmodule/manifest.mf
rename to enterprise/j2ee.api.ejbmodule/manifest.mf
diff --git a/j2ee.api.ejbmodule/nbproject/project.properties b/enterprise/j2ee.api.ejbmodule/nbproject/project.properties
similarity index 100%
rename from j2ee.api.ejbmodule/nbproject/project.properties
rename to enterprise/j2ee.api.ejbmodule/nbproject/project.properties
diff --git a/j2ee.api.ejbmodule/nbproject/project.xml b/enterprise/j2ee.api.ejbmodule/nbproject/project.xml
similarity index 100%
rename from j2ee.api.ejbmodule/nbproject/project.xml
rename to enterprise/j2ee.api.ejbmodule/nbproject/project.xml
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Car.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Car.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Car.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Car.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Ear.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Ear.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Ear.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/Ear.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbJar.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbJar.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbJar.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbJar.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbProjectConstants.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbProjectConstants.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbProjectConstants.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbProjectConstants.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbReference.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbReference.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbReference.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EjbReference.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceContainer.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceContainer.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceContainer.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceContainer.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceSupport.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceSupport.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceSupport.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/EnterpriseReferenceSupport.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/MessageDestinationReference.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/MessageDestinationReference.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/MessageDestinationReference.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/MessageDestinationReference.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/ResourceReference.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/ResourceReference.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/ResourceReference.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/ResourceReference.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/package.html b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/package.html
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/package.html
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/api/ejbjar/package.html
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/Bundle.properties b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/Bundle.properties
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/Bundle.properties
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/Bundle.properties
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/CarAccessor.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/CarAccessor.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/CarAccessor.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/CarAccessor.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EarAccessor.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EarAccessor.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EarAccessor.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EarAccessor.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EjbJarAccessor.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EjbJarAccessor.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EjbJarAccessor.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/EjbJarAccessor.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectCarProvider.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectCarProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectCarProvider.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectCarProvider.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEarProvider.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEarProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEarProvider.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEarProvider.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEjbJarProvider.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEjbJarProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEjbJarProvider.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/ProjectEjbJarProvider.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle.properties b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle.properties
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle.properties
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle.properties
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerNode.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerNode.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerNode.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerNode.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ejbjar.gif b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ejbjar.gif
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ejbjar.gif
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ejbjar.gif
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/enterpriseBeansBadge.png b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/enterpriseBeansBadge.png
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/enterpriseBeansBadge.png
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/enterpriseBeansBadge.png
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/resourcesBadge.gif b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/resourcesBadge.gif
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/resourcesBadge.gif
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/resourcesBadge.gif
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/wait.gif b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/wait.gif
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/wait.gif
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/wait.gif
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarFactory.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarFactory.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarFactory.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarFactory.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation2.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation2.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation2.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarImplementation2.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarProvider.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarProvider.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarProvider.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarsInProject.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarsInProject.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarsInProject.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/CarsInProject.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation2.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation2.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation2.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarImplementation2.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarProvider.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarProvider.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EarProvider.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarFactory.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarFactory.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarFactory.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarFactory.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation2.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation2.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation2.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarImplementation2.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarProvider.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarProvider.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarProvider.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarsInProject.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarsInProject.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarsInProject.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbJarsInProject.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbNodesFactory.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbNodesFactory.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbNodesFactory.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/EjbNodesFactory.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/package.html b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/package.html
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/package.html
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/package.html
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle.properties b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle.properties
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle.properties
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle.properties
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbEnterpriseReferenceContainerSupport.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbEnterpriseReferenceContainerSupport.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbEnterpriseReferenceContainerSupport.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbEnterpriseReferenceContainerSupport.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbJarSupport.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbJarSupport.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbJarSupport.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbJarSupport.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbReferenceSupport.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbReferenceSupport.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbReferenceSupport.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/EjbReferenceSupport.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/J2eeProjectView.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/J2eeProjectView.java
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/J2eeProjectView.java
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/J2eeProjectView.java
diff --git a/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/package.html b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/package.html
similarity index 100%
rename from j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/package.html
rename to enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/spi/ejbjar/support/package.html
diff --git a/j2ee.api.ejbmodule/test/unit/data/a.foo b/enterprise/j2ee.api.ejbmodule/test/unit/data/a.foo
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/data/a.foo
rename to enterprise/j2ee.api.ejbmodule/test/unit/data/a.foo
diff --git a/j2ee.api.ejbmodule/test/unit/data/b.bar b/enterprise/j2ee.api.ejbmodule/test/unit/data/b.bar
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/data/b.bar
rename to enterprise/j2ee.api.ejbmodule/test/unit/data/b.bar
diff --git a/j2ee.api.ejbmodule/test/unit/data/c.biz b/enterprise/j2ee.api.ejbmodule/test/unit/data/c.biz
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/data/c.biz
rename to enterprise/j2ee.api.ejbmodule/test/unit/data/c.biz
diff --git a/j2ee.api.ejbmodule/test/unit/data/conf/application-client.xml b/enterprise/j2ee.api.ejbmodule/test/unit/data/conf/application-client.xml
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/data/conf/application-client.xml
rename to enterprise/j2ee.api.ejbmodule/test/unit/data/conf/application-client.xml
diff --git a/j2ee.api.ejbmodule/test/unit/data/conf/ejb-jar.xml b/enterprise/j2ee.api.ejbmodule/test/unit/data/conf/ejb-jar.xml
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/data/conf/ejb-jar.xml
rename to enterprise/j2ee.api.ejbmodule/test/unit/data/conf/ejb-jar.xml
diff --git a/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProvider.java b/enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProvider.java
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProvider.java
rename to enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProvider.java
diff --git a/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCar.java b/enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCar.java
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCar.java
rename to enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCar.java
diff --git a/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCarTest.java b/enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCarTest.java
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCarTest.java
rename to enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderCarTest.java
diff --git a/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEar.java b/enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEar.java
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEar.java
rename to enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEar.java
diff --git a/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEarTest.java b/enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEarTest.java
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEarTest.java
rename to enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderEarTest.java
diff --git a/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderTest.java b/enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderTest.java
similarity index 100%
rename from j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderTest.java
rename to enterprise/j2ee.api.ejbmodule/test/unit/src/org/netbeans/modules/j2ee/ejbjar/CustomProviderTest.java
diff --git a/enterprise/j2ee.clientproject/arch.xml b/enterprise/j2ee.clientproject/arch.xml
new file mode 100644
index 0000000000..cbb77923e9
--- /dev/null
+++ b/enterprise/j2ee.clientproject/arch.xml
@@ -0,0 +1,1119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.26"
+ author="jungi@netbeans.org"
+>
+
+ &api-questions;
+
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+ <answer id="arch-overall">
+ <p>
+ The module exposes a new NetBeans project type to create Java EE Enterprise
+ Application Client Module project, where a developer can create standard Java SE
+ applications, which have direct access to the server environment and resources
+ (such as EJBs, Web Services), develop these applications, assemble them according
+ to Java EE specification, build them and deploy them to Application servers.
+ </p>
+ <p>
+ It uses various project APIs to implement the project type. <a
+ href="http://projects.netbeans.org/buildsys/design.html">Build system design
+ document</a>. Implements j2ee/ejbapi to provide a project container
+ for an Enterprise application client module.
+ </p>
+ <ol>
+ <li>
+ <api group="dtd" name="car-project.xsd" type="export" category="devel" url="http://www.netbeans.org/ns/car-project/1.xsd">
+ <p>
+ Definition of clientproject-specific portions of <code>project.xml</code>.
+ </p>
+ </api>
+ </li>
+ <li>
+ <api group="java.io.File" name="project.properties" type="export" category="devel">
+ <p>
+ Definition of recognized keys in <code>project.properties</code> and/or
+ <code>private.properties</code>. XXX not yet formally specified.
+ </p>
+ </api>
+ </li>
+ <li>
+ <api group="java.io.File" name="build-impl.xml" type="export" category="devel">
+ <p>
+ Definition of targets in <code>build-impl.xml</code> which may be called or
+ overridden in <code>build.xml</code>. XXX not yet formally specified.
+ </p>
+ </api>
+ </li>
+ <li>
+ <api group="java.io.File" name="LayoutOfProjectFiles" type="export" category="private">
+ <p>
+ Modules should make no assumptions about the layout of project directory other then
+ what is explicitly exposed via API (such as J2eeModuleProvider from j2eeserver API,
+ AntArtifact).
+ </p>
+ </api>
+ </li>
+ </ol>
+ </answer>
+
+
+
+<!--
+ <question id="arch-quality" when="init">
+ How will the <a href="http://www.netbeans.org/community/guidelines/q-evangelism.html">quality</a>
+ of your code be tested and
+ how are future regressions going to be prevented?
+ <hint>
+ What kind of testing do
+ you want to use? How much functionality, in which areas,
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+ <answer id="arch-quality">
+ <p>
+ There are some unit tests (not enough). IDE-wide functional testing covers
+ much of the module's functionality.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone by which the work should be
+ ready?
+ </hint>
+ </question>
+-->
+ <answer id="arch-time">
+ <p>
+ Done.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-usecases" when="init">
+ <hint>
+ Content of this answer will be displayed as part of page at
+ http://www.netbeans.org/download/dev/javadoc/usecases.html
+ You can use tags <usecase name="name> regular html description </usecase>
+ and if you want to use an URL you can prefix if with @TOP@ to begin
+ at the root of your javadoc
+ </hint>
+
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it under
+ what circumstances? What kind of code would typically need to be written
+ to use the module?
+ </question>
+-->
+ <answer id="arch-usecases">
+ <p>
+ <usecase id="id" name="Project Generator" >
+ AppClientProjectGenerator can be used to generate an Application Client module
+ project. This can be used for example to create a populated EAR project
+ together with an Application Client module project.
+ This is the only (private) API.
+ </usecase>
+ </p>
+ <p>
+ The rest is covered by UI specification and design document.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-what" when="init">
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+ <answer id="arch-what">
+ <p>
+ Provides a project type for Java EE enterprise application client module
+ projects. Application client projects can be created from scratch,
+ or you can import existing application client module source trees. Creates an Ant
+ script letting you build the project (and subprojects), deploy it, debug it, run
+ JUnit-format tests, and build Javadoc. Standard and server specific
+ configuration files are displayed in project and can be edited. GUI customizer
+ permits easy customization of the most commonly needed project parameters.
+ Provides code completion and other services for editing Java sources.
+ Classpaths can include other projects, raw JARs, or configured libraries.
+ Specific J2SE platforms may be configured. Target J2EE server can be selected
+ and provides code completion for the Java EE APIs available on the server.
+ <a
+ href="http://j2ee.netbeans.org/docs/promog/appclient-project-ui-spec-promog.html">Full UI
+ specification</a>
+ </p>
+ <api name="ClientProject" category="friend" group="java" type="export">
+ <p>
+ The module exposes a new NetBeans project type to create Java EE Application
+ Client Module project, where a developer can add EJBs, develop them, assemble them, build them and deploy them to Application servers.
+ The friend API allows EAR project to create an Application Client module project. It also allows the ejbcore project to set
+ one property in nbproject\project.properties file.
+ </p>
+ </api>
+ </answer>
+
+
+
+<!--
+ <question id="arch-where" when="init">
+ Where one can find sources for your module?
+ <hint>
+ Please provide link to the CVS web client at
+ http://www.netbeans.org/download/source_browse.html
+ or just use tag defaultanswer generate='here'
+ </hint>
+ </question>
+-->
+ <answer id="arch-where">
+ <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+ <question id="compat-i18n" when="impl">
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+ <answer id="compat-i18n">
+ <p>
+ Yes, although the project type does not yet internationalize messages coming
+ from its (unedited) build scripts. This is possible but not yet implemented.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-standards" when="init">
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+ <answer id="compat-standards">
+ <p>
+ The module follows the Java EE 5 specifications. It allows the user
+ to develop applications conforming to this standard. The implementation is exact,
+ in the sense that the module accepts any compliant Application Client Module.
+ Since Java EE 5 has to be backward comaptible with J2EE 1.4, this module
+ supports J2EE 1.4 Application Client Modules. This module also supports J2EE 1.3
+ compliant Application Client modules, but it does not help you to create NEW ones,
+ it will just behave nicely with 1.3 Apps, due to the API layer designed in the j2ee/ddapi
+ module that handles more than one specification version of J2EE.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-version" when="impl">
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+ <answer id="compat-version">
+ <p>
+ The module stores some information into persistent data, and makes the best
+ effort to correctly interpret information stored by previous versions of the
+ module. It is anticipated that future versions of the module will be able to
+ interpret information stored by the current version, whenever possible and practical.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-jre" when="final">
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+ <answer id="dep-jre">
+ <p>
+ 1.5 and higher.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-jrejdk" when="final">
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+ <answer id="dep-jrejdk">
+ <p>
+ The JDK is needed for critical functionality such as compiling sources.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-nb" when="init">
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported APIs using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+ <answer id="dep-nb">
+ <defaultanswer generate='here' />
+ </answer>
+
+
+
+<!--
+ <question id="dep-non-nb" when="init">
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+ <answer id="dep-non-nb">
+ <p>
+ Indirectly, Apache Ant and JUnit.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-platform" when="init">
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+ <answer id="dep-platform">
+ <p>
+ Any.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-dependencies" when="final">
+ What do other modules need to do to declare a dependency on this one?
+ <hint>
+ Provide a sample of the actual lines you would add to a module manifest
+ to declare a dependency, for example using OpenIDE-Module-Module-Dependencies
+ or OpenIDE-Module-Requires. You may use the magic token @SPECIFICATION-VERSION@
+ to represent the current specification version of the module.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-dependencies">
+ <p>
+ N/A
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-jar" when="impl">
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ Usually a module consist of one JAR file (perhaps with Class-Path
+ extensions) and also a configuration file that enables it. If you
+ have any other files, use
+ <api group="java.io.File" name="yourname" type="export" category="friend">...</api>
+ to define the location, name and stability of your files (of course
+ changing "yourname" and "friend" to suit your needs).
+
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-jar">
+ <p>
+ Just a JAR.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-nbm" when="impl">
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+ <answer id="deploy-nbm">
+ <p>
+ Yes.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-packages" when="init">
+ Are packages of your module made inaccessible by not declaring them
+ public?
+
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-packages">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-shared" when="final">
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-shared">
+ <p>
+ Either way is possible.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-ant-tasks" when="impl">
+ Do you define or register any ant tasks that other can use?
+
+ <hint>
+ If you provide an ant task that users can use, you need to be very
+ careful about its syntax and behaviour, as it most likely forms an
+ API for end users and as there is a lot of end users, their reaction
+ when such API gets broken can be pretty strong.
+ </hint>
+ </question>
+-->
+ <answer id="exec-ant-tasks">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-classloader" when="impl">
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+ <answer id="exec-classloader">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-component" when="impl">
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+ <answer id="exec-component">
+ <p>
+ Uses property <code>platform.ant.name</code> returned by the <code>J2SEPlatformImpl.getProperties()</code>
+ to determine the name of platform used in build scripts.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-introspection" when="impl">
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+ <answer id="exec-introspection">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-privateaccess" when="final">
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+ <answer id="exec-privateaccess">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-process" when="impl">
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+ <answer id="exec-process">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-property" when="impl">
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+ <answer id="exec-property">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-reflection" when="impl">
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+ <answer id="exec-reflection">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+ <answer id="exec-threading">
+ <p>
+ Mixture, according to particular functionality:
+ <code>ProjectManager.mutex()</code>, EQ, etc.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-clipboard" when="impl">
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+ <answer id="format-clipboard">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-dnd" when="impl">
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+ <answer id="format-dnd">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-types" when="impl">
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network? Do you generate an ant build script?
+ Can it be edited and modified?
+
+ <hint>
+ <p>
+ Files can be read and written by other programs, modules and users. If they influence
+ your behaviour, make sure you either document the format or claim that it is a private
+ api (using the <api> tag).
+ </p>
+
+ <p>
+ If you generate an ant build file, this is very likely going to be seen by end users and
+ they will be attempted to edit it. You should be ready for that and provide here a link
+ to documentation that you have for such purposes and also describe how you are going to
+ understand such files during next release, when you (very likely) slightly change the
+ format.
+ </p>
+ </hint>
+ </question>
+-->
+ <answer id="format-types">
+ <p>
+ It writes files through the OpenAPIs, specifically through the FileSystem API
+ and the Settings API.
+ Additionally, it reads the files in the formats specified by the J2EE 1.4
+ and Java EE 5 specification.
+ </p>
+ <p>
+ The usual Ant-based project metadata files and build scripts.
+ </p>
+ <p>
+ Depends on the structure of built Javadoc. It tries to find the <code>overview-summary.html</code> in the
+ <code>api</code> folder, and the <code>package-summary.html</code> and Javadoc pages for classes in the
+ package structure under the <code>api</code> folder.
+ </p>
+ <p>
+ <!-- #58823 --> Writes XML-format JUnit results to <code>${build.test.results.dir}</code> for use by
+ <code>org.netbeans.modules.junit</code>.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-lookup" when="init">
+ Does your module use <code>org.openide.util.Lookup</code>
+ or any similar technology to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract. For that use <api group=&lookup& /> tag.
+ </hint>
+ </question>
+-->
+ <answer id="lookup-lookup">
+ <p>
+ Nothing special.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-register" when="final">
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-register">
+ <p>
+ Project type and various query implementations are registered. An
+ <code>AntLogger</code> is registered which currently just tweaks the
+ appearance of compiler errors.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-remove" when="final">
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-remove">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+ <answer id="perf-exit">
+ <p>
+ Not usually, though modified project metadata is saved on close or exit.
+ (Normally all GUI actions autosave immediately anyway.) It also unregisters
+ some listeners.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+ <answer id="perf-huge_dialogs">
+ <p>
+ No, all dialogs and wizards are of reasonable complexity.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+ <answer id="perf-limit">
+ <p>
+ None known.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-mem" when="final">
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+ <answer id="perf-mem">
+ <p>
+ Unknown. Probably not much.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated and slow enablement logic?
+ <hint>
+ If you do a lot of tricks when adding actions to regular or context menus, you can significantly
+ slow down display of the menu, even when the user is not using your action. Pay attention to
+ actions you add to the main menu bar, and to context menus of foreign nodes or components. If
+ the action is conditionally enabled, or changes its display dynamically, you need to check the
+ impact on performance. In some cases it may be more appropriate to make a simple action that is
+ always enabled but does more detailed checks in a dialog if it is actually run.
+ </hint>
+ </question>
+-->
+ <answer id="perf-menus">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+ <answer id="perf-progress">
+ <p>
+ It launches the compilation of Java files, and deployment of
+ standalone Application Client Module.
+ Although ultimately these tasks are not directly performed
+ by this module (but by cooperating modules), it can be assumed that these tasks
+ will be long running.
+ Another long running task is the mounting of additional filesystems when
+ an application client module is registered or created in the IDE.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+ <answer id="perf-scale">
+ <p>
+ Number of source files in the project will affect the time it takes to scan
+ for a main class.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce that it will behave correctly and quickly and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+ <answer id="perf-spi">
+ <p>
+ N/A
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-startup" when="final">
+ Does your module run any code on startup?
+ </question>
+-->
+ <answer id="perf-startup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+ <answer id="resources-file">
+ <p>
+ Yes. The use of <code>java.io.File</code> is needed for interaction with the
+ Server Integration APIs, which expect it as parameters in some API calls.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+ <answer id="resources-layer">
+ <p>
+ The new project wizard is registered in the layer.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+-->
+ <answer id="resources-mask">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+ <answer id="resources-read">
+ <api group="layer" name="ClientLookup" type="export" category="official">
+ <p>
+ "Projects/org-netbeans-modules-j2ee-clientproject/Lookup" folder's content is used to construct the project's additional lookup.
+ It's content is expected to be <code>LookupProvider</code> instances. AppClient project provides <code>LookupMerger</code>s
+ for <code>Sources</code>, <code>PrivilegedTemplates</code> and <code>RecommendedTemplates</code>. Implementations added by 3rd parties
+ will be merged into a single instance in the project's lookup.
+ </p>
+ </api>
+ <api group="layer" name="ClientProjectCustomizer" type="export" category="official">
+ <p>
+ "Projects/org-netbeans-modules-j2ee-clientproject/Customizer" folder's content is used to construct the project's customizer.
+ It's content is expected to be <code>ProjectCustomizer.CompositeCategoryProvider</code> instances.
+ The lookup passed to the panels contains an instance of <code>Project</code> and <code>org.netbeans.modules.j2ee.clientproject.ui.customizer.AppClientProjectProperties</code>
+ Please note that the latter is not part of any public APIs and you need implementation dependency to make use of it.
+ </p>
+ </api>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ No.
+ </p>
+ </answer>
+
+</api-answers>
diff --git a/enterprise/j2ee.clientproject/build.xml b/enterprise/j2ee.clientproject/build.xml
new file mode 100644
index 0000000000..2ebeb21ef9
--- /dev/null
+++ b/enterprise/j2ee.clientproject/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.clientproject">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/j2ee.clientproject/licenseinfo.xml b/enterprise/j2ee.clientproject/licenseinfo.xml
similarity index 100%
rename from j2ee.clientproject/licenseinfo.xml
rename to enterprise/j2ee.clientproject/licenseinfo.xml
diff --git a/j2ee.clientproject/manifest.mf b/enterprise/j2ee.clientproject/manifest.mf
similarity index 100%
rename from j2ee.clientproject/manifest.mf
rename to enterprise/j2ee.clientproject/manifest.mf
diff --git a/j2ee.clientproject/nbproject/project.properties b/enterprise/j2ee.clientproject/nbproject/project.properties
similarity index 100%
rename from j2ee.clientproject/nbproject/project.properties
rename to enterprise/j2ee.clientproject/nbproject/project.properties
diff --git a/j2ee.clientproject/nbproject/project.xml b/enterprise/j2ee.clientproject/nbproject/project.xml
similarity index 100%
rename from j2ee.clientproject/nbproject/project.xml
rename to enterprise/j2ee.clientproject/nbproject/project.xml
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientActionProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientCompilationClassPathModifierImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientCompilationClassPathModifierImpl.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientCompilationClassPathModifierImpl.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientCompilationClassPathModifierImpl.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientInjectionTargetQueryImplementation.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectConstants.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectConstants.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectConstants.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectConstants.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectOperations.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectOperations.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectOperations.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectOperations.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectType.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Bundle.properties b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Bundle.properties
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Bundle.properties
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Bundle.properties
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/JarContainerImpl.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/MainClassUpdater.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/MainClassUpdater.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/MainClassUpdater.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/MainClassUpdater.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ProjectAppClientProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ProjectAppClientProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ProjectAppClientProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ProjectAppClientProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/UpdateProjectImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/UpdateProjectImpl.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/UpdateProjectImpl.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/UpdateProjectImpl.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Utils.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Utils.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Utils.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/Utils.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectCreateData.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/Bundle.properties b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/Bundle.properties
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/Bundle.properties
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/Bundle.properties
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/DelagatingProjectClassPathModifierImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/DelagatingProjectClassPathModifierImpl.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/DelagatingProjectClassPathModifierImpl.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/DelagatingProjectClassPathModifierImpl.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build-impl.xsl
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build.xsl b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build.xsl
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build.xsl
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/build.xsl
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project-private.xsd b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project-private.xsd
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project-private.xsd
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project-private.xsd
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project.xsd b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project.xsd
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project.xsd
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/resources/car-project.xsd
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/AppClientLogicalViewProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/Bundle.properties
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/ConfFilesNodeFactory.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/ConfFilesNodeFactory.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/ConfFilesNodeFactory.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/ConfFilesNodeFactory.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/LibrariesNodeFactory.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/LibrariesNodeFactory.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/LibrariesNodeFactory.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/LibrariesNodeFactory.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/SetupDirNodeFactory.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/SetupDirNodeFactory.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/SetupDirNodeFactory.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/SetupDirNodeFactory.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AddAnnotationProcessor.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientCompositePanelProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle.properties
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/ClassPathTableModel.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/ClassPathTableModel.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/ClassPathTableModel.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/ClassPathTableModel.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerCompile.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJar.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerJavadoc.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerProviderImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerProviderImpl.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerProviderImpl.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerProviderImpl.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerRun.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerSources.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassChooser.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/MainClassWarning.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/MANIFEST.MF b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/MANIFEST.MF
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/MANIFEST.MF
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/MANIFEST.MF
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/appclient.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-1.4.xml b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-1.4.xml
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-1.4.xml
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-1.4.xml
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-5.xml b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-5.xml
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-5.xml
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-5.xml
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-6.xml b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-6.xml
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-6.xml
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-6.xml
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-7.xml b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-7.xml
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-7.xml
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-7.xml
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject.html b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject.html
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject.html
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject.html
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject.html b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject.html
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject.html
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject.html
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application_16.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application_16.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application_16.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application_16.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/debug.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/debug.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/debug.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/debug.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop.html b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop.html
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop.html
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop.html
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/general.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/general.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/general.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/general.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/layer.xml
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRoot.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRoot.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRoot.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRoot.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRootOpen.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRootOpen.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRootOpen.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/packageRootOpen.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/test.gif b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/test.gif
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/test.gif
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/test.gif
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle.properties
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/ImportAppClientProjectWizardIterator.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/NewAppClientProjectWizardIterator.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/PanelSourceFolders.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/SettingsPanel.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/SettingsPanel.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/SettingsPanel.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/SettingsPanel.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/WizardProperties.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/WizardProperties.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/WizardProperties.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/wizards/WizardProperties.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesClientSupport.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesSupportProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesSupportProvider.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesSupportProvider.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectWebServicesSupportProvider.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle.properties b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle.properties
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle.properties
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle.properties
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.form b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.form
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.form
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.form
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/CustomizerWSClientHost.java
diff --git a/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/NoWebServiceClientsPanel.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/NoWebServiceClientsPanel.java
similarity index 100%
rename from j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/NoWebServiceClientsPanel.java
rename to enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/NoWebServiceClientsPanel.java
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/build.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/build.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/build.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/build.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/libs/README b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/libs/README
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/libs/README
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/libs/README
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/build-impl.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/build-impl.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/build-impl.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/genfiles.properties b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/genfiles.properties
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/genfiles.properties
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/jax-ws.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/jax-ws.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/jax-ws.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/jax-ws.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.properties b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.properties
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.properties
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.properties
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/nbproject/project.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/MANIFEST.MF b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/MANIFEST.MF
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/MANIFEST.MF
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/application-client.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/application-client.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/application-client.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/conf/application-client.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/java/applicationclient1/NewClass.java b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/java/applicationclient1/NewClass.java
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/java/applicationclient1/NewClass.java
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/src/java/applicationclient1/NewClass.java
diff --git a/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/test/applicationclient1/NewClassTest.java b/enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/test/applicationclient1/NewClassTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/ApplicationClient1/test/applicationclient1/NewClassTest.java
rename to enterprise/j2ee.clientproject/test/unit/data/projects/ApplicationClient1/test/applicationclient1/NewClassTest.java
diff --git a/j2ee.clientproject/test/unit/data/projects/importTest/build.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/importTest/build.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/importTest/build.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/importTest/build.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/importTest/src/conf/application-client.xml b/enterprise/j2ee.clientproject/test/unit/data/projects/importTest/src/conf/application-client.xml
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/importTest/src/conf/application-client.xml
rename to enterprise/j2ee.clientproject/test/unit/data/projects/importTest/src/conf/application-client.xml
diff --git a/j2ee.clientproject/test/unit/data/projects/importTest/src/java/applicationclient15/Main.java b/enterprise/j2ee.clientproject/test/unit/data/projects/importTest/src/java/applicationclient15/Main.java
similarity index 100%
rename from j2ee.clientproject/test/unit/data/projects/importTest/src/java/applicationclient15/Main.java
rename to enterprise/j2ee.clientproject/test/unit/data/projects/importTest/src/java/applicationclient15/Main.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProviderTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProviderTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProviderTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientPersistenceProviderTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProjectTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/AppClientProviderTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/TestPlatformProvider.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/TestPlatformProvider.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/TestPlatformProvider.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/TestPlatformProvider.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGeneratorTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGeneratorTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGeneratorTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGeneratorTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/AppClientProjectClassPathExtenderTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/AppClientProjectClassPathExtenderTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/AppClientProjectClassPathExtenderTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/AppClientProjectClassPathExtenderTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathProviderImplTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathProviderImplTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathProviderImplTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathProviderImplTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/queries/CompiledSourceForBinaryQueryTest.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/queries/CompiledSourceForBinaryQueryTest.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/queries/CompiledSourceForBinaryQueryTest.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/queries/CompiledSourceForBinaryQueryTest.java
diff --git a/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/test/TestUtil.java b/enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/test/TestUtil.java
similarity index 100%
rename from j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/test/TestUtil.java
rename to enterprise/j2ee.clientproject/test/unit/src/org/netbeans/modules/j2ee/clientproject/test/TestUtil.java
diff --git a/enterprise/j2ee.common/apichanges.xml b/enterprise/j2ee.common/apichanges.xml
new file mode 100644
index 0000000000..67d7c75f1c
--- /dev/null
+++ b/enterprise/j2ee.common/apichanges.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+ <api name="compiler"/>
+ <summary>Some brief description here, can use <b>XHTML</b></summary>
+ <version major="1" minor="99"/>
+ <date day="13" month="6" year="2001"/>
+ <author login="jrhacker"/>
+ <compatibility addition="yes"/>
+ <description>
+ The main description of the change here.
+ Again can use full <b>XHTML</b> as needed.
+ </description>
+ <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+ <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+ <!-- First, a list of API names you may use: -->
+ <apidefs>
+ <apidef name="j2ee-utilities">J2EE Module and Application API</apidef>
+ </apidefs>
+
+ <!-- ACTUAL CHANGES BEGIN HERE: -->
+ <changes>
+
+ <change id="web-project-classpath-modifier">
+ <api name="j2ee-utilities"/>
+ <summary>Split WebProjectClassPathModifier and move shared part to j2ee.common</summary>
+ <version major="1" minor="53"/>
+ <date day="4" month="8" year="2010"/>
+ <author login="dkonecny"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ Split and move existing Friend API from web project into
+ j2ee.common so that it can be used by AppClient project
+ as well.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common.project" name="CompilationOnlyClassPathModifier"/>
+ <issue number="189174"/>
+ </change>
+
+ <change id="beans-xml">
+ <api name="j2ee-utilities"/>
+ <summary>Helper method DDHelper.createBeansXml was added.</summary>
+ <version major="1" minor="49"/>
+ <date day="13" month="1" year="2010"/>
+ <author login="dkonecny"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ Helper method DDHelper.createBeansXml was added.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common.dd" name="DDHelper"/>
+ </change>
+
+ <change id="migrate-code-to-java-api-common">
+ <api name="j2ee-utilities"/>
+ <summary>Migrate all Java related code to java.api.common module.</summary>
+ <version major="1" minor="36"/>
+ <date day="28" month="10" year="2008"/>
+ <author login="dkonecny"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible" deletion="yes"/>
+ <description>
+ <p>
+ Most of Java specific code was moved to java.api.common module.
+ </p>
+ </description>
+ <issue number="150357"/>
+ </change>
+
+ <change id="copylibs-library-upgrade">
+ <api name="j2ee-utilities"/>
+ <summary>Helper method makeSureProjectHasCopyLibsLibrary was added.</summary>
+ <version major="1" minor="29"/>
+ <date day="11" month="9" year="2008"/>
+ <author login="dkonecny"/>
+ <compatibility addition="yes"/>
+ <description>
+ <p>
+ Helper method makeSureProjectHasCopyLibsLibrary was added.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common" name="SharabilityUtility"/>
+ <issue number="146736"/>
+ </change>
+
+ <change id="revive-copylib-task">
+ <api name="j2ee-utilities"/>
+ <summary><copylibs> Ant task was revived</summary>
+ <version major="1" minor="26"/>
+ <date day="27" month="6" year="2008"/>
+ <author login="dkonecny"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible"/>
+ <description>
+ <p>
+ Removal of support for generating libs.XXX.classpath.libfile.XXX properties
+ and keeping them up to date. It was replaced with <copylibs> Ant task.
+ All friend API clients updated.
+ </p>
+ </description>
+ <issue number="134642"/>
+ </change>
+
+ <change id="ProjectTypeRefactorings">
+ <api name="j2ee-utilities"/>
+ <summary>Refactorings of J2EE/Web code</summary>
+ <version major="1" minor="22"/>
+ <date day="18" month="2" year="2008"/>
+ <author login="dkonecny"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ Added project type implementation classes which are same in j2ee project types.
+ See <code>org.netbeans.modules.j2ee.common.project</code> packages and
+ subpackages.
+ </p>
+ </description>
+ </change>
+
+ <change id="J2eeServerSharability">
+ <api name="j2ee-utilities"/>
+ <summary>Added common panels and utility class for sharability.</summary>
+ <version major="1" minor="21"/>
+ <date day="18" month="2" year="2008"/>
+ <author login="phejl"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ Added sharability support classes.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common.sharability" name="SharabilityUtilities" link="no"/>
+ <class package="org.netbeans.modules.j2ee.common.sharability" name="PanelSharability" link="no"/>
+ </change>
+
+ <change id="J2eeProjectsConstants">
+ <api name="j2ee-utilities"/>
+ <summary>Removed J2eeProjectsConstants class.</summary>
+ <version major="1" minor="2"/>
+ <date day="22" month="8" year="2005"/>
+ <author login="pbuzek"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="no"/>
+ <description>
+ <p>
+ The <code>J2eeProjectsConstants</code> is a duplicate of EjbProjectConstants in EjbJarAPI.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common" name="J2eeProjectsConstants" link="no"/>
+ </change>
+
+ <change id="DDEditorNavigator">
+ <api name="j2ee-utilities"/>
+ <summary>Added support for synchronization between DD editor and EJB nodes.</summary>
+ <version major="1" minor="2"/>
+ <date day="22" month="8" year="2005"/>
+ <author login="pbuzek"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ The class serves for synchronization between EJB nodes and deployment descriptor editor.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common" name="DDEditorNavigator"/>
+ </change>
+
+
+ <change id="FieldAndQueryCustomizers">
+ <api name="j2ee-utilities"/>
+ <summary>Added two customizers: for .</summary>
+ <version major="1" minor="2"/>
+ <date day="22" month="8" year="2005"/>
+ <author login="pbuzek"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ Added the <code>FieldCustomizer</code> and <code>QueryCustomizer</code> classes.
+ into newly created j2ee/ejbcore module's API.
+ </p>
+ </description>
+ <!--
+ <class package="org.netbeans.modules.j2ee.common.ui.nodes" name="FieldCustomizer"/>
+ <class package="org.netbeans.modules.j2ee.common.ui.nodes" name="QueryCustomizer"/>
+ -->
+ </change>
+
+
+ <change id="DatasourceCombobox">
+ <api name="j2ee-utilities"/>
+ <summary>Added two customizers: for .</summary>
+ <version major="1" minor="6"/>
+ <date day="17" month="3" year="2006"/>
+ <author login="lkotouc"/>
+ <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+ <description>
+ <p>
+ Added the <code>DatasourceUIHelper</code> class for listing and managing data sources
+ in the combobox given by a client.
+ </p>
+ </description>
+ <class package="org.netbeans.modules.j2ee.common" name="DatasourceUIHelper"/>
+ </change>
+ </changes>
+
+ <!-- Now the surrounding HTML text and document structure: -->
+
+ <htmlcontents>
+<!--
+
+ NO NO NO NO NO!
+
+ ==============> DO NOT EDIT ME! <==============
+
+ AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+ SEE j2eeserver/apichanges.xml
+
+-->
+ <head>
+ <title>Change History for the EjbJar API</title>
+ <link rel="stylesheet" href="prose.css" type="text/css"/>
+ </head>
+ <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the EjbJar API.</p>
+
+<!-- The actual lists of changes, as summaries and details: -->
+ <hr/>
+ <standard-changelists module-code-name="org.netbeans.modules.j2ee.api.ejbmodule"/>
+
+ <hr/><p>@FOOTER@</p>
+
+ </body>
+ </htmlcontents>
+
+</apichanges>
diff --git a/enterprise/j2ee.common/arch.xml b/enterprise/j2ee.common/arch.xml
new file mode 100644
index 0000000000..c0d383baab
--- /dev/null
+++ b/enterprise/j2ee.common/arch.xml
@@ -0,0 +1,828 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<!-- XXX this file is wrong - (madamek) -->
+
+<api-answers
+ question-version="1.26"
+ author="pbuzek@netbeans.org"
+>
+
+ &api-questions;
+
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+ <answer id="arch-overall">
+ The API consists of a set of helper classes for projects implementation and UI
+ components and factories for j2ee based projects.
+ </answer>
+
+
+
+<!--
+ <question id="arch-quality" when="init">
+ How will the <a href="http://www.netbeans.org/community/guidelines/q-evangelism.html">quality</a>
+ of your code be tested and
+ how are future regressions going to be prevented?
+ <hint>
+ What kind of testing do
+ you want to use? How much functionality, in which areas,
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+ <answer id="arch-quality">
+ No test coverage.
+ </answer>
+
+
+
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone by which the work should be
+ ready?
+ </hint>
+ </question>
+-->
+ <answer id="arch-time">
+ 4.1 version complete. More work may be required in future releases to accomodate
+ new project types, additional UI components, etc.
+ </answer>
+
+
+
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it under
+ what circumstances? What kind of code would typically need to be written
+ to use the module?
+ </question>
+-->
+ <answer id="arch-usecases">
+ <usecase id="DatasourceCombobox" name="Combobox for retrieving and managing data sources">
+ <p>
+ <a href="@TOP@org/netbeans/modules/j2ee/common/DatasourceUIHelper.html">DatasourceUIHelper</a>
+ populates and manages the content of the combobox given by a client.
+ The combobox content consists of data sources in the alphabetical order
+ and items allowing data sources management.
+ </p>
+ </usecase>
+ </answer>
+
+
+
+<!--
+ <question id="arch-what" when="init">
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+ <answer id="arch-what">
+ <api name="J2eeProjectSupportAPI" category="friend" group="java" type="export" url="">
+Utility classes for implementation of j2ee projects.</api>
+ </answer>
+
+
+
+<!--
+ <question id="compat-i18n" when="impl">
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+ <answer id="compat-i18n">
+ Yes.
+ </answer>
+
+
+
+<!--
+ <question id="compat-standards" when="init">
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+ <answer id="compat-standards">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="compat-version" when="impl">
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+ <answer id="compat-version">
+ This is the first version. There are no settings for this module.
+ </answer>
+
+
+
+<!--
+ <question id="dep-jre" when="final">
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+ <answer id="dep-jre">
+ JRE 1.3.
+ </answer>
+
+
+
+<!--
+ <question id="dep-jrejdk" when="final">
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+ <answer id="dep-jrejdk">
+ JRE
+ </answer>
+
+
+
+<!--
+ <question id="dep-nb" when="init">
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported APIs using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+
+<!-- Not complete - (madamek) -->
+
+ <answer id="dep-nb">
+ <defaultanswer generate='none' />
+PENDING
+ </answer>
+
+
+
+<!--
+ <question id="dep-non-nb" when="init">
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+ <answer id="dep-non-nb">
+ JSR88 and JMI, both packaged as libraries.
+ </answer>
+
+
+
+<!--
+ <question id="dep-platform" when="init">
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+ <answer id="dep-platform">
+ No.
+ </answer>
+
+
+
+ <answer id="deploy-dependencies">
+Nothing.
+ </answer>
+
+
+
+<!--
+ <question id="deploy-jar" when="impl">
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-jar">
+ Just the module jar file.
+ </answer>
+
+
+
+<!--
+ <question id="deploy-nbm" when="impl">
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+ <answer id="deploy-nbm">
+ Yes.
+ </answer>
+
+
+
+<!--
+ <question id="deploy-packages" when="init">
+ Are packages of your module made inaccessible by not declaring them
+ public?
+
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-packages">
+ Yes.
+ </answer>
+
+
+
+<!--
+ <question id="deploy-shared" when="final">
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-shared">
+ Anywhere.
+ </answer>
+
+
+
+<!--
+ <question id="exec-classloader" when="impl">
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+ <answer id="exec-classloader">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-component" when="impl">
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+ <answer id="exec-component">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-introspection" when="impl">
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+ <answer id="exec-introspection">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-privateaccess" when="final">
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+ <answer id="exec-privateaccess">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-process" when="impl">
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+ <answer id="exec-process">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-property" when="impl">
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+ <answer id="exec-property">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-reflection" when="impl">
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+ <answer id="exec-reflection">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+ <answer id="exec-threading">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="format-clipboard" when="impl">
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+ <answer id="format-clipboard">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="format-dnd" when="impl">
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+ <answer id="format-dnd">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="format-types" when="impl">
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+ <answer id="format-types">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="lookup-lookup" when="init">
+ Does your module use <code>org.openide.util.Lookup</code>
+ or any similar technology to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract. For that use <api group=&lookup& /> tag.
+ </hint>
+ </question>
+-->
+ <answer id="lookup-lookup">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="lookup-register" when="final">
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-register">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="lookup-remove" when="final">
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-remove">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+ <answer id="perf-exit">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+ <answer id="perf-huge_dialogs">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+ <answer id="perf-limit">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-mem" when="final">
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+ <answer id="perf-mem">
+ unknown
+ </answer>
+
+
+
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+ <answer id="perf-menus">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+ <answer id="perf-progress">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+ <answer id="perf-scale">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce that it will behave correctly and quickly and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+ <answer id="perf-spi">
+ No SPI.
+ </answer>
+
+
+
+<!--
+ <question id="perf-startup" when="final">
+ Does your module run any code on startup?
+ </question>
+-->
+ <answer id="perf-startup">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+ <answer id="resources-file">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+ <answer id="resources-layer">
+ empty
+ </answer>
+
+
+
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+-->
+ <answer id="resources-mask">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+ <answer id="resources-read">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant addition rights to some code?
+ <hint>Avoid using a classloder that adds some extra
+ permissions to loaded code unless realy necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ AccessController.doPrilileged() calls.</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ No.
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require standard policy file modification?
+ <hint>Your code may pass control to third party code not
+ coming from trusted domain. It covers code downloaded over
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions it needs to grant to which domain?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ No.
+ </answer>
+
+</api-answers>
diff --git a/enterprise/j2ee.common/build.xml b/enterprise/j2ee.common/build.xml
new file mode 100644
index 0000000000..c425ebbd83
--- /dev/null
+++ b/enterprise/j2ee.common/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.common">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/j2ee.common/licenseinfo.xml b/enterprise/j2ee.common/licenseinfo.xml
similarity index 100%
rename from j2ee.common/licenseinfo.xml
rename to enterprise/j2ee.common/licenseinfo.xml
diff --git a/j2ee.common/manifest.mf b/enterprise/j2ee.common/manifest.mf
similarity index 100%
rename from j2ee.common/manifest.mf
rename to enterprise/j2ee.common/manifest.mf
diff --git a/j2ee.common/nbproject/project.properties b/enterprise/j2ee.common/nbproject/project.properties
similarity index 100%
rename from j2ee.common/nbproject/project.properties
rename to enterprise/j2ee.common/nbproject/project.properties
diff --git a/j2ee.common/nbproject/project.xml b/enterprise/j2ee.common/nbproject/project.xml
similarity index 100%
rename from j2ee.common/nbproject/project.xml
rename to enterprise/j2ee.common/nbproject/project.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/Bundle.properties
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ClasspathUtil.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ClasspathUtil.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ClasspathUtil.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ClasspathUtil.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.form b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.form
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.form
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.form
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceHelper.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceHelper.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceHelper.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceHelper.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceUIHelper.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceUIHelper.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceUIHelper.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceUIHelper.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/EEInjectiontargetQueryImplementation.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/FileSearchUtility.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/FileSearchUtility.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/FileSearchUtility.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/FileSearchUtility.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/MetadataModelReadHelper.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/MetadataModelReadHelper.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/MetadataModelReadHelper.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/MetadataModelReadHelper.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ProjectUtil.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ProjectUtil.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ProjectUtil.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ProjectUtil.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ServerUtil.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ServerUtil.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ServerUtil.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ServerUtil.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/SharabilityUtility.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/SharabilityUtility.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/SharabilityUtility.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/SharabilityUtility.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.0.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.0.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.0.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.1.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.1.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.1.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.1.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.3.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.3.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.3.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.3.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.4.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.4.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.4.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.4.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-5.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-5.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-5.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-5.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-6.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-6.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-6.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-6.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-7.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-7.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-7.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-7.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.3.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.3.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.3.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.3.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.4.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.4.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.4.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.4.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.5.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.5.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.5.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-2.5.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.0.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.0.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.0.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.1.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.1.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.1.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-3.1.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.0.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.0.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.0.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.1.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.1.xml
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.1.xml
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.1.xml
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.form b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.form
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.form
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.form
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceAlertPanel.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.form b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.form
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.form
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.form
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerAlertPanel.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.form b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.form
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.form
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.form
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibraryAlertPanel.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibrarySupport.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibrarySupport.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibrarySupport.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerLibrarySupport.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenServerSupport.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/Bundle.properties b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/Bundle.properties
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/Bundle.properties
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/Bundle.properties
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/J2EEUISettings.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/J2EEUISettings.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/J2EEUISettings.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/J2EEUISettings.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.form b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.form
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.form
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.form
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.form
diff --git a/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java
similarity index 100%
rename from j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java
rename to enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/NoSelectedServerWarning.java
diff --git a/j2ee.common/test/unit/src/layer.xml b/enterprise/j2ee.common/test/unit/src/layer.xml
similarity index 100%
rename from j2ee.common/test/unit/src/layer.xml
rename to enterprise/j2ee.common/test/unit/src/layer.xml
diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java
similarity index 100%
rename from j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java
rename to enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java
diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceImpl.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceImpl.java
similarity index 100%
rename from j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceImpl.java
rename to enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceImpl.java
diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceUIHelperTest.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceUIHelperTest.java
similarity index 100%
rename from j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceUIHelperTest.java
rename to enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/DatasourceUIHelperTest.java
diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeModuleProviderImpl.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeModuleProviderImpl.java
similarity index 100%
rename from j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeModuleProviderImpl.java
rename to enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeModuleProviderImpl.java
diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
similarity index 100%
rename from j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
rename to enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
diff --git a/j2ee.common/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java
similarity index 100%
rename from j2ee.common/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java
rename to enterprise/j2ee.common/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java
diff --git a/j2ee.common/test/unit/src/templates/Class.template b/enterprise/j2ee.common/test/unit/src/templates/Class.template
similarity index 100%
rename from j2ee.common/test/unit/src/templates/Class.template
rename to enterprise/j2ee.common/test/unit/src/templates/Class.template
diff --git a/j2ee.common/test/unit/src/templates/Interface.template b/enterprise/j2ee.common/test/unit/src/templates/Interface.template
similarity index 100%
rename from j2ee.common/test/unit/src/templates/Interface.template
rename to enterprise/j2ee.common/test/unit/src/templates/Interface.template
diff --git a/enterprise/j2ee.core/build.xml b/enterprise/j2ee.core/build.xml
new file mode 100644
index 0000000000..8f7ffcc9a3
--- /dev/null
+++ b/enterprise/j2ee.core/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.core">
+ <description>Builds, tests, and runs the project org.netbeans.modules.j2ee.core</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/j2ee.core/manifest.mf b/enterprise/j2ee.core/manifest.mf
similarity index 100%
rename from j2ee.core/manifest.mf
rename to enterprise/j2ee.core/manifest.mf
diff --git a/j2ee.core/nbproject/project.properties b/enterprise/j2ee.core/nbproject/project.properties
similarity index 100%
rename from j2ee.core/nbproject/project.properties
rename to enterprise/j2ee.core/nbproject/project.properties
diff --git a/j2ee.core/nbproject/project.xml b/enterprise/j2ee.core/nbproject/project.xml
similarity index 100%
rename from j2ee.core/nbproject/project.xml
rename to enterprise/j2ee.core/nbproject/project.xml
diff --git a/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties b/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties
similarity index 100%
rename from j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties
rename to enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties
diff --git a/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java b/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java
similarity index 100%
rename from j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java
rename to enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java
diff --git a/j2ee.core/src/org/netbeans/modules/j2ee/core/resources/Bundle.properties b/enterprise/j2ee.core/src/org/netbeans/modules/j2ee/core/resources/Bundle.properties
similarity index 100%
rename from j2ee.core/src/org/netbeans/modules/j2ee/core/resources/Bundle.properties
rename to enterprise/j2ee.core/src/org/netbeans/modules/j2ee/core/resources/Bundle.properties
diff --git a/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java b/enterprise/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java
similarity index 100%
rename from j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java
rename to enterprise/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java
diff --git a/enterprise/j2ee.dd.webservice/apichanges.xml b/enterprise/j2ee.dd.webservice/apichanges.xml
new file mode 100644
index 0000000000..16a7cfdb69
--- /dev/null
+++ b/enterprise/j2ee.dd.webservice/apichanges.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+ <api name="compiler"/>
+ <summary>Some brief description here, can use <b>XHTML</b></summary>
+ <version major="1" minor="99"/>
+ <date day="13" month="6" year="2001"/>
+ <author login="jrhacker"/>
+ <compatibility addition="yes"/>
+ <description>
+ The main description of the change here.
+ Again can use full <b>XHTML</b> as needed.
+ </description>
+ <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+ <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+ <!-- First, a list of API names you may use: -->
+ <apidefs>
+ <apidef name="WebsvcDDAPI">Web Services Deployment Descriptor API</apidef>
+ </apidefs>
+
+ <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+ <changes>
+
+ </changes>
+
+ <!-- Now the surrounding HTML text and document structure: -->
+
+ <htmlcontents>
+<!--
+
+ NO NO NO NO NO!
+
+ ==============> DO NOT EDIT ME! <==============
+
+ AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+ SEE websvc/websvcddapi/apichanges.xml
+
+-->
+ <head>
+ <title>Change History for the Web Services Deployment Descriptor API</title>
+ <link rel="stylesheet" href="prose.css" type="text/css"/>
+ </head>
+ <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>no changes</h1>
+
+
+<!-- The actual lists of changes, as summaries and details: -->
+<!--
+ <hr/>
+ <standard-changelists module-code-name="org.netbeans.modules.j2ee.dd.webservice"/>
+
+ <hr/><p>@FOOTER@</p>
+
+-->
+ </body>
+ </htmlcontents>
+</apichanges>
diff --git a/enterprise/j2ee.dd.webservice/arch.xml b/enterprise/j2ee.dd.webservice/arch.xml
new file mode 100644
index 0000000000..2231ab2f5c
--- /dev/null
+++ b/enterprise/j2ee.dd.webservice/arch.xml
@@ -0,0 +1,820 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.24"
+ author="pavel.buzek@sun.com"
+>
+
+ &api-questions;
+
+<!--
+ <question id="arch-what" when="init" >
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+
+<answer id="arch-what">
+The project is based on the requirement to access webservices deployment descriptor files
+for other Netbeans modules in a simple and J2EE spec.-independant way. This module has been
+based on the Web DD module form the Web area.
+</answer>
+
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+<answer id="arch-overall">
+ <api
+ name="WebsvcDDAPI"
+ type="export"
+ category="friend"
+ group="java"
+ url="index.html">
+The web services DD API is based on a bunch of interfaces based on the deployment descriptor xml structure. The names of interfaces correspond to the names of deployment descriptor elements in the webservices.xml file.
+The DD API interfaces are organized in a hierarchic tree structure and are accassible through the root (<b>Webservices</b>) interface.
+The implementation of DD API interfaces is hidden for clients. It is based on schema2beans infrastructure and is the DD version - specific.
+(there is always requirement to support at least two successive versions of DD specification).
+The implementation is located in <b>non-public</b> packages of <a href="index.html">websvc/websvcddapi</a> module.
+It is expected that interfaces will not be implemented by the client.<br/>
+The root of the deployment descriptor is accessible through the <b>DDProvider</b> class.
+ </api>
+</answer>
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it at
+ what circumstances and what will be the typical code to write
+ to use the module.
+ </question>
+-->
+<answer id="arch-usecases">
+
+<usecase id="websvc-dd-1" name="Adding, removing and editing webservices" >
+When creating, deleting or editing web services the webservices.xml has to be updated
+accordingly.
+</usecase>
+
+<usecase id="web-dd-4" name="DD Editor">
+<p>
+ A visual DD Editor for webservices.xml could be created using this API
+ similarly as editors for web.xml and ejb-jar.xml. Visual editors significantly
+ improve DD editing in the way that user doesn't need to know the syntax of
+ deployment descriptor file.
+ It is desirable for DD Editor module to work with DD API interfaces instead of
+ working with s2b beans directly (generated specifically for the particular version of DD).
+ This method was used in previous versions of IDE.
+</p>
+</usecase>
+
+</answer>
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone the work should be
+ ready.
+ </hint>
+ </question>
+-->
+<answer id="arch-time">
+All the programming work is already done. It has been extensively reusing the same patterns as the equivalent module for Web DD APIs.
+</answer>
+<!--
+ <question id="arch-quality" when="init">
+ How the quality of your code will be tested and
+ how future regressions are going to be prevented?
+ <hint>
+ What kind of testing you want to use? What/how much area of functionality
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+<answer id="arch-quality">
+No tests. Tests setup from Web DD APIs or J2EE DD API could be reused.
+</answer>
+<!--
+ </category>
+ <category id="dep" name="Project and platform dependencies">
+ <question id="dep-nb" when="init" >
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported API using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+<answer id="dep-nb">
+<defaultanswer generate='none' />
+It uses these API's:
+
+<ul>
+<li>
+ <api
+ name="FileSystems"
+ type="import"
+ group="java"
+ category="official"
+ url="@org-openide-filesystems@/overview-summary.html">
+ NetBeans Open APIs / FileSystems
+ </api>
+</li>
+<li>
+ <api
+ name="Loaders"
+ type="import"
+ category="official"
+ group="java"
+ url="@org-openide-loaders@/overview-summary.html">
+ NetBeans Open APIs / Loaders
+ </api>
+</li>
+<li>
+ <api
+ name="schema2beans"
+ type="import"
+ category="stable"
+ group="java"
+ url="">
+ Schema2beans infrastructure
+ </api>
+<b>Runtime dependency - the implementation part depends on this library. The implementation part is a part of j2ee/ddapis module (org.netbeans.modules.j2ee.dd.impl package).
+</b>
+</li>
+<li>
+ <api
+ name="J2EEDDAPI"
+ type="import"
+ group="java"
+ category="friend"
+ url="@org-netbeans-modules-j2ee-dd@/overview-summary.html">
+ </api>
+</li>
+</ul>
+</answer>
+<!--
+ <question id="dep-non-nb" when="init" >
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+<answer id="dep-non-nb">
+<ul>
+ <li>
+ <api group="java" name="Xerces" type="import" category="third" url="">
+ for obtaining an xml parser able to validate against the XML schema (Crimson does not).<br/>
+ Used in <a href="@org-netbeans-modules-j2ee-dd@/org/netbeans/modules/j2ee/dd/api/web/DDProvider.html">DDProvider</a>.
+ </api>
+ </li>
+</ul>
+</answer>
+<!--
+ <question id="dep-platform" when="init" >
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+<answer id="dep-platform">
+100% pure Java. It should run anywhere.
+</answer>
+<!--
+ <question id="dep-jre" when="final" >
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+<answer id="dep-jre">
+<b>JRE 1.4</b> or <b>JRE 1.3</b> with <b>JAXP</b>
+</answer>
+<!--
+ <question id="dep-jrejdk" when="final" >
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+<answer id="dep-jrejdk">
+<b>JRE 1.4</b> or <b>JRE 1.3</b> with <b>JAXP</b>
+</answer>
+<!--
+ </category>
+ <category id="deploy" name="Deployment">
+ <question id="deploy-jar" when="impl" >
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+<answer id="deploy-jar">
+No other files are deployed.
+</answer>
+<!--
+ <question id="deploy-nbm" when="impl" >
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+<answer id="deploy-nbm">
+Yes
+</answer>
+<!--
+ <question id="deploy-shared" when="final" >
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+<answer id="deploy-shared">
+Anywhere.
+</answer>
+<!--
+ <question id="deploy-packages" when="init" >
+ Are packages of your module made inaccessible by not declaring them public?
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+<answer id="deploy-packages">
+Yes. Public packages of DD API module are specified in module manifest file :<br/><br/>
+<b>OpenIDE-Module-Public-Packages: org.netbeans.modules.j2ee.dd.api.webservices</b><br/>
+(the DDProvider class and interfaces for manipulation with webservices.xml files)
+</answer>
+<answer id="deploy-dependencies">
+Nothing.
+</answer>
+<!--
+ </category>
+ <category id="compat" name="Compatibility with environment">
+ <question id="compat-i18n" when="impl" >
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+<answer id="compat-i18n">
+Yes.
+</answer>
+<!--
+ <question id="compat-standards" when="init" >
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+<answer id="compat-standards">
+The Webservices DD API implements [PENDING:peter.williams@sun.com].
+</answer>
+<!--
+ <question id="compat-version" when="impl" >
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+<answer id="compat-version">
+Nowadays DD Webservices API accepts both the DTD and XML schema files.
+It is expected that in future the XML schema for deployment descriptor will be changed.
+</answer>
+<!--
+ </category>
+ <category id="resources" name="Access to resources">
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+<answer id="resources-file">
+No.
+</answer>
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+<answer id="resources-layer">
+No.
+</answer>
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+<answer id="resources-read">
+No.
+</answer>
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+ </category>
+-->
+<answer id="resources-mask">
+No.
+</answer>
+<!--
+ <category id="lookup" name="Lookup of components">
+ <question id="lookup-lookup" when="init" >
+ Does your module use <code>org.openide.util.Lookup</code>
+ to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract.
+ </hint>
+ </question>
+-->
+<answer id="lookup-lookup">
+No.
+</answer>
+<!--
+ <question id="lookup-register" when="final" >
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+<answer id="lookup-register">
+No.
+</answer>
+<!--
+ <question id="lookup-remove" when="final" >
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+<answer id="lookup-remove">
+No.
+</answer>
+<!--
+ </category>
+-->
+ <!-- classification of interfaces -->
+ <!-- package names -->
+<!--
+ <category id="exec" name="Execution Environment">
+ <question id="exec-property" when="impl" >
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+<answer id="exec-property">
+No.
+</answer>
+<!--
+ <question id="exec-component" when="impl" >
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+<answer id="exec-component">
+No.
+</answer>
+<!--
+ <question id="exec-classloader" when="impl" >
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+<answer id="exec-classloader">
+No.
+</answer>
+<!--
+ <question id="exec-reflection" when="impl" >
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+<answer id="exec-reflection">
+Not directly. The implementation part of DD API uses the reflection when implementing the :
+<ul>
+ <li><b>public CommonDDBean findBeanByName(String beanName, String propertyName, String value);</b> method</li>
+</ul>
+</answer>
+<!--
+ <question id="exec-privateaccess" when="final" >
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+<answer id="exec-privateaccess">
+No.
+</answer>
+<!--
+ <question id="exec-process" when="impl" >
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+<answer id="exec-process">
+No.
+</answer>
+<!--
+ <question id="exec-introspection" when="impl" >
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+<answer id="exec-introspection">
+Not directly. The implementation of DD API uses the introspection in :
+<ul>
+ <li><b>public CommonDDBean createBean(String beanName) throws ClassNotFoundException;</b> method</li>
+</ul>
+</answer>
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+<answer id="exec-threading">
+No.
+</answer>
+<!--
+ </category>
+ <category id="format" name="Format of files and protocols">
+ <question id="format-types" when="impl" >
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+<answer id="format-types">
+XML format specified by both DTD and XML schema.
+</answer>
+<!--
+ <question id="format-dnd" when="impl" >
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+<answer id="format-dnd">
+Not applied.
+</answer>
+<!--
+ <question id="format-clipboard" when="impl" >
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+<answer id="format-clipboard">
+Not applied.
+</answer>
+<!--
+ </category>
+ <category id="performance" name="Performance and Scalability">
+ <question id="perf-startup" when="final" >
+ Does your module run any code on startup?
+ </question>
+-->
+<answer id="perf-startup">
+No.
+</answer>
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+<answer id="perf-exit">
+No.
+</answer>
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+<answer id="perf-scale">
+The size of webservices.xml files, the performance of schema2beans module :
+<ul>
+ <li> bean graph generating (marshaling)</li>
+ <li> bean graph merging</li>
+ <li> bean graph writing (unmarshaling)</li>
+</ul>
+The reading/parsing and writing the web.xml is the bottleneck of the DD API performance. Than the schema2beans root object is <b>weakly</b> cached in memmory.
+However, those operations have no visible impact while working with web modules with standard-sized deployment descriptors.<br/>
+The measurements were not provided for DD API specifically, but there may have been some measurements made in <a href="http://schema2beans.netbeans.org">schema2beans infrastructure</a> that is used for DD API implementation. There should be no additional deficites added by DD API.
+</answer>
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+<answer id="perf-limit">
+Not aware of any.
+</answer>
+ <!-- multithreading -->
+<!--
+ <question id="perf-mem" when="final" >
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+<answer id="perf-mem">
+?
+</answer>
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+<answer id="perf-wakeupp">
+No.
+</answer>
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+<answer id="perf-progress">
+No.
+</answer>
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+<answer id="perf-huge_dialogs">
+No.
+</answer>
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+<answer id="perf-menus">
+No.
+</answer>
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce, that it will behave correctly and fast and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+<answer id="perf-spi">
+The Webservices DD API has no SPI part.<br/>
+Though the DD API consists of a set of interfaces, <b>the implementation part is supposed to be writen only by DD API owners</b>.<br/>
+There is no support for plug-in a new implementation.<br/>
+ <b>This will be specified clearly in the API documentation</b>.
+</answer>
+<!--
+ </category>
+-->
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ No.
+ </p>
+ </answer>
+
+</api-answers>
+<!-- Copy this above the </api-answers> tag! -->
diff --git a/enterprise/j2ee.dd.webservice/build.xml b/enterprise/j2ee.dd.webservice/build.xml
new file mode 100644
index 0000000000..7fc2427f8a
--- /dev/null
+++ b/enterprise/j2ee.dd.webservice/build.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.dd.webservice">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+
+ <property name="resourcesdir" value="./src/org/netbeans/modules/j2ee/dd/impl/resources"/>
+ <target name="build-init" depends="projectized.build-init">
+ <unzip src="external/j2ee.dd.webservice-glassfish-resources.zip" dest="${resourcesdir}"/>
+ <unzip src="external/j2ee.dd.webservice-w3c-resources.zip" dest="${resourcesdir}"/>
+ </target>
+</project>
diff --git a/j2ee.dd.webservice/doc/org/netbeans/modules/j2ee/dd/api/webservices/package.html b/enterprise/j2ee.dd.webservice/doc/org/netbeans/modules/j2ee/dd/api/webservices/package.html
similarity index 100%
rename from j2ee.dd.webservice/doc/org/netbeans/modules/j2ee/dd/api/webservices/package.html
rename to enterprise/j2ee.dd.webservice/doc/org/netbeans/modules/j2ee/dd/api/webservices/package.html
diff --git a/j2ee.dd.webservice/external/binaries-list b/enterprise/j2ee.dd.webservice/external/binaries-list
similarity index 100%
rename from j2ee.dd.webservice/external/binaries-list
rename to enterprise/j2ee.dd.webservice/external/binaries-list
diff --git a/j2ee.dd.webservice/external/glassfish-license.txt b/enterprise/j2ee.dd.webservice/external/glassfish-license.txt
similarity index 100%
rename from j2ee.dd.webservice/external/glassfish-license.txt
rename to enterprise/j2ee.dd.webservice/external/glassfish-license.txt
diff --git a/j2ee.dd.webservice/external/netbeans-license.txt b/enterprise/j2ee.dd.webservice/external/netbeans-license.txt
similarity index 100%
rename from j2ee.dd.webservice/external/netbeans-license.txt
rename to enterprise/j2ee.dd.webservice/external/netbeans-license.txt
diff --git a/j2ee.dd.webservice/external/w3c-license.txt b/enterprise/j2ee.dd.webservice/external/w3c-license.txt
similarity index 100%
rename from j2ee.dd.webservice/external/w3c-license.txt
rename to enterprise/j2ee.dd.webservice/external/w3c-license.txt
diff --git a/j2ee.dd.webservice/manifest.mf b/enterprise/j2ee.dd.webservice/manifest.mf
similarity index 100%
rename from j2ee.dd.webservice/manifest.mf
rename to enterprise/j2ee.dd.webservice/manifest.mf
diff --git a/enterprise/j2ee.dd.webservice/nbproject/project.properties b/enterprise/j2ee.dd.webservice/nbproject/project.properties
new file mode 100644
index 0000000000..3c4a6d3706
--- /dev/null
+++ b/enterprise/j2ee.dd.webservice/nbproject/project.properties
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+is.autoload=true
+
+javac.compilerargs=-Xlint:unchecked
+javac.source=1.6
+javadoc.apichanges=${basedir}/apichanges.xml
+javadoc.arch=${basedir}/arch.xml
+javadoc.docfiles=${basedir}/doc
+
+# needed for the WebServiceTestCase class
+test.unit.cp.extra=\
+ ${nb_all}/enterprise/j2ee.dd/external/javaee-api-5.jar:\
+ ${websvc.jaxws21api.dir}/modules/ext/jaxws21/api/jsr181-api.jar
+test.config.stableBTD.includes=**/*Test.class
+
+requires.nb.javac=true
diff --git a/j2ee.dd.webservice/nbproject/project.xml b/enterprise/j2ee.dd.webservice/nbproject/project.xml
similarity index 100%
rename from j2ee.dd.webservice/nbproject/project.xml
rename to enterprise/j2ee.dd.webservice/nbproject/project.xml
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProvider.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProvider.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProvider.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProvider.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponent.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponent.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponent.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponent.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponentHandler.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponentHandler.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponentHandler.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/PortComponentHandler.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/ServiceImplBean.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/ServiceImplBean.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/ServiceImplBean.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/ServiceImplBean.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebserviceDescription.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebserviceDescription.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebserviceDescription.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebserviceDescription.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/Webservices.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/Webservices.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/Webservices.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/Webservices.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebservicesMetadata.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebservicesMetadata.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebservicesMetadata.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/api/webservices/WebservicesMetadata.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/EnclosingBean.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/EnclosingBean.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/EnclosingBean.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/EnclosingBean.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/KeyBean.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/KeyBean.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/KeyBean.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/KeyBean.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/j2ee_web_services_1_1.mdd b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/j2ee_web_services_1_1.mdd
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/j2ee_web_services_1_1.mdd
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/j2ee_web_services_1_1.mdd
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_1_2.mdd b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_1_2.mdd
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_1_2.mdd
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/resources/javaee_web_services_1_2.mdd
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/CommonDDAccess.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/CommonDDAccess.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/CommonDDAccess.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/CommonDDAccess.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/PortComponentImpl.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/PortComponentImpl.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/PortComponentImpl.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/PortComponentImpl.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/ServiceImplBeanImpl.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/ServiceImplBeanImpl.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/ServiceImplBeanImpl.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/ServiceImplBeanImpl.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebserviceDescriptionImpl.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebserviceDescriptionImpl.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebserviceDescriptionImpl.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebserviceDescriptionImpl.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesImpl.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesImpl.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesImpl.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesImpl.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataImpl.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataImpl.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataImpl.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataImpl.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataModelImpl.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataModelImpl.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataModelImpl.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebservicesMetadataModelImpl.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_1/package-info.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/model_1_2/package-info.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/spi/webservices/WebservicesMetadataModelFactory.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/spi/webservices/WebservicesMetadataModelFactory.java
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/spi/webservices/WebservicesMetadataModelFactory.java
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/spi/webservices/WebservicesMetadataModelFactory.java
diff --git a/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/webservice/Bundle.properties b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/webservice/Bundle.properties
similarity index 100%
rename from j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/webservice/Bundle.properties
rename to enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/webservice/Bundle.properties
diff --git a/j2ee.dd.webservice/test/unit/data/wHandler/webservices.xml b/enterprise/j2ee.dd.webservice/test/unit/data/wHandler/webservices.xml
similarity index 100%
rename from j2ee.dd.webservice/test/unit/data/wHandler/webservices.xml
rename to enterprise/j2ee.dd.webservice/test/unit/data/wHandler/webservices.xml
diff --git a/j2ee.dd.webservice/test/unit/data/woHandler/webservices.xml b/enterprise/j2ee.dd.webservice/test/unit/data/woHandler/webservices.xml
similarity index 100%
rename from j2ee.dd.webservice/test/unit/data/woHandler/webservices.xml
rename to enterprise/j2ee.dd.webservice/test/unit/data/woHandler/webservices.xml
diff --git a/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProviderTest.java b/enterprise/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProviderTest.java
similarity index 100%
rename from j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProviderTest.java
rename to enterprise/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/api/webservices/DDProviderTest.java
diff --git a/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesMetadataModelTest.java b/enterprise/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesMetadataModelTest.java
similarity index 100%
rename from j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesMetadataModelTest.java
rename to enterprise/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesMetadataModelTest.java
diff --git a/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesTestCase.java b/enterprise/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesTestCase.java
similarity index 100%
rename from j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesTestCase.java
rename to enterprise/j2ee.dd.webservice/test/unit/src/org/netbeans/modules/j2ee/dd/impl/webservices/annotation/WebServicesTestCase.java
diff --git a/enterprise/j2ee.dd/apichanges.xml b/enterprise/j2ee.dd/apichanges.xml
new file mode 100644
index 0000000000..d117cc1a6e
--- /dev/null
+++ b/enterprise/j2ee.dd/apichanges.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+ <api name="compiler"/>
+ <summary>Some brief description here, can use <b>XHTML</b></summary>
+ <version major="1" minor="99"/>
+ <date day="13" month="6" year="2001"/>
+ <author login="jrhacker"/>
+ <compatibility addition="yes"/>
+ <description>
+ The main description of the change here.
+ Again can use full <b>XHTML</b> as needed.
+ </description>
+ <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+ <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+ <!-- First, a list of API names you may use: -->
+ <apidefs>
+ <apidef name="J2EEDDAPI">J2EE Deployment Descriptor API</apidef>
+ </apidefs>
+
+ <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+ <changes>
+
+ <change id="webDDApiAdded">
+ <api name="J2EEDDAPI"/>
+ <summary>Web Deployment Descriptor merged into this API.</summary>
+ <version major="1" minor="3"/>
+ <date day="12" month="1" year="2005"/>
+ <author login="pbuzek@netbeans.org"/>
+ <compatibility binary="incompatible" source="incompatible" semantic="incompatible" addition="yes" modification="yes"/>
+ <description>
+ <p>
+ The DD API for web.xml was added. Some classes were moved into common package.
+ </p>
+ </description>
+ <package name="org.netbeans.modules.j2ee.dd.api.web"/>
+ <package name="org.netbeans.modules.j2ee.dd.api.ejb"/>
+ <package name="org.netbeans.modules.j2ee.dd.api.application"/>
+ <package name="org.netbeans.modules.j2ee.dd.api.common"/>
+ <issue number="53320"/>
+ </change>
+ <change id="javaEE7DDVersionsAdded">
+ <api name="J2EEDDAPI"/>
+ <summary>Added deployment descriptors versions for the JavaEE7.</summary>
+ <version major="1" minor="29"/>
+ <date day="28" month="3" year="2013"/>
+ <author login="marfous@netbeans.org"/>
+ <compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible" modification="no" deprecation="no"/>
+ <description>
+ New DD versions of the ejb-jar.xml, web.xml, web-fragment.xml, application.xml, application-client.xml for JavaEE7 platform.
+ </description>
+ <class package="org.netbeans.modules.j2ee.dd.api.application" name="Application"/>
+ <class package="org.netbeans.modules.j2ee.dd.api.client" name="AppClient"/>
+ <class package="org.netbeans.modules.j2ee.dd.api.ejb" name="EjbJar"/>
+ <class package="org.netbeans.modules.j2ee.dd.api.web" name="WebApp"/>
+ <issue number="228033"/>
+ </change>
+
+ </changes>
+
+ <!-- Now the surrounding HTML text and document structure: -->
+
+ <htmlcontents>
+<!--
+
+ NO NO NO NO NO!
+
+ ==============> DO NOT EDIT ME! <==============
+
+ AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+ SEE j2ee/ddapi/arch/apichanges.xml
+
+-->
+ <head>
+ <title>Change History for the J2EE Deployment Descriptor API</title>
+ <link rel="stylesheet" href="prose.css" type="text/css"/>
+ </head>
+ <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the <a href="index.html">J2EE Deployment Descriptor API</a>.</p>
+
+<!-- The actual lists of changes, as summaries and details: -->
+ <hr/>
+ <standard-changelists module-code-name="org.netbeans.modules.j2ee.dd/1"/>
+
+ <hr/><p>@FOOTER@</p>
+
+ </body>
+ </htmlcontents>
+
+</apichanges>
diff --git a/enterprise/j2ee.dd/arch.xml b/enterprise/j2ee.dd/arch.xml
new file mode 100644
index 0000000000..e05a8d371e
--- /dev/null
+++ b/enterprise/j2ee.dd/arch.xml
@@ -0,0 +1,930 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.24"
+ author="milan.kuchtiak@sun.com,ludovic.champenois@sun.com,pavel.buzek@sun.com"
+>
+
+ &api-questions;
+
+<!--
+ <question id="arch-what" when="init" >
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+
+<answer id="arch-what">
+The project is based on the requirement to access all J2ee deployment descriptor files
+for other Netbeans modules in a simple and J2EE spec.-independant way. This module replaces
+the Web DD API (web/ddapi) module form the Web area.
+</answer>
+
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+<answer id="arch-overall">
+ <api
+ name="J2EEDDAPI"
+ type="export"
+ category="friend"
+ group="java"
+ url="index.html">
+The J2EE DD API is based on a bunch of interfaces based on the deployment descriptor xml structure. The names of interfaces correspond to the names of deployment descriptor elements in the J2EE DD files like ejb-jar.xml, web.xml or applicaiton.xml.
+The DD API interfaces are organized in a hierarchic tree structure and are accassible through the root (<b>Application</b>), (<b>WebApp</b>) or (<b>EjbJar</b>) interfaces.
+The implementation of DD API interfaces is hidden for clients. It is based on schema2beans infrastructure and is the DD version - specific.
+(there is always requirement to support at least two successive versions of DD specification).
+The implementation is located in <b>non-public</b> packages of <a href="index.html">j2ee/ddapi</a> module.
+It is expected that interfaces will not be implemented by the client.<br/>
+The root of the deployment descriptor is accessible through the <b>DDProvider</b> class.
+ </api>
+</answer>
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it at
+ what circumstances and what will be the typical code to write
+ to use the module.
+ </question>
+-->
+<answer id="arch-usecases">
+
+<usecase id="web-dd-1" name="J2EE Application" >
+J2EE Aplications often need to explore the included modules.
+Ejb modules are usually used as components of a J2EE application.
+Web modules are usually used as clients or front-end components of J2EE application.<br/>
+There is a requirement to be able to identify the sub-elements of web modules that are included to J2EE Application.
+For example, the J2EE Application need to be able to create a web module (<b>WEB client</b>),
+with the default web.xml file, then create a display-name and add a servlet element to deployment descriptor.
+Similarly, the J2EE Application need to be able to create an ejb module, with the default ejb-jar.xml file,
+then create a display-name and add an ejb element to deployment descriptor.
+</usecase>
+
+<usecase id="web-dd-2" name="Web Services Based on Servlet">
+ JAX-RPC Web Services based on servlet need to include specific elemens to deployment descriptor and map the service to a URL that specifies where the WSDL file can be found.<br/>
+ See the example (JWSDP1.2) :
+<pre>
+<code>
+<b><listener></b>
+ <b><listener-class></b>com.sun.xml.rpc.server.http.JAXRPCContextListener<b></listener-class></b>
+<b></listener></b>
+<b><servlet></b>
+ <b><servlet-name></b>Hello<b></servlet-name></b>
+ <b><display-name></b>Hello<b></display-name></b>
+ <b><description></b>JAX-RPC endpoint - Hello<b></description></b>
+ <b><servlet-class></b>com.sun.xml.rpc.server.http.JAXRPCServlet<b></servlet-class></b>
+ <b><load-on-startup></b>1<b></load-on-startup></b>
+<b></servlet></b>
+<b><servlet-mapping></b>
+ <b> <servlet-name></b>Hello<b></servlet-name></b>
+ <b><url-pattern>/</b>hello<b></url-pattern></b>
+<b></servlet-mapping></b>
+</code>
+</pre>
+</usecase>
+
+<usecase id="web-dd-3" name="Web Application Wizards">
+ There are several wizards that need to insert elements to DD regarding the type of the wizard.<br/>
+ Examples :
+ <ul>
+ <li><b>Web Module Wizard</b> - need to specify the web module <display-name> and <locale-encoding-mapping-list></li>
+ <li><b>Servlet Wizard</b> - need to specify the <servlet> and <servlet-mapping> elements</li>
+ <li><b>Listener Wizard</b> - need to specify the <listener> element</li>
+ <li><b>Filter Wizard</b> - need to specify the <filter> and <filter-mapping> elements</li>
+ </ul>
+ <p/>
+</usecase>
+
+<usecase id="web-dd-4" name="DD Editor">
+<p>
+ DD Editor significantly improves DD editing in the way that user doesn't need to know the syntax of
+ deployment descriptor file.
+ It is desirable for DD Editor module to work with DD API interfaces instead of
+ working with s2b beans directly (generated specifically for the particular version of DD).
+ This method was used in previous versions of IDE.
+</p>
+</usecase>
+
+<usecase id="web-dd-5" name="Other modules that need to modify the deployment descriptor">
+ This is the list of other possible clients of DD API :
+ <ul>
+ <li><b>RAVE</b></li>
+ <li><b>JATO module</b></li>
+ <li><b>STRUTS module</b></li>
+ </ul>
+An example of this is adding EJB reference to allow the module to call an EJB in another EJB module.
+<p/>
+</usecase>
+
+</answer>
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone the work should be
+ ready.
+ </hint>
+ </question>
+-->
+<answer id="arch-time">
+All the programming work is already done. It has been extensively reusing the same patterns as the equivalent module for Web DD APIs.
+J2EE 1.3 and 1.4 APIS are covered.
+</answer>
+<!--
+ <question id="arch-quality" when="init">
+ How the quality of your code will be tested and
+ how future regressions are going to be prevented?
+ <hint>
+ What kind of testing you want to use? What/how much area of functionality
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+<answer id="arch-quality">
+Web DD APIs have a set of unit tests. Application and EJB part is not covered.
+</answer>
+<!--
+ </category>
+ <category id="dep" name="Project and platform dependencies">
+ <question id="dep-nb" when="init" >
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported API using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+<answer id="dep-nb">
+ <defaultanswer generate='none' />
+It uses these API's:
+
+<ul>
+<li>
+ <api
+ name="FileSystems"
+ type="import"
+ group="java"
+ category="official"
+ url="@org-openide-filesystems@/overview-summary.html">
+ NetBeans Open APIs / FileSystems
+ </api>
+</li>
+<li>
+ <api
+ name="Loaders"
+ type="import"
+ category="official"
+ group="java"
+ url="@org-openide-loaders@/overview-summary.html">
+ NetBeans Open APIs / Loaders
+ </api>
+</li>
+<li>
+ <api
+ name="schema2beans"
+ type="import"
+ category="stable"
+ group="java"
+ url="">
+ Schema2beans infrastructure
+ </api>
+<b>Runtime dependency - the implementation part depends on this library. The implementation part is a part of j2ee/ddapis module (org.netbeans.modules.j2ee.dd.impl package).
+</b>
+</li>
+</ul>
+</answer>
+<!--
+ <question id="dep-non-nb" when="init" >
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+<answer id="dep-non-nb">
+<ul>
+ <li>
+ <api group="java" name="Xerces" type="import" category="third" url="">
+ for obtaining an xml parser able to validate against the XML schema (Crimson does not).<br/>
+ Used in <a href="org/netbeans/modules/j2ee/dd/api/web/DDProvider.html">DDProvider</a>.
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="web-app_2_2.dtd" type="import" url="http://java.sun.com/products/servlet/2.2/">
+ DTD for web.xml in Servlet API 2.2
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="web-app_2_3.dtd" type="import" url="http://java.sun.com/products/servlet/download.html">
+ DTD for web.xml in Servlet API 2.3
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="web-app_2_4.xsd" type="import" url="http://java.sun.com/products/servlet/download.html">
+ Schema for web.xml in Servlet API 2.4
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="appplication_1_3.dtd" type="import" url="http://java.sun.com/j2ee/download.html">
+ DTD for application.xml in J2EE 1.3
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="application_1_4.xsd" type="import" url="http://java.sun.com/j2ee/download.html">
+ Schema for application.xml in J2EE 1.4
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="ejb-jar_1_1.dtd" type="import" url="http://java.sun.com/products/ejb/docs.html">
+ DTD for ejb-jar.xml in EJB 1.1
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="ejb-jar_2_0.dtd" type="import" url="http://java.sun.com/products/ejb/docs.html">
+ DTD for ejb-jar.xml in EJB 2.0
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="ejb-jar_2_1.xsd" type="import" url="http://java.sun.com/products/ejb/docs.html">
+ Schema for ejb-jar.xml in EJB 2.1
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="j2ee_1_4.xsd" type="import" url="http://java.sun.com/j2ee/download.html">
+ Schema for deployment descriptors in J2EE 1.4
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="j2ee_web_services_client_1_1.xsd" type="import" url="">
+ Schema for wev services client 1.1.
+ </api>
+ </li>
+ <li>
+ <api group="dtd" category="standard" name="jsp_2_0.xsd" type="import" url="">
+ Schema for JSP 2.0.
+ </api>
+ </li>
+</ul>
+</answer>
+<!--
+ <question id="dep-platform" when="init" >
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+<answer id="dep-platform">
+100% pure Java. It should run anywhere.
+</answer>
+<!--
+ <question id="dep-jre" when="final" >
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+<answer id="dep-jre">
+<b>JRE 1.4</b> or <b>JRE 1.3</b> with <b>JAXP</b>
+</answer>
+<!--
+ <question id="dep-jrejdk" when="final" >
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+<answer id="dep-jrejdk">
+<b>JRE 1.4</b> or <b>JRE 1.3</b> with <b>JAXP</b>
+</answer>
+<!--
+ </category>
+ <category id="deploy" name="Deployment">
+ <question id="deploy-jar" when="impl" >
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+<answer id="deploy-jar">
+No other files are deployed.
+</answer>
+<!--
+ <question id="deploy-nbm" when="impl" >
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+<answer id="deploy-nbm">
+Yes
+</answer>
+<!--
+ <question id="deploy-shared" when="final" >
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+<answer id="deploy-shared">
+Anywhere.
+</answer>
+<!--
+ <question id="deploy-packages" when="init" >
+ Are packages of your module made inaccessible by not declaring them public?
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+<answer id="deploy-packages">
+Yes. Public packages of DD API module are specified in module manifest file :<br/><br/>
+<b>OpenIDE-Module-Public-Packages: org.netbeans.modules.j2ee.api.dd.**</b><br/>
+(the DDProvider class and interfaces for manipulation with ejb-jar.xml, web.xml or application.xml files)
+</answer>
+<answer id="deploy-dependencies">
+Nothing.
+</answer>
+<!--
+ </category>
+ <category id="compat" name="Compatibility with environment">
+ <question id="compat-i18n" when="impl" >
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+<answer id="compat-i18n">
+Yes.
+</answer>
+<!--
+ <question id="compat-standards" when="init" >
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+<answer id="compat-standards">
+The DD API implements the <b>Ejb 1.1</b>, <b>Ejb 2.0 </b>and <b>Ejb 2.0</b>, J2EE 1.3
+and 1.4 for Application specifications and <b>Servlet2.3</b> and <b>Servlert2.4</b> specification.
+It quietly supports the <b>Servlet2.2</b> but not checks the syntactical correctness of such web.xml files.
+The handling of different versions is supported by throwing the <b>VersionNotSupportedException</b>
+in case the specific version doesn't support the specific method.
+</answer>
+<!--
+ <question id="compat-version" when="impl" >
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+<answer id="compat-version">
+The DD API need do be flexible enough towards the future changes in J2EE specification. Nowadays DD API accepts both the DTD and XML schema files.
+It is expected that in future the XML schema for deployment descriptor will be changed.
+The DD API is prepared for changes that either break or not break the backward compatibility regarding the J2EE specification.<br/>
+It is expected that :
+<ul>
+<li>some interfaces/methods can be added for new versions</li>
+<li>some methods can turned to throw the VersionNotSupportedException in the future</li>
+</ul><br/>
+There is supossed that DD API will support at least 2 successive versions of XML schema for J2EE application deployment descriptor.<br/><br/>
+As implementation is supposed to be fully the part of j2ee/ddapi module, no problems with adding new interfaces/methods to the future versions of DD API are expected.<br/>
+ <b>This will be specified clearly in the API documentation</b>.
+</answer>
+<!--
+ </category>
+ <category id="resources" name="Access to resources">
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+<answer id="resources-file">
+No.
+</answer>
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+<answer id="resources-layer">
+No.
+</answer>
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+<answer id="resources-read">
+No.
+</answer>
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+ </category>
+-->
+<answer id="resources-mask">
+No.
+</answer>
+<!--
+ <category id="lookup" name="Lookup of components">
+ <question id="lookup-lookup" when="init" >
+ Does your module use <code>org.openide.util.Lookup</code>
+ to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract.
+ </hint>
+ </question>
+-->
+<answer id="lookup-lookup">
+No.
+</answer>
+<!--
+ <question id="lookup-register" when="final" >
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+<answer id="lookup-register">
+No.
+</answer>
+<!--
+ <question id="lookup-remove" when="final" >
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+<answer id="lookup-remove">
+No.
+</answer>
+<!--
+ </category>
+-->
+ <!-- classification of interfaces -->
+ <!-- package names -->
+<!--
+ <category id="exec" name="Execution Environment">
+ <question id="exec-property" when="impl" >
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+<answer id="exec-property">
+No.
+</answer>
+<!--
+ <question id="exec-component" when="impl" >
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+<answer id="exec-component">
+No.
+</answer>
+<!--
+ <question id="exec-classloader" when="impl" >
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+<answer id="exec-classloader">
+No.
+</answer>
+<!--
+ <question id="exec-reflection" when="impl" >
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+<answer id="exec-reflection">
+Not directly. The implementation part of DD API uses the reflection when implementing the :
+<ul>
+ <li><b>public CommonDDBean findBeanByName(String beanName, String propertyName, String value);</b> method</li>
+</ul>
+</answer>
+<!--
+ <question id="exec-privateaccess" when="final" >
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+<answer id="exec-privateaccess">
+No.
+</answer>
+<!--
+ <question id="exec-process" when="impl" >
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+<answer id="exec-process">
+No.
+</answer>
+<!--
+ <question id="exec-introspection" when="impl" >
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+<answer id="exec-introspection">
+Not directly. The implementation of DD API uses the introspection in :
+<ul>
+ <li><b>public CommonDDBean createBean(String beanName) throws ClassNotFoundException;</b> method</li>
+</ul>
+</answer>
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+<answer id="exec-threading">
+No.
+</answer>
+<!--
+ </category>
+ <category id="format" name="Format of files and protocols">
+ <question id="format-types" when="impl" >
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+<answer id="format-types">
+XML format specified by both DTD and XML schema.
+</answer>
+<!--
+ <question id="format-dnd" when="impl" >
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+<answer id="format-dnd">
+Not applied.
+</answer>
+<!--
+ <question id="format-clipboard" when="impl" >
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+<answer id="format-clipboard">
+Not applied.
+</answer>
+<!--
+ </category>
+ <category id="performance" name="Performance and Scalability">
+ <question id="perf-startup" when="final" >
+ Does your module run any code on startup?
+ </question>
+-->
+<answer id="perf-startup">
+No.
+</answer>
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+<answer id="perf-exit">
+No.
+</answer>
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+<answer id="perf-scale">
+The size of ejb-jar.xml or application.xml files, the performance of schema2beans module :
+<ul>
+ <li> bean graph generating (marshaling)</li>
+ <li> bean graph merging</li>
+ <li> bean graph writing (unmarshaling)</li>
+</ul>
+The reading/parsing and writing the web.xml is the bottleneck of the DD API performance. Than the schema2beans root object is <b>weakly</b> cached in memmory.
+However, those operations have no visible impact while working with web modules with standard-sized deployment descriptors.<br/>
+The measurements were not provided for DD API specifically, but there may have been some measurements made in <a href="http://schema2beans.netbeans.org">schema2beans infrastructure</a> that is used for DD API implementation. There should be no additional deficites added by DD API.
+</answer>
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+<answer id="perf-limit">
+Not aware of any.
+</answer>
+ <!-- multithreading -->
+<!--
+ <question id="perf-mem" when="final" >
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+<answer id="perf-mem">
+?
+</answer>
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+<answer id="perf-wakeupp">
+No.
+</answer>
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+<answer id="perf-progress">
+No.
+</answer>
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+<answer id="perf-huge_dialogs">
+No.
+</answer>
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+<answer id="perf-menus">
+No.
+</answer>
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce, that it will behave correctly and fast and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+<answer id="perf-spi">
+The DD API has no SPI part.<br/>
+Though the DD API consists of a set of interfaces, <b>the implementation part is supposed to be writen only by DD API owners</b>.<br/>
+There is no support for plug-in a new implementation.<br/>
+ <b>This will be specified clearly in the API documentation</b>.
+</answer>
+<!--
+ </category>
+-->
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ No.
+ </p>
+ </answer>
+
+</api-answers>
+<!-- Copy this above the </api-answers> tag! -->
diff --git a/enterprise/j2ee.dd/build.xml b/enterprise/j2ee.dd/build.xml
new file mode 100644
index 0000000000..f2823bed1d
--- /dev/null
+++ b/enterprise/j2ee.dd/build.xml
@@ -0,0 +1,809 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<project basedir="." default="build" name="enterprise/j2ee.dd">
+
+ <import file="../../nbbuild/templates/projectized.xml"/>
+
+ <property name="s2b_root_web_2_4" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_2_4"/>
+ <property name="s2b_root_web_2_5" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_2_5"/>
+ <property name="s2b_root_web_3_0" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0"/>
+ <property name="s2b_root_web_3_1" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1"/>
+ <property name="s2b_root_web_3_0_frag" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag"/>
+ <property name="s2b_root_web_3_1_frag" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag"/>
+ <property name="s2b_root_2_1" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_2_1"/>
+ <property name="s2b_root_3_0" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_0"/>
+ <property name="s2b_root_3_1" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_1"/>
+ <property name="s2b_root_3_2" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_2"/>
+ <property name="s2b_root_app_1_4" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_1_4"/>
+ <property name="s2b_root_app_5" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_5"/>
+ <property name="s2b_root_app_6" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_6"/>
+ <property name="s2b_root_app_7" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_7"/>
+ <property name="s2b_res_root" location="src/org/netbeans/modules/j2ee/dd/impl/resources"/>
+ <property name="s2b_root_client_1_4" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4"/>
+ <property name="s2b_root_client_5_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0"/>
+ <property name="s2b_root_client_6_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0"/>
+ <property name="s2b_root_client_7_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0"/>
+ <property name="j2ee.dd.resources.dir" value="src/org/netbeans/modules/j2ee/dd/impl/"/>
+
+ <target name="build-init" depends="projectized.build-init">
+ <unzip src="external/j2ee.dd-w3c-resources.zip" dest="${j2ee.dd.resources.dir}"/>
+ <unzip src="external/j2ee.dd-glassfish-resources.zip" dest="${j2ee.dd.resources.dir}"/>
+ </target>
+
+ <target name="s2binit" depends="build-init">
+ <!-- XXX do not know how to replace with @Schema2Beans; see issue #178426 for discussion -->
+ <taskdef name="schema2beans" classname="org.netbeans.modules.s2banttask.Schema2BeansAntTask">
+ <classpath>
+ <pathelement path="${netbeans.dest.dir}/ide/modules/org-netbeans-modules-schema2beans.jar" />
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="dd2beansgen" depends="s2binit">
+ <echo message="generating code generation input file information" />
+
+ <schema2beans schema="${s2b_res_root}/web-app_2_4.xsd"
+ mddFile="${s2b_res_root}/web-app_2_4.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_2_4"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_2_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_2_4;</echo>
+ <schema2beans schema="${s2b_res_root}/web-app_2_5.xsd"
+ mddFile="${s2b_res_root}/web-app_2_5.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_2_5"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_2_5}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_2_5;</echo>
+ <schema2beans schema="${s2b_res_root}/web-app_3_0.xsd"
+ mddFile="${s2b_res_root}/web-app_3_0.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_3_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_3_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_0;</echo>
+ <schema2beans schema="${s2b_res_root}/web-fragment_3_0.xsd"
+ mddFile="${s2b_res_root}/web-fragment_3_0.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_3_0_frag"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_3_0_frag}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_0_frag;</echo>
+ <schema2beans schema="${s2b_res_root}/web-app_3_1.xsd"
+ mddFile="${s2b_res_root}/web-app_3_1.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_3_1"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_3_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_1;</echo>
+ <schema2beans schema="${s2b_res_root}/web-fragment_3_1.xsd"
+ mddFile="${s2b_res_root}/web-fragment_3_1.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_3_1_frag"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_3_1_frag}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_3_1_frag;</echo>
+
+ <replace file="${s2b_root_web_2_4}/WebApp.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_2_5}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_2_5}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_2_5}/WebApp.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_2_5}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_2_5}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_2_5}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_2_5}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_0}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0}/WebApp.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_0}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_0_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_1}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1}/WebApp.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_1}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_1_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_3_1_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_3_1_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_0_frag}/WebFragment.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1}/WebApp.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+<replace file="${s2b_root_web_3_1_frag}/WebFragment.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+
+ <schema2beans schema="${s2b_res_root}/ejb-jar_2_1.xsd"
+ mddFile="${s2b_res_root}/ejb-jar_2_1.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.ejb.model_2_1"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_2_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_2_1;</echo>
+ <schema2beans schema="${s2b_res_root}/ejb-jar_3_0.xsd"
+ mddFile="${s2b_res_root}/ejb-jar_3_0.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.ejb.model_3_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_3_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_0;</echo>
+ <schema2beans schema="${s2b_res_root}/ejb-jar_3_1.xsd"
+ mddFile="${s2b_res_root}/ejb-jar_3_1.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.ejb.model_3_1"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_3_1}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_1;</echo>
+ <schema2beans schema="${s2b_res_root}/ejb-jar_3_2.xsd"
+ mddFile="${s2b_res_root}/ejb-jar_3_2.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.ejb.model_3_2"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_3_2}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_2;</echo>
+ <replace file="${s2b_root_3_1}/EjbJar.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_1}/EjbJar.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_1}/EjbJar.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_1}/EjbJar.java" summary="true">
+ <replacetoken>setVersion("3.1");</replacetoken>
+ <replacevalue>setVersionString("3.1");</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbJar.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbJar.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbJar.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbJar.java" summary="true">
+ <replacetoken>setVersion("3.2");</replacetoken>
+ <replacevalue>setVersionString("3.2");</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbRelation.java" summary="true">
+ <replacetoken>setEjbRelationshipRole(org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole[] value)</replacetoken>
+ <replacevalue>setEjbRelationshipRole(org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole value)</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbRelation.java" summary="true">
+ <replacetoken>this.setValue(EJB_RELATIONSHIP_ROLE, value);</replacetoken>
+ <replacevalue>this.setValue(EJB_RELATIONSHIP_ROLE, 0, value);</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbRelation.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole[] getEjbRelationshipRole()</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole getEjbRelationshipRole()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_3_2}/EjbRelation.java" summary="true">
+ <replacetoken>return (EjbRelationshipRole[])this.getValues(EJB_RELATIONSHIP_ROLE)</replacetoken>
+ <replacevalue>return (EjbRelationshipRole)this.getValue(EJB_RELATIONSHIP_ROLE, 0)</replacevalue>
+ </replace>
+ <schema2beans schema="${s2b_res_root}/application_1_4.xsd"
+ mddFile="${s2b_res_root}/application_1_4.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.application.model_1_4"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_app_1_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_1_4;</echo>
+ <schema2beans schema="${s2b_res_root}/application_5.xsd"
+ mddFile="${s2b_res_root}/application_5.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.application.model_5"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_app_5}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_5;</echo>
+ <schema2beans schema="${s2b_res_root}/application_6.xsd"
+ mddFile="${s2b_res_root}/application_6.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.application.model_6"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_app_6}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_6;</echo>
+ <schema2beans schema="${s2b_res_root}/application_7.xsd"
+ mddFile="${s2b_res_root}/application_7.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.application.model_7"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_app_7}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_7;</echo>
+ <replace file="${s2b_root_app_6}/Application.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_6}/Application.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_6}/Application.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_6}/Application.java" summary="true">
+ <replacetoken>setVersion("6");</replacetoken>
+ <replacevalue>setVersionString("6");</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_7}/Application.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_7}/Application.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_7}/Application.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_7}/Application.java" summary="true">
+ <replacetoken>setVersion("7");</replacetoken>
+ <replacevalue>setVersionString("7");</replacevalue>
+ </replace>
+ <schema2beans schema="${s2b_res_root}/application-client_1_4.xsd"
+ mddFile="${s2b_res_root}/application-client_1_4.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.client.model_1_4"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_client_1_4}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_1_4;</echo>
+ <schema2beans schema="${s2b_res_root}/application-client_5.xsd"
+ mddFile="${s2b_res_root}/application-client_5.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.client.model_5_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_client_5_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_5_0;</echo>
+ <schema2beans schema="${s2b_res_root}/application-client_6.xsd"
+ mddFile="${s2b_res_root}/application-client_6.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.client.model_6_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_client_6_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_6_0;</echo>
+ <schema2beans schema="${s2b_res_root}/application-client_7.xsd"
+ mddFile="${s2b_res_root}/application-client_7.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.client.model_7_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_client_7_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_7_0;</echo>
+ <replace file="${s2b_root_client_6_0}/ApplicationClient.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_6_0}/ApplicationClient.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_6_0}/ApplicationClient.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_6_0}/ApplicationClient.java" summary="true">
+ <replacetoken>setVersion("6");</replacetoken>
+ <replacevalue>setVersionString("6");</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_7_0}/ApplicationClient.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_7_0}/ApplicationClient.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_7_0}/ApplicationClient.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_7_0}/ApplicationClient.java" summary="true">
+ <replacetoken>setVersion("7");</replacetoken>
+ <replacevalue>setVersionString("7");</replacevalue>
+ </replace>
+ </target>
+
+ <target name="compile" depends="dd2beansgen,projectized-common.compile"/>
+
+ <target name="clean" depends="projectized-common.clean,clean-ddgen-src"/>
+
+ <target name="clean-ddgen-src">
+ <mkdir dir="${s2b_root_web_2_4}"/>
+ <mkdir dir="${s2b_root_web_2_5}"/>
+ <mkdir dir="${s2b_root_web_3_0}"/>
+ <mkdir dir="${s2b_root_web_3_0_frag}"/>
+ <mkdir dir="${s2b_root_web_3_1}"/>
+ <mkdir dir="${s2b_root_web_3_1_frag}"/>
+ <mkdir dir="${s2b_root_2_1}"/>
+ <mkdir dir="${s2b_root_3_0}"/>
+ <mkdir dir="${s2b_root_3_1}"/>
+ <mkdir dir="${s2b_root_3_2}"/>
+ <mkdir dir="${s2b_root_app_1_4}"/>
+ <mkdir dir="${s2b_root_app_5}"/>
+ <mkdir dir="${s2b_root_app_6}"/>
+ <mkdir dir="${s2b_root_app_7}"/>
+ <mkdir dir="${s2b_root_client_1_4}"/>
+ <mkdir dir="${s2b_root_client_5_0}"/>
+ <mkdir dir="${s2b_root_client_6_0}"/>
+ <mkdir dir="${s2b_root_client_7_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_2_4}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_2_4}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_2_5}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_2_5}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_3_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_3_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_3_0_frag}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_3_0_frag}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_3_1}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_3_1}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_3_1_frag}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_3_1_frag}"/>
+ <delete>
+ <fileset dir="${s2b_root_2_1}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_2_1}"/>
+ <delete>
+ <fileset dir="${s2b_root_3_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_3_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_3_1}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_3_1}"/>
+ <delete>
+ <fileset dir="${s2b_root_3_2}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_3_2}"/>
+ <delete>
+ <fileset dir="${s2b_root_app_1_4}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_app_1_4}"/>
+ <delete>
+ <fileset dir="${s2b_root_app_5}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_app_5}"/>
+ <delete>
+ <fileset dir="${s2b_root_app_6}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_app_6}"/>
+ <delete>
+ <fileset dir="${s2b_root_app_7}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_app_7}"/>
+ <delete>
+ <fileset dir="${s2b_root_client_1_4}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_client_1_4}"/>
+ <delete>
+ <fileset dir="${s2b_root_client_5_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_client_5_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_client_6_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_client_6_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_client_7_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_client_7_0}"/>
+ </target>
+
+ <target name="javadoc" depends="init-javadoc, projectized.javadoc"/>
+
+ <target name="init-javadoc">
+ <mkdir dir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
+ <copy file="doc/ddapi_architecture.html" todir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
+ <copy file="doc/dd_api_schema.jpg" todir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
+ <copy file="doc/usage.html" todir="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-dd/arch"/>
+ </target>
+
+</project>
diff --git a/j2ee.dd/doc/dd_api_schema.jpg b/enterprise/j2ee.dd/doc/dd_api_schema.jpg
similarity index 100%
rename from j2ee.dd/doc/dd_api_schema.jpg
rename to enterprise/j2ee.dd/doc/dd_api_schema.jpg
diff --git a/j2ee.dd/doc/ddapi_architecture.html b/enterprise/j2ee.dd/doc/ddapi_architecture.html
similarity index 100%
rename from j2ee.dd/doc/ddapi_architecture.html
rename to enterprise/j2ee.dd/doc/ddapi_architecture.html
diff --git a/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/application/package.html b/enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/application/package.html
similarity index 100%
rename from j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/application/package.html
rename to enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/application/package.html
diff --git a/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/common/package.html b/enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/common/package.html
similarity index 100%
rename from j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/common/package.html
rename to enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/common/package.html
diff --git a/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/ejb/package.html b/enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/ejb/package.html
similarity index 100%
rename from j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/ejb/package.html
rename to enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/ejb/package.html
diff --git a/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/web/package.html b/enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/web/package.html
similarity index 100%
rename from j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/web/package.html
rename to enterprise/j2ee.dd/doc/org/netbeans/modules/j2ee/dd/api/web/package.html
diff --git a/j2ee.dd/doc/overview.html b/enterprise/j2ee.dd/doc/overview.html
similarity index 100%
rename from j2ee.dd/doc/overview.html
rename to enterprise/j2ee.dd/doc/overview.html
diff --git a/j2ee.dd/doc/usage.html b/enterprise/j2ee.dd/doc/usage.html
similarity index 100%
rename from j2ee.dd/doc/usage.html
rename to enterprise/j2ee.dd/doc/usage.html
diff --git a/j2ee.dd/external/binaries-list b/enterprise/j2ee.dd/external/binaries-list
similarity index 100%
rename from j2ee.dd/external/binaries-list
rename to enterprise/j2ee.dd/external/binaries-list
diff --git a/j2ee.dd/external/glassfish-license.txt b/enterprise/j2ee.dd/external/glassfish-license.txt
similarity index 100%
rename from j2ee.dd/external/glassfish-license.txt
rename to enterprise/j2ee.dd/external/glassfish-license.txt
diff --git a/j2ee.dd/external/javaee-api-5-license.txt b/enterprise/j2ee.dd/external/javaee-api-5-license.txt
similarity index 100%
rename from j2ee.dd/external/javaee-api-5-license.txt
rename to enterprise/j2ee.dd/external/javaee-api-5-license.txt
diff --git a/j2ee.dd/external/w3c-license.txt b/enterprise/j2ee.dd/external/w3c-license.txt
similarity index 100%
rename from j2ee.dd/external/w3c-license.txt
rename to enterprise/j2ee.dd/external/w3c-license.txt
diff --git a/j2ee.dd/manifest.mf b/enterprise/j2ee.dd/manifest.mf
similarity index 100%
rename from j2ee.dd/manifest.mf
rename to enterprise/j2ee.dd/manifest.mf
diff --git a/enterprise/j2ee.dd/nbproject/project.properties b/enterprise/j2ee.dd/nbproject/project.properties
new file mode 100644
index 0000000000..eb3daf9550
--- /dev/null
+++ b/enterprise/j2ee.dd/nbproject/project.properties
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+javac.source=1.6
+javac.fork=true
+spec.version.base=1.44.0
+is.autoload=true
+
+javadoc.arch=${basedir}/arch.xml
+javadoc.overview=${basedir}/doc/overview.html
+javadoc.docfiles=${basedir}/doc
+javadoc.apichanges=${basedir}/apichanges.xml
+
+#test-unit-sys-prop.test.data.dir=${nb_all}/j2ee/ddapi/test/unit/data
+test-unit-sys-prop.test.bridge.jar=${o.apache.tools.ant.module.dir}/ant/nblib/bridge.jar
+test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant
+test.unit.run.cp.extra=${tools.jar}
+test.unit.cp.extra=${nb_all}/enterprise/j2ee.dd/external/javaee-api-5.jar
+requires.nb.javac=true
+
+test.config.stableBTD.includes=**/*Test.class
+test.config.stableBTD.excludes=\
+ **/impl/common/annotation/*,\
+ **/AppClientImplTest.class,\
+ **/DDApiTest.class,\
+ **/InvalidStatesTest.class,\
+ **/SessionImplTest.class
diff --git a/j2ee.dd/nbproject/project.xml b/enterprise/j2ee.dd/nbproject/project.xml
similarity index 100%
rename from j2ee.dd/nbproject/project.xml
rename to enterprise/j2ee.dd/nbproject/project.xml
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/ApplicationMetadata.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/ApplicationMetadata.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/ApplicationMetadata.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/ApplicationMetadata.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Module.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Module.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Module.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Module.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Web.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Web.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Web.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Web.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClientMetadata.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClientMetadata.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClientMetadata.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClientMetadata.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/DDProvider.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CommonDDBean.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CommonDDBean.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CommonDDBean.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CommonDDBean.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ComponentInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ComponentInterface.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ComponentInterface.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ComponentInterface.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CreateCapability.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CreateCapability.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CreateCapability.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/CreateCapability.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbLocalRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbLocalRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbLocalRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbLocalRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EjbRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EnvEntry.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EnvEntry.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EnvEntry.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/EnvEntry.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/FindCapability.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/FindCapability.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/FindCapability.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/FindCapability.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Icon.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Icon.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Icon.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/Icon.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/IconInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/IconInterface.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/IconInterface.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/IconInterface.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InitParam.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InitParam.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InitParam.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InitParam.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionComplete.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionComplete.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionComplete.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionComplete.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionTarget.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionTarget.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionTarget.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/InjectionTarget.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestination.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestination.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestination.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestination.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestinationRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestinationRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestinationRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/MessageDestinationRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/NameAlreadyUsedException.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/NameAlreadyUsedException.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/NameAlreadyUsedException.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/NameAlreadyUsedException.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/PortComponentRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/PortComponentRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/PortComponentRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/PortComponentRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceEnvRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceEnvRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceEnvRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceEnvRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ResourceRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RootInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RootInterface.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RootInterface.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RootInterface.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RunAs.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RunAs.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RunAs.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/RunAs.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRole.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRole.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRole.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRole.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRoleRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRoleRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRoleRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/SecurityRoleRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandler.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandler.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandler.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandler.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChain.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChain.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChain.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChain.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChains.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChains.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChains.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/ServiceRefHandlerChains.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/VersionNotSupportedException.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/VersionNotSupportedException.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/VersionNotSupportedException.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/VersionNotSupportedException.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfig.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfig.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfig.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfig.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfigProperty.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfigProperty.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfigProperty.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ActivationConfigProperty.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ApplicationException.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ApplicationException.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ApplicationException.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ApplicationException.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AroundInvoke.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AroundInvoke.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AroundInvoke.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AroundInvoke.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AssemblyDescriptor.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AssemblyDescriptor.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AssemblyDescriptor.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/AssemblyDescriptor.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmpField.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmpField.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmpField.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmpField.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmrField.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmrField.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmrField.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/CmrField.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ContainerTransaction.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ContainerTransaction.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ContainerTransaction.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ContainerTransaction.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Ejb.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Ejb.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Ejb.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Ejb.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJar.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJar.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJar.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJar.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJarMetadata.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJarMetadata.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJarMetadata.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbJarMetadata.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelation.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelation.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelation.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelation.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelationshipRole.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelationshipRole.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelationshipRole.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EjbRelationshipRole.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EnterpriseBeans.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EnterpriseBeans.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EnterpriseBeans.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EnterpriseBeans.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Entity.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Entity.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Entity.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Entity.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EntityAndSession.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EntityAndSession.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EntityAndSession.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/EntityAndSession.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ExcludeList.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ExcludeList.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ExcludeList.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/ExcludeList.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InitMethod.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InitMethod.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InitMethod.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InitMethod.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptor.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptor.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptor.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptor.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorBinding.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorBinding.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorBinding.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorBinding.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorOrder.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorOrder.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorOrder.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/InterceptorOrder.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptors.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptors.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptors.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Interceptors.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/LifecycleCallback.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/LifecycleCallback.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/LifecycleCallback.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/LifecycleCallback.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MessageDriven.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MessageDriven.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MessageDriven.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MessageDriven.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Method.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Method.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Method.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Method.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodParams.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodParams.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodParams.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodParams.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodPermission.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodPermission.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodPermission.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/MethodPermission.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/NamedMethod.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/NamedMethod.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/NamedMethod.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/NamedMethod.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceContextRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceContextRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceContextRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceContextRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceUnitRef.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceUnitRef.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceUnitRef.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/PersistenceUnitRef.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Property.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Property.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Property.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Property.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Query.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Query.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Query.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Query.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/QueryMethod.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/QueryMethod.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/QueryMethod.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/QueryMethod.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RelationshipRoleSource.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RelationshipRoleSource.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RelationshipRoleSource.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RelationshipRoleSource.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Relationships.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Relationships.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Relationships.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Relationships.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RemoveMethod.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RemoveMethod.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RemoveMethod.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/RemoveMethod.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/SecurityIdentity.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/SecurityIdentity.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/SecurityIdentity.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/SecurityIdentity.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Session.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Session.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Session.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/Session.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AbsoluteOrdering.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AbsoluteOrdering.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AbsoluteOrdering.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AbsoluteOrdering.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AuthConstraint.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AuthConstraint.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AuthConstraint.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/AuthConstraint.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/DDProvider.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ErrorPage.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ErrorPage.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ErrorPage.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ErrorPage.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Filter.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Filter.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Filter.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Filter.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FilterMapping.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FilterMapping.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FilterMapping.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FilterMapping.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FormLoginConfig.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FormLoginConfig.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FormLoginConfig.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/FormLoginConfig.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspConfig.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspConfig.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspConfig.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspConfig.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspPropertyGroup.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspPropertyGroup.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspPropertyGroup.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/JspPropertyGroup.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Listener.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Listener.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Listener.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Listener.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMapping.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMapping.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMapping.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMapping.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMappingList.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMappingList.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMappingList.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LocaleEncodingMappingList.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LoginConfig.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LoginConfig.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LoginConfig.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/LoginConfig.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/MimeMapping.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/MimeMapping.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/MimeMapping.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/MimeMapping.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrdering.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrdering.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrdering.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrdering.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingItems.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingItems.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingItems.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingItems.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingOthersItem.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingOthersItem.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingOthersItem.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/RelativeOrderingOthersItem.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SecurityConstraint.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SecurityConstraint.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SecurityConstraint.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SecurityConstraint.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Servlet.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Servlet.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Servlet.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Servlet.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping25.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping25.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping25.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/ServletMapping25.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SessionConfig.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SessionConfig.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SessionConfig.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/SessionConfig.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Taglib.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Taglib.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Taglib.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/Taglib.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/UserDataConstraint.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/UserDataConstraint.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/UserDataConstraint.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/UserDataConstraint.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebAppMetadata.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebAppMetadata.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebAppMetadata.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebAppMetadata.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebResourceCollection.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebResourceCollection.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebResourceCollection.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebResourceCollection.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WelcomeFileList.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WelcomeFileList.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WelcomeFileList.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WelcomeFileList.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/FilterInfo.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/FilterInfo.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/FilterInfo.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/FilterInfo.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/ServletInfo.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/ServletInfo.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/ServletInfo.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/model/ServletInfo.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/ClientParseUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/ClientParseUtils.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/ClientParseUtils.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/ClientParseUtils.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataModelImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataModelImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataModelImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientMetadataModelImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/CommonDDAccess.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/CommonDDAccess.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/CommonDDAccess.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/CommonDDAccess.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Comparator.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Comparator.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Comparator.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/Comparator.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanSingle.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanSingle.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanSingle.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanSingle.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDProviderDataObject.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDProviderDataObject.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDProviderDataObject.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDProviderDataObject.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanMultiple.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanMultiple.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanMultiple.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanMultiple.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanSingle.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanSingle.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanSingle.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DescriptionBeanSingle.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/GetAllEjbs.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/GetAllEjbs.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/GetAllEjbs.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/GetAllEjbs.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/KeyBean.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/KeyBean.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/KeyBean.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/KeyBean.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelper.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelper.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelper.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelper.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbLocalRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbLocalRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbLocalRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbLocalRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelper.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelper.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelper.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelper.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EnvEntryImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EnvEntryImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EnvEntryImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EnvEntryImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/MessageDestinationRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/MessageDestinationRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/MessageDestinationRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/MessageDestinationRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/PortComponentRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/PortComponentRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/PortComponentRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/PortComponentRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceEnvRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceEnvRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceEnvRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceEnvRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SecurityRoleImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SecurityRoleImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SecurityRoleImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SecurityRoleImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ServiceRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ServiceRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ServiceRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ServiceRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SimpleResourceRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SimpleResourceRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SimpleResourceRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/SimpleResourceRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigPropertyImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigPropertyImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigPropertyImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ActivationConfigPropertyImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ApplicationExceptionImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ApplicationExceptionImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ApplicationExceptionImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ApplicationExceptionImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AroundInvokeImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AroundInvokeImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AroundInvokeImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AroundInvokeImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AssemblyDescriptorImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AssemblyDescriptorImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AssemblyDescriptorImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/AssemblyDescriptorImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmpFieldImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmpFieldImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmpFieldImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmpFieldImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmrFieldImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmrFieldImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmrFieldImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/CmrFieldImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ContainerTransactionImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ContainerTransactionImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ContainerTransactionImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ContainerTransactionImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationshipRoleImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationshipRoleImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationshipRoleImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbRelationshipRoleImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EntityImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EntityImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EntityImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EntityImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ExcludeListImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ExcludeListImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ExcludeListImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/ExcludeListImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InitMethodImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InitMethodImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InitMethodImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InitMethodImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorBinding.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorBinding.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorBinding.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorBinding.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorOrderImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorOrderImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorOrderImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorOrderImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorsImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorsImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorsImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/InterceptorsImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/LifecycleCallbackImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/LifecycleCallbackImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/LifecycleCallbackImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/LifecycleCallbackImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodParamsImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodParamsImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodParamsImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodParamsImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodPermissionImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodPermissionImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodPermissionImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MethodPermissionImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/NamedMethodImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/NamedMethodImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/NamedMethodImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/NamedMethodImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceContextRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceContextRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceContextRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceContextRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceUnitRefImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceUnitRefImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceUnitRefImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PersistenceUnitRefImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PropertyImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PropertyImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PropertyImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/PropertyImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryMethodImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryMethodImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryMethodImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/QueryMethodImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipRoleSourceImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipRoleSourceImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipRoleSourceImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipRoleSourceImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipsImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipsImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipsImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RelationshipsImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RemoveMethodImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RemoveMethodImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RemoveMethodImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/RemoveMethodImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SecurityIdentityImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SecurityIdentityImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SecurityIdentityImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SecurityIdentityImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/Bundle.properties b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/Bundle.properties
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/Bundle.properties
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/Bundle.properties
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebParseUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebParseUtils.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebParseUtils.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebParseUtils.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/Refreshable.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/Refreshable.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/Refreshable.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/Refreshable.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/SecurityRoles.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/SecurityRoles.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/SecurityRoles.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/SecurityRoles.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebFilter.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebFilter.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebFilter.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebFilter.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebServlet.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebServlet.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebServlet.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebServlet.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/FilterInfoAccessor.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/FilterInfoAccessor.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/FilterInfoAccessor.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/FilterInfoAccessor.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngine.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngine.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngine.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngine.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/MergeEngines.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/ServletInfoAccessor.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/ServletInfoAccessor.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/ServletInfoAccessor.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/ServletInfoAccessor.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataModelImpl.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataModelImpl.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataModelImpl.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataModelImpl.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/MetadataUnit.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/MetadataUnit.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/MetadataUnit.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/MetadataUnit.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/client/AppClientMetadataModelFactory.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/client/AppClientMetadataModelFactory.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/client/AppClientMetadataModelFactory.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/client/AppClientMetadataModelFactory.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/ejb/EjbJarMetadataModelFactory.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/ejb/EjbJarMetadataModelFactory.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/ejb/EjbJarMetadataModelFactory.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/ejb/EjbJarMetadataModelFactory.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/web/WebAppMetadataModelFactory.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/web/WebAppMetadataModelFactory.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/web/WebAppMetadataModelFactory.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/spi/web/WebAppMetadataModelFactory.java
diff --git a/j2ee.dd/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtils.java
similarity index 100%
rename from j2ee.dd/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtils.java
rename to enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtils.java
diff --git a/j2ee.dd/test/unit/data/fragments-test1/web-fragmentA.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentA.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/web-fragmentA.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentA.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/web-fragmentB.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentB.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/web-fragmentB.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentB.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/web-fragmentC.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentC.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/web-fragmentC.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentC.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/web-fragmentD.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentD.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/web-fragmentD.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentD.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/web-fragmentE.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentE.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/web-fragmentE.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentE.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/web-fragmentF.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentF.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/web-fragmentF.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/web-fragmentF.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/webA.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/webA.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/webA.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/webA.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test1/webB.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test1/webB.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test1/webB.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test1/webB.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/web-fragmentA.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentA.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/web-fragmentA.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentA.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/web-fragmentB.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentB.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/web-fragmentB.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentB.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/web-fragmentC.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentC.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/web-fragmentC.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentC.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/web-fragmentD.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentD.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/web-fragmentD.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentD.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/web-fragmentE.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentE.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/web-fragmentE.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentE.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/web-fragmentF.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentF.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/web-fragmentF.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/web-fragmentF.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/webA.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/webA.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/webA.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/webA.xml
diff --git a/j2ee.dd/test/unit/data/fragments-test2/webB.xml b/enterprise/j2ee.dd/test/unit/data/fragments-test2/webB.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/fragments-test2/webB.xml
rename to enterprise/j2ee.dd/test/unit/data/fragments-test2/webB.xml
diff --git a/j2ee.dd/test/unit/data/invalid/web_org.xml b/enterprise/j2ee.dd/test/unit/data/invalid/web_org.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/invalid/web_org.xml
rename to enterprise/j2ee.dd/test/unit/data/invalid/web_org.xml
diff --git a/j2ee.dd/test/unit/data/invalid/web_parsable.xml b/enterprise/j2ee.dd/test/unit/data/invalid/web_parsable.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/invalid/web_parsable.xml
rename to enterprise/j2ee.dd/test/unit/data/invalid/web_parsable.xml
diff --git a/j2ee.dd/test/unit/data/web.pass b/enterprise/j2ee.dd/test/unit/data/web.pass
similarity index 100%
rename from j2ee.dd/test/unit/data/web.pass
rename to enterprise/j2ee.dd/test/unit/data/web.pass
diff --git a/j2ee.dd/test/unit/data/web_org.xml b/enterprise/j2ee.dd/test/unit/data/web_org.xml
similarity index 100%
rename from j2ee.dd/test/unit/data/web_org.xml
rename to enterprise/j2ee.dd/test/unit/data/web_org.xml
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/DDApiTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/InvalidStatesTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/InvalidStatesTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/InvalidStatesTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/api/web/InvalidStatesTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImplTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImplTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImplTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/client/annotation/AppClientImplTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelperTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelperTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelperTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonAnnotationHelperTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonTestCase.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonTestCase.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonTestCase.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/CommonTestCase.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelperTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelperTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelperTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/EjbRefHelperTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImplTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImplTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImplTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/common/annotation/ResourceImplTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EjbJarMetadataModelTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImplTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImplTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImplTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/MessageDrivenImplTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImplTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImplTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImplTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/SessionImplTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppMetadataModelTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppMetadataModelTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppMetadataModelTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppMetadataModelTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppTestCase.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppTestCase.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppTestCase.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/WebAppTestCase.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImplTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImplTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImplTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/impl/web/metadata/WebAppMetadataImplTest.java
diff --git a/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtilsTest.java b/enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtilsTest.java
similarity index 100%
rename from j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtilsTest.java
rename to enterprise/j2ee.dd/test/unit/src/org/netbeans/modules/j2ee/dd/util/AnnotationUtilsTest.java
diff --git a/enterprise/j2ee.ddloaders/arch.xml b/enterprise/j2ee.ddloaders/arch.xml
new file mode 100644
index 0000000000..b187c3a8db
--- /dev/null
+++ b/enterprise/j2ee.ddloaders/arch.xml
@@ -0,0 +1,916 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.24"
+ author="ludo@netbeans.org"
+>
+
+ &api-questions;
+
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+ <answer id="arch-overall">
+ <p>
+ This module defines all the DataLoaders for the J2EE XML files (ejb-jar.xml, application.xml, etc).
+ These loaders are necessary to add extra behaviour on these special xml files:
+ real time parsing and object model synchronization
+ real time validation
+ check and validate actions on popup menu
+ refactoring handling (renaming an EJB will propagate the changes in the ejb-jar.xml file automatically
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-quality" when="init">
+ How will the <a href="http://www.netbeans.org/community/guidelines/q-evangelism.html">quality</a>
+ of your code be tested and
+ how are future regressions going to be prevented?
+ <hint>
+ What kind of testing do
+ you want to use? How much functionality, in which areas,
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+ <answer id="arch-quality">
+ <p>
+ This module was derived from similar techonolgy developed for the Web Module project.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone by which the work should be
+ ready?
+ </hint>
+ </question>
+-->
+ <answer id="arch-time">
+ <p>
+ XXX no answer for arch-time
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it under
+ what circumstances? What kind of code would typically need to be written
+ to use the module?
+ </question>
+-->
+ <answer id="arch-usecases">
+ <p>
+ Refactoring
+
+ Real Time Validation
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-what" when="init">
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+ <answer id="arch-what">
+ <p>
+ XXX no answer for arch-what
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-i18n" when="impl">
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+ <answer id="compat-i18n">
+ <p>
+ XXX no answer for compat-i18n
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-standards" when="init">
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+ <answer id="compat-standards">
+ <p>
+ XXX no answer for compat-standards
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-version" when="impl">
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+ <answer id="compat-version">
+ <p>
+ XXX no answer for compat-version
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-jre" when="final">
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+ <answer id="dep-jre">
+ <p>
+ XXX no answer for dep-jre
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-jrejdk" when="final">
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+ <answer id="dep-jrejdk">
+ <p>
+ XXX no answer for dep-jrejdk
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-nb" when="init">
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported APIs using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+ <answer id="dep-nb">
+ <p>
+ XXX no answer for dep-nb
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-non-nb" when="init">
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+ <answer id="dep-non-nb">
+ <p>
+ XXX no answer for dep-non-nb
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-platform" when="init">
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+ <answer id="dep-platform">
+ <p>
+ XXX no answer for dep-platform
+ </p>
+ </answer>
+
+
+
+ <answer id="deploy-dependencies">
+ <p>
+ Nothing.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-jar" when="impl">
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-jar">
+ <p>
+ XXX no answer for deploy-jar
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-nbm" when="impl">
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+ <answer id="deploy-nbm">
+ <p>
+ XXX no answer for deploy-nbm
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-packages" when="init">
+ Are packages of your module made inaccessible by not declaring them
+ public?
+
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-packages">
+ <p>
+ XXX no answer for deploy-packages
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-shared" when="final">
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-shared">
+ <p>
+ XXX no answer for deploy-shared
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-classloader" when="impl">
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+ <answer id="exec-classloader">
+ <p>
+ XXX no answer for exec-classloader
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-component" when="impl">
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+ <answer id="exec-component">
+ <p>
+ XXX no answer for exec-component
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-introspection" when="impl">
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+ <answer id="exec-introspection">
+ <p>
+ XXX no answer for exec-introspection
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-privateaccess" when="final">
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+ <answer id="exec-privateaccess">
+ <p>
+ XXX no answer for exec-privateaccess
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-process" when="impl">
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+ <answer id="exec-process">
+ <p>
+ XXX no answer for exec-process
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-property" when="impl">
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+ <answer id="exec-property">
+ <p>
+ XXX no answer for exec-property
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-reflection" when="impl">
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+ <answer id="exec-reflection">
+ <p>
+ XXX no answer for exec-reflection
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+ <answer id="exec-threading">
+ <p>
+ XXX no answer for exec-threading
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-clipboard" when="impl">
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+ <answer id="format-clipboard">
+ <p>
+ XXX no answer for format-clipboard
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-dnd" when="impl">
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+ <answer id="format-dnd">
+ <p>
+ XXX no answer for format-dnd
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-types" when="impl">
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+ <answer id="format-types">
+ <p>
+ XXX no answer for format-types
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-lookup" when="init">
+ Does your module use <code>org.openide.util.Lookup</code>
+ or any similar technology to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract. For that use <api group=&lookup& /> tag.
+ </hint>
+ </question>
+-->
+ <answer id="lookup-lookup">
+ <p>
+ XXX no answer for lookup-lookup
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-register" when="final">
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-register">
+ <p>
+ XXX no answer for lookup-register
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-remove" when="final">
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-remove">
+ <p>
+ XXX no answer for lookup-remove
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+ <answer id="perf-exit">
+ <p>
+ XXX no answer for perf-exit
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+ <answer id="perf-huge_dialogs">
+ <p>
+ XXX no answer for perf-huge_dialogs
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+ <answer id="perf-limit">
+ <p>
+ XXX no answer for perf-limit
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-mem" when="final">
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+ <answer id="perf-mem">
+ <p>
+ XXX no answer for perf-mem
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+ <answer id="perf-menus">
+ <p>
+ XXX no answer for perf-menus
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+ <answer id="perf-progress">
+ <p>
+ XXX no answer for perf-progress
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+ <answer id="perf-scale">
+ <p>
+ XXX no answer for perf-scale
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce that it will behave correctly and quickly and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+ <answer id="perf-spi">
+ <p>
+ XXX no answer for perf-spi
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-startup" when="final">
+ Does your module run any code on startup?
+ </question>
+-->
+ <answer id="perf-startup">
+ <p>
+ XXX no answer for perf-startup
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ XXX no answer for perf-wakeup
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+ <answer id="resources-file">
+ <p>
+ XXX no answer for resources-file
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+ <answer id="resources-layer">
+ <p>
+ XXX no answer for resources-layer
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+-->
+ <answer id="resources-mask">
+ <p>
+ XXX no answer for resources-mask
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+ <answer id="resources-read">
+ <p>
+ XXX no answer for resources-read
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ XXX no answer for security-grant
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ XXX no answer for security-policy
+ </p>
+ </answer>
+
+</api-answers>
+
diff --git a/enterprise/j2ee.ddloaders/build.xml b/enterprise/j2ee.ddloaders/build.xml
new file mode 100644
index 0000000000..26b87d9b00
--- /dev/null
+++ b/enterprise/j2ee.ddloaders/build.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.ddloaders">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+
+ <property name="catalog.resources.dir" value="./src/org/netbeans/modules/j2ee/ddloaders/catalog/resources/"/>
+
+ <target name="build-init" depends="projectized.build-init">
+ </target>
+</project>
diff --git a/j2ee.ddloaders/licenseinfo.xml b/enterprise/j2ee.ddloaders/licenseinfo.xml
similarity index 100%
rename from j2ee.ddloaders/licenseinfo.xml
rename to enterprise/j2ee.ddloaders/licenseinfo.xml
diff --git a/j2ee.ddloaders/manifest.mf b/enterprise/j2ee.ddloaders/manifest.mf
similarity index 100%
rename from j2ee.ddloaders/manifest.mf
rename to enterprise/j2ee.ddloaders/manifest.mf
diff --git a/j2ee.ddloaders/nbproject/project.properties b/enterprise/j2ee.ddloaders/nbproject/project.properties
similarity index 100%
rename from j2ee.ddloaders/nbproject/project.properties
rename to enterprise/j2ee.ddloaders/nbproject/project.properties
diff --git a/j2ee.ddloaders/nbproject/project.xml b/enterprise/j2ee.ddloaders/nbproject/project.xml
similarity index 100%
rename from j2ee.ddloaders/nbproject/project.xml
rename to enterprise/j2ee.ddloaders/nbproject/project.xml
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDCatalog.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDCatalog.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDCatalog.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDCatalog.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeEvent.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeEvent.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeEvent.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeEvent.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeListener.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeListener.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeListener.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangeListener.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon1.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon1.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon1.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDDataIcon1.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDDUtils.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDDUtils.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDDUtils.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDDUtils.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoaderBeanInfo.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoaderBeanInfo.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoaderBeanInfo.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataLoaderBeanInfo.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/resources/DDCatalog.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/resources/DDCatalog.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/resources/DDCatalog.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/resources/DDCatalog.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoaderBeanInfo.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoaderBeanInfo.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoaderBeanInfo.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataLoaderBeanInfo.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDCatalog.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDCatalog.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDCatalog.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDCatalog.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeEvent.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeEvent.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeEvent.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeEvent.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeListener.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeListener.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeListener.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangeListener.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDDataIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDDataIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDDataIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDDataIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/error-badge.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/error-badge.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/error-badge.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/error-badge.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/ElementAttrInfo.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/ElementAttrInfo.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/ElementAttrInfo.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/ElementAttrInfo.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/SAXParseError.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/SAXParseError.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/SAXParseError.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/SAXParseError.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeEditorSupport.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeEditorSupport.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeEditorSupport.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeEditorSupport.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeUtils.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeUtils.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeUtils.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/XMLJ2eeUtils.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDCatalog.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDCatalog.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDCatalog.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDCatalog.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeEvent.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeEvent.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeEvent.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeEvent.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeListener.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeListener.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeListener.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangeListener.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDChangesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon1.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon1.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon1.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/DDDataIcon1.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJar30DataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJar30DataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJar30DataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJar30DataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDDUtils.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDDUtils.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDDUtils.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDDUtils.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoaderBeanInfo.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoaderBeanInfo.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoaderBeanInfo.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/ejb/EjbJarDataLoaderBeanInfo.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanDetailsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanEnvironmentNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanEnvironmentNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanEnvironmentNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/BeanEnvironmentNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpFieldsTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationShipsNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationShipsNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationShipsNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationShipsNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsDialogHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsDialogHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsDialogHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsDialogHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsView.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsView.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsView.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsView.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/DDMultiViewDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/DDMultiViewDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/DDMultiViewDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/DDMultiViewDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbImplementationAndInterfacesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarDetailsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiviewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiviewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiviewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiviewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarSecurityRolesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarView.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarView.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarView.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarView.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbReferencesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSectionNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSectionNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSectionNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSectionNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbSecurityPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityOverviewPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnvironmentEntriesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/FinderMethodsTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/InnerTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MdbImplementationPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/MessageDrivenOverviewPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/NonEditableDocument.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/NonEditableDocument.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/NonEditableDocument.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/NonEditableDocument.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/PropertyChangeSource.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/PropertyChangeSource.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/PropertyChangeSource.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/PropertyChangeSource.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodsTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodsTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/QueryMethodsTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/RelationshipHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/RelationshipHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/RelationshipHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/RelationshipHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceEnvironmentReferencesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ResourceReferencesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SecurityRoleReferencesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SelectMethodsTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionHelper.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionHelper.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionHelper.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/SessionOverviewPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/TextItemEditorModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Utils.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Utils.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Utils.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/Utils.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/AddEjbReferenceForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/BrowseFolders.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/CmpRelationshipsForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbDetailForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EjbImplementationAndInterfacesForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/EntityOverviewForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MdbImplementationForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MessageDrivenOverviewForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/MoveClassForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/RenameClassForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SecurityForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/ui/SessionOverviewForm.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon1.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon1.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon1.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDDataIcon1.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDInvalidIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDInvalidIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDInvalidIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDInvalidIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDValidIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDValidIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDValidIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/DDValidIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbContainerNodeIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbContainerNodeIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbContainerNodeIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbContainerNodeIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbModuleNodeIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbModuleNodeIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbModuleNodeIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EjbModuleNodeIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EntityNodeIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EntityNodeIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EntityNodeIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/EntityNodeIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MessageNodeIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MessageNodeIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MessageNodeIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MessageNodeIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MiscNodeIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MiscNodeIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MiscNodeIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/MiscNodeIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/SessionNodeIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/SessionNodeIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/SessionNodeIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/SessionNodeIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDChangesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDChangesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDChangesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDChangesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoaderBeanInfo.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoaderBeanInfo.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoaderBeanInfo.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataLoaderBeanInfo.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataNode.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataNode.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataNode.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDFragmentDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDFragmentDataObject.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDFragmentDataObject.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDFragmentDataObject.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDUtils.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDUtils.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDUtils.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDUtils.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb25DataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb25DataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb25DataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb25DataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb30DataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb30DataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb30DataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb30DataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWebFragment30DataLoader.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWebFragment30DataLoader.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWebFragment30DataLoader.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWebFragment30DataLoader.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeEvent.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeEvent.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeEvent.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeEvent.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeListener.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeListener.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeListener.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/event/DDChangeListener.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/AbsoluteOrderingPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/BrowseFolders.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle.properties
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ContextParamsTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDBeanTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDBeanTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDBeanTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDBeanTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/DDUtils.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EjbRefsTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntriesTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/EnvEntryTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ErrorPagesTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterMappingsTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanelFactory.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanelFactory.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanelFactory.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterPanelFactory.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterParamsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterParamsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterParamsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FilterParamsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FiltersMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FiltersMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FiltersMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/FiltersMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/InitParamsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/JspPGPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenerTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenerTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenerTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenerTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ListenersTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/LoginConfigPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/MessageDestRefsTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OrderingItemPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewFactory.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewFactory.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewFactory.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewFactory.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/OverviewPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesPanelFactory.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesPanelFactory.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesPanelFactory.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/PagesPanelFactory.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesFactory.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesFactory.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesFactory.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesFactory.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ReferencesMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RelativeOrderingPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResEnvRefsTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ResRefsTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/RunAsPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SectionValidator.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SectionValidator.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SectionValidator.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SectionValidator.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityConstraintPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityFactory.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityFactory.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityFactory.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityFactory.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleRefTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRoleTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesEditorPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/SecurityRolesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanelFactory.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanelFactory.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanelFactory.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletPanelFactory.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletsMultiViewElement.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletsMultiViewElement.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletsMultiViewElement.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/ServletsMultiViewElement.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTableModel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTableModel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTableModel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WebResourceCollectionTablePanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.form b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.form
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.form
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.form
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.java
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.java
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/WelcomeFilesPanel.java
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/EnterpriseJavaBean16.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/EnterpriseJavaBean16.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/EnterpriseJavaBean16.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/EnterpriseJavaBean16.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/class.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/class.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/class.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/class.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/constant.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/constant.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/constant.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/constant.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/htmlObject.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/htmlObject.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/htmlObject.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/htmlObject.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/jspObject.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/jspObject.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/jspObject.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/jspObject.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/mappingsNode.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/mappingsNode.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/mappingsNode.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/mappingsNode.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramNode.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramNode.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramNode.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramNode.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramsNode.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramsNode.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramsNode.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/multiview/resources/paramsNode.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDCatalog.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDCatalog.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDCatalog.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDCatalog.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDDataIcon.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDDataIcon.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDDataIcon.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/DDDataIcon.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/error-badge.gif b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/error-badge.gif
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/error-badge.gif
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/error-badge.gif
diff --git a/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd
similarity index 100%
rename from j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd
rename to enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/resources/xml.xsd
diff --git a/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam1.pass b/enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam1.pass
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam1.pass
rename to enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam1.pass
diff --git a/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam2.pass b/enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam2.pass
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam2.pass
rename to enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/AddInitParam2.pass
diff --git a/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue.pass b/enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue.pass
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue.pass
rename to enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue.pass
diff --git a/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue2.pass b/enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue2.pass
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue2.pass
rename to enterprise/j2ee.ddloaders/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest/ReplaceParamValue2.pass
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/build.xml b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/build.xml
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/build.xml
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/build.xml
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/build-impl.xml b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/build-impl.xml
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/build-impl.xml
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/genfiles.properties b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/genfiles.properties
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/genfiles.properties
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.properties b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.properties
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.properties
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.properties
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.xml b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.xml
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.xml
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/nbproject/project.xml
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/src/conf/MANIFEST.MF b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/src/conf/MANIFEST.MF
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServlet.java b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServlet.java
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServlet.java
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServlet.java
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServletListener.java b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServletListener.java
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServletListener.java
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/src/java/abc/NewServletListener.java
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/web/META-INF/context.xml b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/META-INF/context.xml
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/web/META-INF/context.xml
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/META-INF/context.xml
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/sun-web.xml b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/sun-web.xml
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/sun-web.xml
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/sun-web.xml
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/web.xml b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/web.xml
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/web.xml
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/WEB-INF/web.xml
diff --git a/j2ee.ddloaders/test/unit/data/projects/webapp/web/index.jsp b/enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/index.jsp
similarity index 100%
rename from j2ee.ddloaders/test/unit/data/projects/webapp/web/index.jsp
rename to enterprise/j2ee.ddloaders/test/unit/data/projects/webapp/web/index.jsp
diff --git a/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNodeTest.java b/enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNodeTest.java
similarity index 100%
rename from j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNodeTest.java
rename to enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataNodeTest.java
diff --git a/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest.java b/enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest.java
similarity index 100%
rename from j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest.java
rename to enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/DDEditorTest.java
diff --git a/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/Helper.java b/enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/Helper.java
similarity index 100%
rename from j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/Helper.java
rename to enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/Helper.java
diff --git a/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/StepIterator.java b/enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/StepIterator.java
similarity index 100%
rename from j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/StepIterator.java
rename to enterprise/j2ee.ddloaders/test/unit/src/org/netbeans/modules/j2ee/ddloaders/web/test/util/StepIterator.java
diff --git a/enterprise/j2ee.earproject/arch.xml b/enterprise/j2ee.earproject/arch.xml
new file mode 100644
index 0000000000..a4356ce351
--- /dev/null
+++ b/enterprise/j2ee.earproject/arch.xml
@@ -0,0 +1,1016 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
+ <!ENTITY api-questions SYSTEM "../../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
+]>
+
+<api-answers
+ question-version="1.25"
+ author="ludo@netbeans.org, vkraemer@netbeans.org, pbuzek@netbeans.org"
+>
+
+ &api-questions;
+
+
+<!--
+ <question id="arch-overall" when="init">
+ Describe the overall architecture.
+ <hint>
+ What will be API for
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
+ clients and what support API</a>?
+ What parts will be pluggable?
+ How will plug-ins be registered? Please use <code><api type="export"/></code>
+ to describe your general APIs.
+ If possible please provide
+ simple diagrams.
+ </hint>
+ </question>
+-->
+ <answer id="arch-overall">
+ <p>
+The module exposes a new NetBeans project type to create J2EE 1.4 J2EE Application projects,
+where a developer can add EJB Modules and Web Modules, assemble them, build them and deploy them to Application servers.
+ </p>
+ <ol>
+ <li>
+<api name="LayoutOfProjectDirectory" category="private" group="java.io.File" type="export" >
+Modules should make no assumptions about the layout of project direcotry other then
+what is explicitly exposed via API (such as J2eeAppProvider, AntArtifact).
+</api>
+ </li>
+ <li>
+ <api group="dtd" name="ear-prj.xsd" type="export" category="devel" url="http://www.netbeans.org/ns/j2ee-earproject/1">
+ <p>
+ Definition of earproject-specific portions of <code>project.xml</code>.
+ </p>
+ </api>
+ </li>
+ <li>
+ <api group="java.io.File" name="project.properties" type="export" category="devel">
+ <p>
+ Definition of recognized keys in <code>project.properties</code> and/or
+ <code>private.properties</code>. XXX not yet formally specified.
+ </p>
+ </api>
+ </li>
+ <li>
+ <api group="java.io.File" name="build-impl.xml" type="export" category="devel">
+ <p>
+ Definition of targets in <code>build-impl.xml</code> which may be called or
+ overridden in <code>build.xml</code>. XXX not yet formally specified.
+ </p>
+ </api>
+ </li>
+ </ol>
+ </answer>
+
+
+
+<!--
+ <question id="arch-quality" when="init">
+ How will the <a href="http://www.netbeans.org/community/guidelines/q-evangelism.html">quality</a>
+ of your code be tested and
+ how are future regressions going to be prevented?
+ <hint>
+ What kind of testing do
+ you want to use? How much functionality, in which areas,
+ should be covered by the tests?
+ </hint>
+ </question>
+-->
+ <answer id="arch-quality">
+ <p>
+ TDB
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-time" when="init">
+ What are the time estimates of the work?
+ <hint>
+ Please express your estimates of how long the design, implementation,
+ stabilization are likely to last. How many people will be needed to
+ implement this and what is the expected milestone by which the work should be
+ ready?
+ </hint>
+ </question>
+-->
+ <answer id="arch-time">
+ <p>
+ To be completed in netbeans 4.1.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-usecases" when="init">
+ Describe the main <a href="http://openide.netbeans.org/tutorial/api-design.html#usecase">
+ use cases</a> of the new API. Who will use it under
+ what circumstances? What kind of code would typically need to be written
+ to use the module?
+ </question>
+-->
+ <answer id="arch-usecases">
+ <p>
+ No API.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="arch-what" when="init">
+ What is this project good for?
+ <hint>
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
+ specifications, etc.
+ </hint>
+ </question>
+-->
+ <answer id="arch-what">
+ <p>
+ NetBeans 4.1 support for creating J2EE 1.4 Application projects.
+ </p>
+ </answer>
+
+
+
+
+<!--
+ <question id="compat-i18n" when="impl">
+ Is your module correctly internationalized?
+ <hint>
+ Correct internationalization means that it obeys instructions
+ at <a href="http://www.netbeans.org/download/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/i18n-branding.html">
+ NetBeans I18N pages</a>.
+ </hint>
+ </question>
+-->
+ <answer id="compat-i18n">
+ <p>
+ Yes.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-standards" when="init">
+ Does the module implement or define any standards? Is the
+ implementation exact or does it deviate somehow?
+ </question>
+-->
+ <answer id="compat-standards">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="compat-version" when="impl">
+ Can your module coexist with earlier and future
+ versions of itself? Can you correctly read all old settings? Will future
+ versions be able to read your current settings? Can you read
+ or politely ignore settings stored by a future version?
+
+ <hint>
+ Very helpful for reading settings is to store version number
+ there, so future versions can decide whether how to read/convert
+ the settings and older versions can ignore the new ones.
+ </hint>
+ </question>
+-->
+ <answer id="compat-version">
+ <p>
+ This is the first version of this module.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-jre" when="final">
+ Which version of JRE do you need (1.2, 1.3, 1.4, etc.)?
+ <hint>
+ It is expected that if your module runs on 1.x that it will run
+ on 1.x+1 if no, state that please. Also describe here cases where
+ you run different code on different versions of JRE and why.
+ </hint>
+ </question>
+-->
+ <answer id="dep-jre">
+ <p>
+ JRE 1.3
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-jrejdk" when="final">
+ Do you require the JDK or is the JRE enough?
+ </question>
+-->
+ <answer id="dep-jrejdk">
+ <p>
+ JRE is enough.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-nb" when="init">
+ What other NetBeans projects and modules does this one depend on?
+ <hint>
+ If you want, describe such projects as imported APIs using
+ the <code><api name="identification" type="import or export" category="stable" url="where is the description" /></code>
+ </hint>
+ </question>
+-->
+<answer id="dep-nb">
+It uses these API's:
+<ul>
+<li>
+ <api
+ name="J2EEServer"
+ type="import"
+ category="friend"
+ group="java"
+ url="http://www.netbeans.org/download/dev/javadoc/#def-api-J2EE%20Server%20Module">
+ J2EE Server module
+ </api>
+</li>
+<li>
+ <api
+ name="WebModuleAPI"
+ type="import"
+ category="friend"
+ group="java"
+ url="http://www.netbeans.org/download/dev/javadoc/#def-api-web/webapi">
+ Web module apis
+ </api>
+</li>
+<li>
+ <api
+ name="WebDDAPI"
+ type="import"
+ category="friend"
+ group="java">
+ <!-- url="http://www.netbeans.org/download/dev/javadoc/#def-api-web/webapi"> -->
+ Web DD apis
+ </api>
+</li>
+<li>
+ <api
+ name="WebProject"
+ type="import"
+ category="private"
+ group="java">
+ <!-- url="http://www.netbeans.org/download/dev/javadoc/#def-api-web/webapi"> -->
+ Web Project - EAR project wizard reuses web project wizard.
+ </api>
+</li>
+<li>
+ <api
+ name="EjbJarProject"
+ type="import"
+ category="private"
+ group="java">
+ <!-- url="http://www.netbeans.org/download/dev/javadoc/#def-api-web/webapi"> -->
+ Web Project - EAR project wizard reuses EJB JAR project wizard.
+ </api>
+</li>
+</ul>
+</answer>
+
+
+
+<!--
+ <question id="dep-non-nb" when="init">
+ What other projects outside NetBeans does this one depend on?
+
+ <hint>
+ Some non-NetBeans projects are packaged as NetBeans modules
+ (see <a href="http://libs.netbeans.org/">libraries</a>) and
+ it is preferred to use this approach when more modules may
+ depend on such third-party library.
+ </hint>
+ </question>
+-->
+ <answer id="dep-non-nb">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="dep-platform" when="init">
+ On which platforms does your module run? Does it run in the same
+ way on each?
+ <hint>
+ If your module is using JNI or deals with special differences of
+ OSes like filesystems, etc. please describe here what they are.
+ </hint>
+ </question>
+-->
+ <answer id="dep-platform">
+ <p>
+ It should run anywhere.
+ </p>
+ </answer>
+
+
+
+ <answer id="deploy-dependencies">
+ <p>
+ There should be no dependencies on this module.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-jar" when="impl">
+ Do you deploy just module JAR file(s) or other files as well?
+ <hint>
+ If your module consists of just one module JAR file, just confirm that.
+ If it uses more than one JAR, describe where they are located, how
+ they refer to each other.
+ If it consist of module JAR(s) and other files, please describe
+ what is their purpose, why other files are necessary. Please
+ make sure that installation/uninstallation leaves the system
+ in state as it was before installation.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-jar">
+ <p>
+ No other files are deployed.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-nbm" when="impl">
+ Can you deploy an NBM via the Update Center?
+ <hint>
+ If not why?
+ </hint>
+ </question>
+-->
+ <answer id="deploy-nbm">
+ <p>
+ Yes.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-packages" when="init">
+ Are packages of your module made inaccessible by not declaring them
+ public?
+
+ <hint>
+ NetBeans module system allows restriction of access rights to
+ public classes of your module from other modules. This prevents
+ unwanted dependencies of others on your code and should be used
+ whenever possible (<a href="http://www.netbeans.org/download/javadoc/OpenAPIs/org/openide/doc-files/upgrade.html#3.4-public-packages">
+ public packages
+ </a>). If you do not restrict access to your classes you are
+ making it too easy for other people to misuse your implementation
+ details, that is why you should have good reason for not
+ restricting package access.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-packages">
+ <p>
+ Yes.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="deploy-shared" when="final">
+ Do you need to be installed in the shared location only, or in the user directory only,
+ or can your module be installed anywhere?
+ <hint>
+ Installation location shall not matter, if it does explain why.
+ Consider also whether <code>InstalledFileLocator</code> can help.
+ </hint>
+ </question>
+-->
+ <answer id="deploy-shared">
+ <p>
+ Anywhere.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-classloader" when="impl">
+ Does your code create its own class loader(s)?
+ <hint>
+ A bit unusual. Please explain why and what for.
+ </hint>
+ </question>
+-->
+ <answer id="exec-classloader">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-component" when="impl">
+ Is execution of your code influenced by any (string) property
+ of any of your components?
+
+ <hint>
+ Often <code>JComponent.getClientProperty</code>, <code>Action.getValue</code>
+ or <code>PropertyDescriptor.getValue</code>, etc. are used to influence
+ a behavior of some code. This of course forms an interface that should
+ be documented. Also if one depends on some interface that an object
+ implements (<code>component instanceof Runnable</code>) that forms an
+ API as well.
+ </hint>
+ </question>
+-->
+ <answer id="exec-component">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-introspection" when="impl">
+ Does your module use any kind of runtime type information (<code>instanceof</code>,
+ work with <code>java.lang.Class</code>, etc.)?
+ <hint>
+ Check for cases when you have an object of type A and you also
+ expect it to (possibly) be of type B and do some special action. That
+ should be documented. The same applies on operations in meta-level
+ (Class.isInstance(...), Class.isAssignableFrom(...), etc.).
+ </hint>
+ </question>
+-->
+ <answer id="exec-introspection">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-privateaccess" when="final">
+ Are you aware of any other parts of the system calling some of
+ your methods by reflection?
+ <hint>
+ If so, describe the "contract" as an API. Likely private or friend one, but
+ still API and consider rewrite of it.
+ </hint>
+ </question>
+-->
+ <answer id="exec-privateaccess">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-process" when="impl">
+ Do you execute an external process from your module? How do you ensure
+ that the result is the same on different platforms? Do you parse output?
+ Do you depend on result code?
+ <hint>
+ If you feed an input, parse the output please declare that as an API.
+ </hint>
+ </question>
+-->
+ <answer id="exec-process">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-property" when="impl">
+ Is execution of your code influenced by any environment or
+ Java system (<code>System.getProperty</code>) property?
+
+ <hint>
+ If there is a property that can change the behavior of your
+ code, somebody will likely use it. You should describe what it does
+ and the <a href="http://openide.netbeans.org/tutorial/api-design.html#life">stability category</a>
+ of this API. You may use
+ <pre>
+ <api type="export" group="property" name="id" category="private" url="http://...">
+ description of the property, where it is used, what it influence, etc.
+ </api>
+ </pre>
+ </hint>
+ </question>
+-->
+ <answer id="exec-property">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-reflection" when="impl">
+ Does your code use Java Reflection to execute other code?
+ <hint>
+ This usually indicates a missing or insufficient API in the other
+ part of the system. If the other side is not aware of your dependency
+ this contract can be easily broken.
+ </hint>
+ </question>
+-->
+ <answer id="exec-reflection">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="exec-threading" when="impl">
+ What threading models, if any, does your module adhere to?
+ <hint>
+ If your module calls foreign APIs which have a specific threading model,
+ indicate how you comply with the requirements for multithreaded access
+ (synchronization, mutexes, etc.) applicable to those APIs.
+ If your module defines any APIs, or has complex internal structures
+ that might be used from multiple threads, declare how you protect
+ data against concurrent access, race conditions, deadlocks, etc.,
+ and whether such rules are enforced by runtime warnings, errors, assertions, etc.
+ Examples: a class might be non-thread-safe (like Java Collections); might
+ be fully thread-safe (internal locking); might require access through a mutex
+ (and may or may not automatically acquire that mutex on behalf of a client method);
+ might be able to run only in the event queue; etc.
+ Also describe when any events are fired: synchronously, asynchronously, etc.
+ Ideas: <a href="http://core.netbeans.org/proposals/threading/index.html#recommendations">Threading Recommendations</a> (in progress)
+ </hint>
+ </question>
+-->
+ <answer id="exec-threading">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-clipboard" when="impl">
+ Which data flavors (if any) does your code read from or insert to
+ the clipboard (by access to clipboard on means calling methods on <code>java.awt.datatransfer.Transferable</code>?
+
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ Check your code for overriding these methods.
+ </hint>
+ </question>
+-->
+ <answer id="format-clipboard">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-dnd" when="impl">
+ Which protocols (if any) does your code understand during Drag & Drop?
+ <hint>
+ Often Node's deal with clipboard by usage of <code>Node.drag, Node.getDropType</code>.
+ Check your code for overriding these methods. Btw. if they are not overridden, they
+ by default delegate to <code>Node.clipboardCopy, Node.clipboardCut and Node.pasteTypes</code>.
+ </hint>
+ </question>
+-->
+ <answer id="format-dnd">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="format-types" when="impl">
+ Which protocols and file formats (if any) does your module read or write on disk,
+ or transmit or receive over the network?
+ </question>
+-->
+ <answer id="format-types">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-lookup" when="init">
+ Does your module use <code>org.openide.util.Lookup</code>
+ or any similar technology to find any components to communicate with? Which ones?
+
+ <hint>
+ Please describe the interfaces you are searching for, where
+ are defined, whether you are searching for just one or more of them,
+ if the order is important, etc. Also classify the stability of such
+ API contract. For that use <api group=&lookup& /> tag.
+ </hint>
+ </question>
+-->
+ <answer id="lookup-lookup">
+ <p>
+ Module uses only project lookup.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-register" when="final">
+ Do you register anything into lookup for other code to find?
+ <hint>
+ Do you register using layer file or using <code>META-INF/services</code>?
+ Who is supposed to find your component?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-register">
+ <p>
+ org.netbeans.modules.j2ee.earproject.EarProjectType
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="lookup-remove" when="final">
+ Do you remove entries of other modules from lookup?
+ <hint>
+ Why? Of course, that is possible, but it can be dangerous. Is the module
+ your are masking resource from aware of what you are doing?
+ </hint>
+ </question>
+-->
+ <answer id="lookup-remove">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-exit" when="final">
+ Does your module run any code on exit?
+ </question>
+-->
+ <answer id="perf-exit">
+ <p>
+ None.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-huge_dialogs" when="final">
+ Does your module contain any dialogs or wizards with a large number of
+ GUI controls such as combo boxes, lists, trees, or text areas?
+ </question>
+-->
+ <answer id="perf-huge_dialogs">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-limit" when="init">
+ Are there any hard-coded or practical limits in the number or size of
+ elements your code can handle?
+ </question>
+-->
+ <answer id="perf-limit">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-mem" when="final">
+ How much memory does your component consume? Estimate
+ with a relation to the number of windows, etc.
+ </question>
+-->
+ <answer id="perf-mem">
+ <p>
+ Not significant.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-menus" when="final">
+ Does your module use dynamically updated context menus, or
+ context-sensitive actions with complicated enablement logic?
+ </question>
+-->
+ <answer id="perf-menus">
+ <p>
+ No complicated logic.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-progress" when="final">
+ Does your module execute any long-running tasks?
+
+ <hint>Long running tasks should never block
+ AWT thread as it badly hurts the UI
+ <a href="http://performance.netbeans.org/responsiveness/issues.html">
+ responsiveness</a>.
+ Tasks like connecting over
+ network, computing huge amount of data, compilation
+ be done asynchronously (for example
+ using <code>RequestProcessor</code>), definitively it should
+ not block AWT thread.
+ </hint>
+ </question>
+-->
+ <answer id="perf-progress">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-scale" when="init">
+ Which external criteria influence the performance of your
+ program (size of file in editor, number of files in menu,
+ in source directory, etc.) and how well your code scales?
+ <hint>
+ Please include some estimates, there are other more detailed
+ questions to answer in later phases of implementation.
+ </hint>
+ </question>
+-->
+ <answer id="perf-scale">
+ <p>
+ Number of j2ee modules.
+ <b>PENDING: What is the typical number of modules?.</b>
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-spi" when="init">
+ How the performance of the plugged in code will be enforced?
+ <hint>
+ If you allow foreign code to be plugged into your own module, how
+ do you enforce that it will behave correctly and quickly and will not
+ negatively influence the performance of your own module?
+ </hint>
+ </question>
+-->
+ <answer id="perf-spi">
+ <p>
+ No SPI.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-startup" when="final">
+ Does your module run any code on startup?
+ </question>
+-->
+ <answer id="perf-startup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="perf-wakeup" when="final">
+ Does any piece of your code wake up periodically and do something
+ even when the system is otherwise idle (no user interaction)?
+ </question>
+-->
+ <answer id="perf-wakeup">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-file" when="final">
+ Does your module use <code>java.io.File</code> directly?
+
+ <hint>
+ NetBeans provide a logical wrapper over plain files called
+ <code>org.openide.filesystems.FileObject</code> that
+ provides uniform access to such resources and is the preferred
+ way that should be used. But of course there can be situations when
+ this is not suitable.
+ </hint>
+ </question>
+-->
+ <answer id="resources-file">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-layer" when="final">
+ Does your module provide own layer? Does it create any files or
+ folders in it? What it is trying to communicate by that and with which
+ components?
+
+ <hint>
+ NetBeans allows automatic and declarative installation of resources
+ by module layers. Module register files into appropriate places
+ and other components use that information to perform their task
+ (build menu, toolbar, window layout, list of templates, set of
+ options, etc.).
+ </hint>
+ </question>
+-->
+ <answer id="resources-layer">
+ <p>
+ Yes, it defines templates.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-mask" when="final">
+ Does your module mask/hide/override any resources provided by other modules in
+ their layers?
+
+ <hint>
+ If you mask a file provided by another module, you probably depend
+ on that and do not want the other module to (for example) change
+ the file's name. That module shall thus make that file available as an API
+ of some stability category.
+ </hint>
+ </question>
+-->
+ <answer id="resources-mask">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="resources-read" when="final">
+ Does your module read any resources from layers? For what purpose?
+
+ <hint>
+ As this is some kind of intermodule dependency, it is a kind of API.
+ Please describe it and classify according to
+ <a href="http://openide.netbeans.org/tutorial/api-design.html#categories">
+ common stability categories</a>.
+ </hint>
+ </question>
+-->
+ <answer id="resources-read">
+ <api group="layer" name="EarLookup" type="export" category="official">
+ <p>
+ "Projects/org-netbeans-modules-j2ee-earproject/Lookup" folder's content is used to construct the project's additional lookup.
+ It's content is expected to be <code>LookupProvider</code> instances. Ear project provides <code>LookupMerger</code>s
+ for <code>Sources</code>, <code>PrivilegedTemplates</code> and <code>RecommendedTemplates</code>. Implementations added by 3rd parties
+ will be merged into a single instance in the project's lookup.
+ </p>
+ </api>
+ </answer>
+
+
+
+<!--
+ <question id="security-grant" when="final">
+ Does your code grant additional rights to some other code?
+ <hint>Avoid using a class loader that adds extra
+ permissions to loaded code unless really necessary.
+ Also note that your API implementation
+ can also expose unneeded permissions to enemy code by
+ calling AccessController.doPrivileged().</hint>
+ </question>
+-->
+ <answer id="security-grant">
+ <p>
+ No.
+ </p>
+ </answer>
+
+
+
+<!--
+ <question id="security-policy" when="final">
+ Does your functionality require modifications to the standard policy file?
+ <hint>Your code might pass control to third-party code not
+ coming from trusted domains. This could be code downloaded over the
+ network or code coming from libraries that are not bundled
+ with NetBeans. Which permissions need to be granted to which domains?</hint>
+ </question>
+-->
+ <answer id="security-policy">
+ <p>
+ No.
+ </p>
+ </answer>
+
+<!--
+ <question id="exec-ant-tasks" when="impl">
+ Do you define or register any ant tasks that other can use?
+
+ <hint>
+ If you provide an ant task that users can use, you need to be very
+ careful about its syntax and behaviour, as it most likely forms an
+ API for end users and as there is a lot of end users, their reaction
+ when such API gets broken can be pretty strong.
+ </hint>
+ </question>
+-->
+ <answer id="exec-ant-tasks">
+ <p>
+ No
+ </p>
+ </answer>
+
+</api-answers>
+
diff --git a/enterprise/j2ee.earproject/build.xml b/enterprise/j2ee.earproject/build.xml
new file mode 100644
index 0000000000..d9080e7904
--- /dev/null
+++ b/enterprise/j2ee.earproject/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.earproject">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/j2ee.earproject/l10n.list b/enterprise/j2ee.earproject/l10n.list
similarity index 100%
rename from j2ee.earproject/l10n.list
rename to enterprise/j2ee.earproject/l10n.list
diff --git a/j2ee.earproject/licenseinfo.xml b/enterprise/j2ee.earproject/licenseinfo.xml
similarity index 100%
rename from j2ee.earproject/licenseinfo.xml
rename to enterprise/j2ee.earproject/licenseinfo.xml
diff --git a/j2ee.earproject/manifest.mf b/enterprise/j2ee.earproject/manifest.mf
similarity index 100%
rename from j2ee.earproject/manifest.mf
rename to enterprise/j2ee.earproject/manifest.mf
diff --git a/j2ee.earproject/nbproject/project.properties b/enterprise/j2ee.earproject/nbproject/project.properties
similarity index 100%
rename from j2ee.earproject/nbproject/project.properties
rename to enterprise/j2ee.earproject/nbproject/project.properties
diff --git a/j2ee.earproject/nbproject/project.xml b/enterprise/j2ee.earproject/nbproject/project.xml
similarity index 100%
rename from j2ee.earproject/nbproject/project.xml
rename to enterprise/j2ee.earproject/nbproject/project.xml
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/Bundle.properties b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/Bundle.properties
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/Bundle.properties
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/Bundle.properties
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProject.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectGenerator.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectOperations.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarProjectType.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ModuleType.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ModuleType.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ModuleType.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ModuleType.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEar.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEarProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEarProvider.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEarProvider.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ProjectEarProvider.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/SourceForBinaryQueryImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/SourceForBinaryQueryImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/SourceForBinaryQueryImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/SourceForBinaryQueryImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/UpdateProjectImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/UpdateProjectImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/UpdateProjectImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/UpdateProjectImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/WebBrowserProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/WebBrowserProvider.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/WebBrowserProvider.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/WebBrowserProvider.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathProviderImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathProviderImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathProviderImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathProviderImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathSupportCallbackImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathSupportCallbackImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathSupportCallbackImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/classpath/ClassPathSupportCallbackImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ApplicationMetadataModelImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ModuleImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ModuleImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ModuleImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/ModuleImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/WebImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/WebImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/WebImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/model/WebImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build.xsl b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build.xsl
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build.xsl
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build.xsl
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj-private.xsd b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj-private.xsd
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj-private.xsd
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj-private.xsd
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj.xsd b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj.xsd
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj.xsd
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj.xsd
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj2.xsd b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj2.xsd
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj2.xsd
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/ear-prj2.xsd
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ArchiveViews.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ArchiveViews.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ArchiveViews.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ArchiveViews.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/Bundle.properties
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ConfFilesNodeFactory.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/IconBaseProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/IconBaseProvider.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/IconBaseProvider.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/IconBaseProvider.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/J2eeArchiveLogicalViewProvider.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewChildren.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewChildren.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewChildren.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewChildren.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewNode.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewNode.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewNode.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/LogicalViewNode.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNode.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNode.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNode.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNode.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeFactory.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/RemoveAction.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/RemoveAction.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/RemoveAction.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/RemoveAction.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/SetupDirNodeFactory.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/AddModuleAction.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/AddModuleAction.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/AddModuleAction.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/AddModuleAction.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle.properties b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle.properties
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle.properties
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle.properties
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/OpenModuleProjectAction.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/OpenModuleProjectAction.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/OpenModuleProjectAction.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/actions/OpenModuleProjectAction.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/AdditionalContentTableModel.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/AdditionalContentTableModel.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/AdditionalContentTableModel.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/AdditionalContentTableModel.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle.properties
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.form b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.form
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.form
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.form
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerCompile.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.form b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.form
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.form
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.form
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerGeneral.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.form b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.form
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.form
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.form
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerJarContent.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.form b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.form
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.form
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.form
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerProviderImpl.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.form
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerRun.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarCompositePanelProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarCompositePanelProvider.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarCompositePanelProvider.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarCompositePanelProvider.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/CarModuleNodeIcon.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/CarModuleNodeIcon.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/CarModuleNodeIcon.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/CarModuleNodeIcon.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/EjbModuleNodeIcon.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/EjbModuleNodeIcon.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/EjbModuleNodeIcon.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/EjbModuleNodeIcon.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/MANIFEST.MF b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/MANIFEST.MF
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/MANIFEST.MF
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/MANIFEST.MF
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/WebModuleNode.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/WebModuleNode.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/WebModuleNode.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/WebModuleNode.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/application_16.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/application_16.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/application_16.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/application_16.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/archive.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/archive.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/archive.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/archive.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/brokenProjectBadge.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/brokenProjectBadge.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/brokenProjectBadge.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/brokenProjectBadge.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject.html b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject.html
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject.html
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject.html
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject.html b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject.html
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject.html
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject.html
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject.html b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject.html
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject.html
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject.html
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/ear.html
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/folder.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/folder.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/folder.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/folder.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/jar.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/jar.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/jar.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/jar.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/libraries.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/libraries.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/libraries.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/libraries.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectDependencies.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectDependencies.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectDependencies.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectDependencies.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/projectIcon.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/propertyNode.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/propertyNode.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/propertyNode.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/propertyNode.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/referencedClasspath.gif b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/referencedClasspath.gif
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/referencedClasspath.gif
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/resources/referencedClasspath.gif
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle.properties
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIterator.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIterator.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.form b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.form
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.form
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.form
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetectionVisual.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanel.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanel.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanel.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanel.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/WizardProperties.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/WizardProperties.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/WizardProperties.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/WizardProperties.java
diff --git a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/util/EarProjectUtil.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/util/EarProjectUtil.java
similarity index 100%
rename from j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/util/EarProjectUtil.java
rename to enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/util/EarProjectUtil.java
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/build.xml b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/build.xml
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/build.xml
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/build.xml
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/build-impl.xml b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/build-impl.xml
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/build-impl.xml
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/genfiles.properties b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/genfiles.properties
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/genfiles.properties
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.properties b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.properties
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.properties
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.properties
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.xml b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.xml
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.xml
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/nbproject/project.xml
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/MANIFEST.MF b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/MANIFEST.MF
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/MANIFEST.MF
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/application.xml b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/application.xml
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/application.xml
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/application.xml
diff --git a/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/sun-application.xml b/enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/sun-application.xml
similarity index 100%
rename from j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/sun-application.xml
rename to enterprise/j2ee.earproject/test/unit/data/projects/EnterpriseApplication1/src/conf/sun-application.xml
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectGeneratorTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTypeTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTypeTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTypeTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProjectTypeTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProviderTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProviderTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProviderTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/EarProviderTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarProviderTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ProjectEarTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/TestPlatformProvider.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/TestPlatformProvider.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/TestPlatformProvider.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/TestPlatformProvider.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/model/ApplicationImplTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/EarTestCase.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/EarTestCase.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/EarTestCase.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/EarTestCase.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/TestUtil.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/TestUtil.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/TestUtil.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/test/TestUtil.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/ModuleNodeTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectPropertiesTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/ImportBlueprintEarWizardIteratorTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/NewEarProjectWizardIteratorTest.java
diff --git a/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanelTest.java b/enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanelTest.java
similarity index 100%
rename from j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanelTest.java
rename to enterprise/j2ee.earproject/test/unit/src/org/netbeans/modules/j2ee/earproject/ui/wizards/SettingsPanelTest.java
diff --git a/enterprise/j2ee.ejbcore/build.xml b/enterprise/j2ee.ejbcore/build.xml
new file mode 100644
index 0000000000..acc81e22a0
--- /dev/null
+++ b/enterprise/j2ee.ejbcore/build.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="enterprise/j2ee.ejbcore">
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/j2ee.ejbcore/l10n.list b/enterprise/j2ee.ejbcore/l10n.list
similarity index 100%
rename from j2ee.ejbcore/l10n.list
rename to enterprise/j2ee.ejbcore/l10n.list
diff --git a/j2ee.ejbcore/licenseinfo.xml b/enterprise/j2ee.ejbcore/licenseinfo.xml
similarity index 100%
rename from j2ee.ejbcore/licenseinfo.xml
rename to enterprise/j2ee.ejbcore/licenseinfo.xml
diff --git a/j2ee.ejbcore/manifest.mf b/enterprise/j2ee.ejbcore/manifest.mf
similarity index 100%
rename from j2ee.ejbcore/manifest.mf
rename to enterprise/j2ee.ejbcore/manifest.mf
diff --git a/enterprise/j2ee.ejbcore/nbproject/project.properties b/enterprise/j2ee.ejbcore/nbproject/project.properties
new file mode 100644
index 0000000000..a0c1559062
--- /dev/null
+++ b/enterprise/j2ee.ejbcore/nbproject/project.properties
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+javac.compilerargs=-Xlint:unchecked
+javac.source=1.7
+
+test.unit.cp.extra=\
+ ${nb_all}/enterprise/j2ee.dd/external/javaee-api-5.jar
+requires.nb.javac=true
diff --git a/j2ee.ejbcore/nbproject/project.xml b/enterprise/j2ee.ejbcore/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/nbproject/project.xml
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbGenerationUtil.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbGenerationUtil.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbGenerationUtil.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbGenerationUtil.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbInjectionTargetQueryImplementation.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbNodesFactoryImpl.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbNodesFactoryImpl.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbNodesFactoryImpl.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/EjbNodesFactoryImpl.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/AbstractMethodGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/JmsDestinationDefinition.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/JmsDestinationDefinition.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/JmsDestinationDefinition.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/JmsDestinationDefinition.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromImplVisitor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityGenerateFromIntfVisitor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/MethodType.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromImplVisitor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionGenerateFromIntfVisitor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/SessionMethodController.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/ui/CallEjb.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanelGUI.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CMPMapping.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CMPMapping.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CMPMapping.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CMPMapping.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpFromDbGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorProvider.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorProvider.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorProvider.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorProvider.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlVisualPanel1.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardIterator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardIterator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardIterator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardIterator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardPanel1.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardPanel1.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardPanel1.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/EjbJarXmlWizardPanel1.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizard.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizard.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizard.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizard.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardDescriptor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardDescriptor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardDescriptor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardDescriptor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/EntityEJBWizardPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIterator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIterator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIterator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIterator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/ActivationConfigProperties.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/ActivationConfigProperties.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/ActivationConfigProperties.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/ActivationConfigProperties.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbLocationPanelVisual.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationUiSupport.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationUiSupport.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationUiSupport.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationUiSupport.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardDescriptor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardDescriptor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardDescriptor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardDescriptor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/TimerOptions.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/TimerOptions.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/TimerOptions.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/TimerOptions.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptions.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptions.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptions.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptions.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptionsPanelController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptionsPanelController.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptionsPanelController.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNameOptionsPanelController.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/naming/EJBNamePanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/ServiceLocatorWizard.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/ServiceLocatorWizard.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/ServiceLocatorWizard.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/patterns/ServiceLocatorWizard.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/BusinessMethodIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/BusinessMethodIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/BusinessMethodIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/BusinessMethodIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMFieldContainerIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMFieldContainerIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMFieldContainerIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMFieldContainerIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPFieldIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPFieldIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPFieldIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMPFieldIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMRFieldIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMRFieldIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMRFieldIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CMRFieldIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CreateMethodIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CreateMethodIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CreateMethodIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/CreateMethodIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/FinderMethodIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/FinderMethodIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/FinderMethodIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/FinderMethodIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/HomeMethodIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/HomeMethodIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/HomeMethodIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/HomeMethodIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/LocalMethodContainerIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/MethodContainerIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/RemoteMethodContainerIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB.html b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB.html
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB.html
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB.html
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/foldersList.settings b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/foldersList.settings
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/foldersList.settings
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/foldersList.settings
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/layer.xml b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocal.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpLocalHome.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemote.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21BmpRemoteHome.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocal.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpLocalHome.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpPrimaryKey.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemote.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21CmpRemoteHome.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21MessageDrivenEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocal.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionLocalHome.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemote.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB21SessionRemoteHome.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenBean.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenBean.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenBean.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30MessageDrivenBean.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionLocal.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30SessionRemote.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatefulEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB30StatelessEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB31SingletonEjbClass.template b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB31SingletonEjbClass.template
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB31SingletonEjbClass.template
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/resources/templates/EJB31SingletonEjbClass.template
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/spi/ProjectPropertiesSupport.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/spi/ProjectPropertiesSupport.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/spi/ProjectPropertiesSupport.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/spi/ProjectPropertiesSupport.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/EJBPreferences.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/EJBPreferences.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/EJBPreferences.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/EJBPreferences.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddActionGroup.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddBusinessMethodStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddCreateMethodStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddFinderMethodStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddHomeMethodStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddSelectMethodStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/DeleteEJBDialog.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EJBActionGroup.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceAction.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceAction.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceAction.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceAction.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMFieldChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMFieldChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMFieldChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMFieldChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMPFieldsNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMRFieldNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMRFieldNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMRFieldNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/CMRFieldNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityNodeIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/MethodChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/mdb/MessageNodeIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/IconVisitor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/IconVisitor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/IconVisitor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/IconVisitor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/MethodChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionNodeIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodModel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/ComponentMethodViewStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbTransferable.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbTransferable.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbTransferable.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbTransferable.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbViewController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbViewController.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbViewController.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/EjbViewController.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/IconVisitor.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/IconVisitor.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/IconVisitor.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/IconVisitor.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodsNode.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodsNode.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodsNode.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/MethodsNode.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIcon.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIcon.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIcon.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIcon.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIconOpen.gif b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIconOpen.gif
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIconOpen.gif
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/EjbContainerNodeIconOpen.gif
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/webservicegroup.png b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/webservicegroup.png
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/webservicegroup.png
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/webservicegroup.png
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle.properties b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle.properties
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle.properties
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle.properties
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbCodeGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbCodeGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbCodeGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbCodeGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbDialog.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/CallEjbPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DataSourceReferencePanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/DatasourceComboBoxCustomizer.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EJBListViewChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EJBListViewChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EJBListViewChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EJBListViewChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EjbChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EjbChildren.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EjbChildren.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/EjbChildren.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/NodeDisplayPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/NodeDisplayPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/NodeDisplayPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/NodeDisplayPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SelectDatabasePanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailCodeGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendEmailPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageCodeGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageUiSupport.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageUiSupport.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageUiSupport.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJMSMessageUiSupport.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/SendJmsMessagePanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategy.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.form b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.form
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.form
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.form
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/ServiceLocatorStrategyPanel.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/UseDatabaseCodeGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/UseDatabaseCodeGenerator.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/UseDatabaseCodeGenerator.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/UseDatabaseCodeGenerator.java
diff --git a/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
similarity index 100%
rename from j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
rename to enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtil.java
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/application-client.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/application-client.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/application-client.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/application-client.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/sun-application-client.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/sun-application-client.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/sun-application-client.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/conf/sun-application-client.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/java/applicationclient_1_4/Main.java b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/java/applicationclient_1_4/Main.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/java/applicationclient_1_4/Main.java
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_1_4/src/java/applicationclient_1_4/Main.java
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/application-client.xml b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/application-client.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/application-client.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/conf/application-client.xml
diff --git a/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/java/applicationclient_5_0/Main.java b/enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/java/applicationclient_5_0/Main.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/java/applicationclient_5_0/Main.java
rename to enterprise/j2ee.ejbcore/test/unit/data/ApplicationClient_5_0/src/java/applicationclient_5_0/Main.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/ejb-jar.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/ejb-jar.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/ejb-jar.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/ejb-jar.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/sun-ejb-jar.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/sun-ejb-jar.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/sun-ejb-jar.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/conf/sun-ejb-jar.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRBean2.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRBean2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRBean2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRBean2.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocal2.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocal2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocal2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocal2.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocalHome2.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocalHome2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocalHome2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRLocalHome2.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemote2.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemote2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemote2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemote2.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemoteHome2.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemoteHome2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemoteHome2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule2_1_4/src/java/statelesslr/StatelessLRRemoteHome2.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/ejb-jar.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/ejb-jar.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/ejb-jar.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/ejb-jar.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/sun-ejb-jar.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/sun-ejb-jar.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/sun-ejb-jar.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/conf/sun-ejb-jar.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRBean.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRBean.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemoteHome.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemoteHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemoteHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/cmplr/CmpLRRemoteHome.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRBean.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRBean.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemoteHome.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemoteHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemoteHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statefullr/StatefulLRRemoteHome.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRBean.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRBean.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemoteHome.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemoteHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemoteHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_1_4/src/java/statelesslr/StatelessLRRemoteHome.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRBean.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRBean.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_5_0/src/java/statelesslr/StatelessLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRBean.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRBean.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_6_0/src/java/statelesslr/StatelessLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRBean.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRBean.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote2.java b/enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/EJBModule_7_0/src/java/statelesslr/StatelessLRRemote2.java
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/application.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/application.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/application.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/application.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/sun-application.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/sun-application.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/sun-application.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_1_4/src/conf/sun-application.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/application.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/application.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/application.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/application.xml
diff --git a/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/sun-application.xml b/enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/sun-application.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/sun-application.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/EnterpriseApplication_5_0/src/conf/sun-application.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/sun-web.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/sun-web.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/sun-web.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/sun-web.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/web.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/web.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/web.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/WEB-INF/web.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/index.jsp b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/index.jsp
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/index.jsp
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_1_4/web/index.jsp
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/build.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/build.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/build.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/build.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/ant-deploy.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/ant-deploy.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/ant-deploy.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/ant-deploy.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/build-impl.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/build-impl.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/build-impl.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/build-impl.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/genfiles.properties b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/genfiles.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/genfiles.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/genfiles.properties
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.properties b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.properties
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.properties
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.properties
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/nbproject/project.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/src/conf/MANIFEST.MF b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/src/conf/MANIFEST.MF
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/src/conf/MANIFEST.MF
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/src/conf/MANIFEST.MF
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/sun-web.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/sun-web.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/sun-web.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/sun-web.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/web.xml b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/web.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/web.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/WEB-INF/web.xml
diff --git a/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/index.jsp b/enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/index.jsp
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/index.jsp
rename to enterprise/j2ee.ejbcore/test/unit/data/WebApplication_5_0/web/index.jsp
diff --git a/j2ee.ejbcore/test/unit/data/derby-sample.dbschema b/enterprise/j2ee.ejbcore/test/unit/data/derby-sample.dbschema
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/derby-sample.dbschema
rename to enterprise/j2ee.ejbcore/test/unit/data/derby-sample.dbschema
diff --git a/j2ee.ejbcore/test/unit/data/ejb-jar.xml b/enterprise/j2ee.ejbcore/test/unit/data/ejb-jar.xml
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/ejb-jar.xml
rename to enterprise/j2ee.ejbcore/test/unit/data/ejb-jar.xml
diff --git a/j2ee.ejbcore/test/unit/data/golden/CustomerTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/CustomerTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/CustomerTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/CustomerTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/DiscountCodeTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ManufactureTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ManufactureTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ManufactureTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/MicroMarketsTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OfficeTypeCodeTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OrderTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OrderTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OrderTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OrderTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OrderTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OrderTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/OrderTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/OrderTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/OrderTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductCodeTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductCodeTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/ProductTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/ProductTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/ProductTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepDataTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesRepTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblBean.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblBean.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalBusiness.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalBusiness.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalBusiness.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalBusiness.java
diff --git a/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/golden/SalesTaxCodeTblLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmp.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmp.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmp.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmp.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestBmpLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmp.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmp.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmp.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmp.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemoteHome.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemoteHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemoteHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest/testGenerateJavaEE14/TestCmpRemoteHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBQueueBean.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBQueueBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBQueueBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBQueueBean.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBTopicBean.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBTopicBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBTopicBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE14/TestMDBTopicBean.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBQueueBean.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBQueueBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBQueueBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBQueueBean.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBTopicBean.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBTopicBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBTopicBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE50/TestMDBTopicBean.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean2.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean2.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean2.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBQueueBean2.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBTopicBean.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBTopicBean.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBTopicBean.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest/testGenerateJavaEE70/TestMDBTopicBean.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLR.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLR.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLR.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLR.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatefulLRLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLR.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLR.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLR.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLR.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocalHome.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocalHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocalHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRLocalHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemoteHome.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemoteHome.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemoteHome.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE14/TestStatelessLRRemoteHome.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateful.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateful.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateful.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateful.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatefulRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatefulRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatefulRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatefulRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateless.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateless.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateless.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStateless.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE50/TestStatelessRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestSingleton.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestSingleton.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestSingleton.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestSingleton.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateful.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateful.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateful.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateful.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatefulRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatefulRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatefulRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatefulRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateless.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateless.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateless.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStateless.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessLocal.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessLocal.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessLocal.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessLocal.java
diff --git a/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessRemote.java b/enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessRemote.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessRemote.java
rename to enterprise/j2ee.ejbcore/test/unit/data/goldenfiles/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest/testGenerateJavaEE60/TestStatelessRemote.java
diff --git a/j2ee.ejbcore/test/unit/data/pointbase-samples.dbschema b/enterprise/j2ee.ejbcore/test/unit/data/pointbase-samples.dbschema
similarity index 100%
rename from j2ee.ejbcore/test/unit/data/pointbase-samples.dbschema
rename to enterprise/j2ee.ejbcore/test/unit/data/pointbase-samples.dbschema
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/BusinessMethodGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CmFieldGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/CreateMethodGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/FinderMethodGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/HomeMethodGenerstorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/SelectMethodGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/EntityGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/MessageGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/SessionGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/Util.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/CmpGeneratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIteratorTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIteratorTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIteratorTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardIteratorTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ClassPathProviderImpl.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ClassPathProviderImpl.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ClassPathProviderImpl.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ClassPathProviderImpl.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarImplementationImpl.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarImplementationImpl.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarImplementationImpl.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarImplementationImpl.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarProviderImpl.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarProviderImpl.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarProviderImpl.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EjbJarProviderImpl.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EnterpriseReferenceContainerImpl.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EnterpriseReferenceContainerImpl.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EnterpriseReferenceContainerImpl.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/EnterpriseReferenceContainerImpl.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FakeJavaDataLoaderPool.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FakeJavaDataLoaderPool.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FakeJavaDataLoaderPool.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FakeJavaDataLoaderPool.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FileOwnerQueryImpl.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FileOwnerQueryImpl.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FileOwnerQueryImpl.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/FileOwnerQueryImpl.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ProjectImpl.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ProjectImpl.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ProjectImpl.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/ProjectImpl.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestBase.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestUtilities.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestUtilities.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestUtilities.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/test/TestUtilities.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodActionTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodActionTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodActionTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AbstractAddMethodActionTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EjbActionGroupTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EjbActionGroupTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EjbActionGroupTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/EjbActionGroupTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtilTest.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtilTest.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtilTest.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/j2ee/ejbcore/util/_RetoucheUtilTest.java
diff --git a/j2ee.ejbcore/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java b/enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java
similarity index 100%
rename from j2ee.ejbcore/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java
rename to enterprise/j2ee.ejbcore/test/unit/src/org/netbeans/modules/java/source/usages/IndexUtil.java
diff --git a/enterprise/j2ee.ejbjarproject/apichanges.xml b/enterprise/j2ee.ejbjarproject/apichanges.xml
new file mode 100644
index 0000000000..6005f73289
--- /dev/null
+++ b/enterprise/j2ee.ejbjarproject/apichanges.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="../../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+ <api name="compiler"/>
+ <summary>Some brief description here, can use <b>XHTML</b></summary>
+ <version major="1" minor="99"/>
+ <date day="13" month="6" year="2001"/>
+ <author login="jrhacker"/>
+ <compatibility addition="yes"/>
+ <description>
+ The main description of the change here.
+ Again can use full <b>XHTML</b> as needed.
+ </description>
+ <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+ <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+ <!-- First, a list of API names you may use: -->
+ <apidefs>
+ <apidef name="EjbJarProject">J2EE Ejb Module Project</apidef>
+ </apidefs>
+
+ <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+ <changes>
+ <change id="EjbJarProjectGenerator">
+ <api name="EjbJarProject"/>
+ <summary>Changed to friend API and added a frist API class</summary>
(This diff was longer than 20,000 lines, and has been truncated...)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists