You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/05/11 08:27:40 UTC
[netbeans] branch master updated: [NETBEANS-2415]: Bring back
support for WildFly server
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 19bb711 [NETBEANS-2415]: Bring back support for WildFly server
new 25dd8ec Merge pull request #2046 from ehsavoie/NETBEANS-2415
19bb711 is described below
commit 19bb7113483812a821c085b2c241a8c7a21ffb31
Author: Emmanuel Hugonnet <eh...@redhat.com>
AuthorDate: Tue May 5 10:13:12 2020 +0200
[NETBEANS-2415]: Bring back support for WildFly server
* Moving WildFly plugin back into enterprise cluster
* Fixing missing DTDs form xml.xsd
Jira: https://issues.apache.org/jira/browse/NETBEANS-2415
---
{contrib => enterprise}/javaee.wildfly/build.xml | 2 +-
.../javaee.wildfly/licenseinfo.xml | 2 +
{contrib => enterprise}/javaee.wildfly/manifest.mf | 0
.../javaee.wildfly/nbproject/project.properties | 0
.../javaee.wildfly/nbproject/project.xml | 0
.../modules/javaee/wildfly/Bundle.properties | 0
.../javaee/wildfly/ChangelogWildflyPlugin.java | 0
.../javaee/wildfly/WildflyDeploymentFactory.java | 1 -
.../javaee/wildfly/WildflyDeploymentManager.java | 0
.../javaee/wildfly/WildflyTargetModuleID.java | 0
.../javaee/wildfly/WrappedTargetModuleID.java | 0
.../javaee/wildfly/config/Bundle.properties | 1 -
.../wildfly/config/CarDeploymentConfiguration.java | 52 +--
.../wildfly/config/EarDeploymentConfiguration.java | 20 +-
.../wildfly/config/EjbDeploymentConfiguration.java | 0
.../wildfly/config/JBossDataSourceRefModifier.java | 30 +-
.../javaee/wildfly/config/JBossEjbRefModifier.java | 30 +-
.../wildfly/config/JBossMsgDestRefModifier.java | 46 +--
.../wildfly/config/ProgressObjectSupport.java | 0
.../config/ResourceConfigurationHelper.java | 8 +-
.../wildfly/config/WarDeploymentConfiguration.java | 0
.../wildfly/config/WildflyConnectionFactory.java | 0
.../javaee/wildfly/config/WildflyDatasource.java | 0
.../wildfly/config/WildflyDatasourceManager.java | 0
.../config/WildflyDeploymentConfiguration.java | 0
.../wildfly/config/WildflyJaxrsResource.java | 0
.../wildfly/config/WildflyMailSessionResource.java | 2 +-
.../wildfly/config/WildflyMessageDestination.java | 8 +-
.../config/WildflyMessageDestinationManager.java | 0
.../config/WildflyModuleConfigurationFactory.java | 6 +-
.../wildfly/config/WildflyResourceAdapter.java | 0
.../javaee/wildfly/config/WildflySocket.java | 4 +-
.../config/WildlfyModuleConfigurationFactory.java | 6 +-
.../javaee/wildfly/config/ds/Bundle.properties | 0
.../wildfly/config/ds/DatasourceSupport.java | 0
.../javaee/wildfly/config/ds/gen/package-info.java | 0
.../javaee/wildfly/config/gen/package-info.java | 0
.../wildfly/config/gen/wf10/package-info.java | 0
.../javaee/wildfly/config/mdb/Bundle.properties | 0
.../config/mdb/MessageDestinationSupport.java | 2 +-
.../config/mdb/MessageDestinationSupportImpl.java | 2 +-
.../mdb/wf10/MessageDestinationSupportImpl.java | 2 +-
.../config/xml/AbstractHierarchicalHandler.java | 0
.../wildfly/config/xml/ConfigurationParser.java | 0
.../wildfly/config/xml/ds/WildflyDataSource.java | 4 +-
.../config/xml/ds/WildflyDatasourceHandler.java | 0
.../config/xml/ds/WildflyDatasourcesHandler.java | 0
.../wildfly/config/xml/ds/WildflyDriver.java | 0
.../config/xml/ds/WildflyDriverHandler.java | 0
.../config/xml/ds/WildflyDriversHandler.java | 2 +-
.../config/xml/ds/WildflySecurityHandler.java | 0
.../xml/jms/WildflyMessageDestinationHandler.java | 2 +-
.../javaee/wildfly/customizer/Bundle.properties | 0
.../javaee/wildfly/customizer/Customizer.java | 8 +-
.../wildfly/customizer/CustomizerDataSupport.java | 96 ++---
.../javaee/wildfly/customizer/CustomizerJVM.form | 0
.../javaee/wildfly/customizer/CustomizerJVM.java | 14 +-
.../wildfly/customizer/CustomizerSupport.java | 0
.../wildfly/customizer/WildflyTabVisualPanel.form | 0
.../wildfly/customizer/WildflyTabVisualPanel.java | 63 ++-
.../wildfly/deploy/WildflyDeploymentStatus.java | 0
.../wildfly/deploy/WildflyProgressObject.java | 0
.../modules/javaee/wildfly/ide/Bundle.properties | 0
.../javaee/wildfly/ide/JBossJaxWsStack.java | 46 +--
.../modules/javaee/wildfly/ide/JpaSupportImpl.java | 0
.../javaee/wildfly/ide/WildFlyFindJSPServlet.java | 22 +-
.../wildfly/ide/WildFlyInstanceDescriptor.java | 0
.../wildfly/ide/WildflyDeploymentStatus.java | 4 +-
.../wildfly/ide/WildflyIncrementalDeployment.java | 0
.../wildfly/ide/WildflyJ2eePlatformFactory.java | 2 +-
.../wildfly/ide/WildflyJdbcDriverDeployer.java | 0
.../modules/javaee/wildfly/ide/WildflyKiller.java | 0
.../WildflyOptionalDeploymentManagerFactory.java | 0
.../javaee/wildfly/ide/WildflyOutputSupport.java | 0
.../javaee/wildfly/ide/WildflyProgressObject.java | 2 +-
.../javaee/wildfly/ide/WildflyStartRunnable.java | 6 +-
.../javaee/wildfly/ide/WildflyStartServer.java | 10 +-
.../javaee/wildfly/ide/WildflyStopRunnable.java | 1 -
.../wildfly/ide/commands/Authentication.java | 2 +-
.../javaee/wildfly/ide/commands/Constants.java | 0
.../javaee/wildfly/ide/commands/WildflyClient.java | 0
.../ide/commands/WildflyExplodedDeployer.java | 0
.../wildfly/ide/commands/WildflyManagementAPI.java | 2 +-
.../javaee/wildfly/ide/commands/WildflyModule.java | 0
.../wildfly/ide/ui/AddServerLocationPanel.java | 0
.../ide/ui/AddServerLocationVisualPanel.java | 0
.../wildfly/ide/ui/AddServerPropertiesPanel.java | 0
.../ide/ui/AddServerPropertiesVisualPanel.java | 5 -
.../javaee/wildfly/ide/ui/Bundle.properties | 0
.../ide/ui/WildflyInstantiatingIterator.java | 0
.../wildfly/ide/ui/WildflyPluginProperties.java | 0
.../javaee/wildfly/ide/ui/WildflyPluginUtils.java | 18 +-
.../javaee/wildfly/nodes/AbstractStateNode.java | 10 +-
.../modules/javaee/wildfly/nodes/Bundle.properties | 0
.../wildfly/nodes/SimplePropertySupport.java | 2 +-
.../modules/javaee/wildfly/nodes/Util.java | 0
.../wildfly/nodes/WildflyApplicationsChildren.java | 0
.../javaee/wildfly/nodes/WildflyAsyncChildren.java | 0
.../nodes/WildflyConnectionFactoriesChildren.java | 0
.../nodes/WildflyConnectionFactoryNode.java | 6 +-
.../wildfly/nodes/WildflyDatasourceNode.java | 0
.../wildfly/nodes/WildflyDatasourcesChildren.java | 0
.../wildfly/nodes/WildflyDeploymentChildren.java | 0
.../wildfly/nodes/WildflyDestinationNode.java | 2 +-
.../wildfly/nodes/WildflyDestinationsChildren.java | 0
.../wildfly/nodes/WildflyEarApplicationNode.java | 0
.../nodes/WildflyEarApplicationsChildren.java | 0
.../wildfly/nodes/WildflyEarModulesChildren.java | 2 +-
.../wildfly/nodes/WildflyEjbComponentNode.java | 20 +-
.../nodes/WildflyEjbComponentsChildren.java | 0
.../javaee/wildfly/nodes/WildflyEjbModuleNode.java | 10 +-
.../wildfly/nodes/WildflyEjbModulesChildren.java | 0
.../javaee/wildfly/nodes/WildflyItemNode.java | 0
.../nodes/WildflyJaxrsResourceMethodsChildren.java | 0
.../wildfly/nodes/WildflyJaxrsResourceNode.java | 2 +-
.../javaee/wildfly/nodes/WildflyJmsChildren.java | 6 +-
.../wildfly/nodes/WildflyMailSessionNode.java | 0
.../wildfly/nodes/WildflyMailSessionsChildren.java | 0
.../javaee/wildfly/nodes/WildflyManagerNode.java | 0
.../wildfly/nodes/WildflyRegistryNodeFactory.java | 0
.../wildfly/nodes/WildflyResourceAdapterNode.java | 0
.../nodes/WildflyResourceAdaptersChildren.java | 0
.../wildfly/nodes/WildflyResourcesChildren.java | 0
.../wildfly/nodes/WildflyResourcesItemNode.java | 3 +-
.../javaee/wildfly/nodes/WildflyTargetNode.java | 4 +-
.../nodes/WildflyWebApplicationsChildren.java | 0
.../javaee/wildfly/nodes/WildflyWebModuleNode.java | 0
.../javaee/wildfly/nodes/actions/Bundle.properties | 0
.../wildfly/nodes/actions/KillServerAction.java | 4 +-
.../wildfly/nodes/actions/OpenServerLogAction.java | 0
.../wildfly/nodes/actions/OpenURLAction.java | 18 +-
.../wildfly/nodes/actions/OpenURLActionCookie.java | 2 +-
.../nodes/actions/RefreshModulesAction.java | 0
.../nodes/actions/RefreshModulesCookie.java | 4 +-
.../javaee/wildfly/nodes/actions/Refreshable.java | 0
.../javaee/wildfly/nodes/actions/ResourceType.java | 2 +-
.../wildfly/nodes/actions/ShowAdminToolAction.java | 0
.../wildfly/nodes/actions/StartModuleAction.java | 16 +-
.../wildfly/nodes/actions/StartModuleCookie.java | 6 +-
.../nodes/actions/StartModuleCookieImpl.java | 0
.../wildfly/nodes/actions/StopModuleAction.java | 16 +-
.../wildfly/nodes/actions/StopModuleCookie.java | 6 +-
.../nodes/actions/StopModuleCookieImpl.java | 0
.../nodes/actions/UndeployModuleAction.java | 14 +-
.../nodes/actions/UndeployModuleCookie.java | 4 +-
.../nodes/actions/UndeployModuleCookieImpl.java | 4 +-
.../nodes/actions/WildflyEditConfigAction.java | 0
.../javaee/wildfly/resources/Bundle.properties | 0
.../javaee/wildfly/resources/EntityBean.png | Bin
.../javaee/wildfly/resources/MessageBean.png | Bin
.../javaee/wildfly/resources/ResNodeNodeIcon.gif | Bin
.../javaee/wildfly/resources/SessionBean.png | Bin
.../modules/javaee/wildfly/resources/XMLSchema.dtd | 449 +++++++++++++++++++++
.../modules/javaee/wildfly/resources/connector.gif | Bin
.../javaee/wildfly/resources/datasources_1_4_1.xsd | 182 ++++-----
.../modules/javaee/wildfly/resources/datatypes.dtd | 250 ++++++++++++
.../modules/javaee/wildfly/resources/eap.gif | Bin
.../modules/javaee/wildfly/resources/javaee_6.xsd | 8 +-
.../modules/javaee/wildfly/resources/javaee_8.xsd | 0
.../resources/javaee_web_services_client_1_3.xsd | 208 +++++-----
.../resources/javaee_web_services_client_1_4.xsd | 234 +++++------
.../modules/javaee/wildfly/resources/javamail.gif | Bin
.../javaee/wildfly/resources/jboss-app_4_0_1.dtd | 13 +-
.../jboss-as-messaging-deployment_1_0_1.xsd | 0
.../wildfly/resources/jboss-client_4_0_1.dtd | 3 +-
.../wildfly/resources/jboss-common_6_0_1.xsd | 16 +-
.../javaee/wildfly/resources/jboss-common_8_1.xsd | 0
.../wildfly/resources/jboss-service_4_0_1.dtd | 0
.../javaee/wildfly/resources/jboss-web_14_1.xsd | 0
.../javaee/wildfly/resources/jboss-web_4_0_1.dtd | 16 +-
.../javaee/wildfly/resources/jboss-web_7_3_1.xsd | 2 +-
.../javaee/wildfly/resources/jboss_4_0_1.dtd | 114 +++---
.../modules/javaee/wildfly/resources/jdbc.gif | Bin
.../modules/javaee/wildfly/resources/jms.gif | Bin
.../modules/javaee/wildfly/resources/jndi.gif | Bin
.../modules/javaee/wildfly/resources/jsp_2_3.xsd | 64 +--
.../modules/javaee/wildfly/resources/layer.xml | 4 +-
.../modules/javaee/wildfly/resources/method.png | Bin
.../modules/javaee/wildfly/resources/nbdep.xml | 0
.../javaee/wildfly/resources/restservice.png | Bin
.../modules/javaee/wildfly/resources/wait.gif | Bin
.../javaee/wildfly/resources/web-app_3_0.xsd | 31 +-
.../javaee/wildfly/resources/web-app_4_0.xsd | 0
.../javaee/wildfly/resources/web-common_3_0.xsd | 213 +++++-----
.../javaee/wildfly/resources/web-common_3_1.xsd | 246 +++++------
.../javaee/wildfly/resources/web-fragment_3_0.xsd | 31 +-
.../javaee/wildfly/resources/web-fragment_4_0.xsd | 0
...wildfly-messaging-activemq-deployment_1_0_1.xsd | 2 +-
.../modules/javaee/wildfly/resources/wildfly.png | Bin
.../modules/javaee/wildfly/resources/xml.xsd | 2 +-
.../modules/javaee/wildfly/util/PathUtil.java | 0
.../javaee/wildfly/util/ProgressEventSupport.java | 0
.../javaee/wildfly/util/WildFlyProperties.java | 4 +-
.../qa-functional/data/JBoss4EjbTest/build.xml | 44 +-
.../data/JBoss4EjbTest/nbproject/build-impl.xml | 4 +-
.../JBoss4EjbTest/nbproject/genfiles.properties | 0
.../JBoss4EjbTest/nbproject/project.properties | 0
.../data/JBoss4EjbTest/nbproject/project.xml | 0
.../data/JBoss4EjbTest/src/conf/MANIFEST.MF | 1 -
.../data/JBoss4EjbTest/src/conf/ejb-jar.xml | 0
.../data/JBoss4EjbTest/src/conf/jboss.xml | 0
.../src/java/ejb/SessionTest2Bean.java | 24 +-
.../src/java/ejb/SessionTest2Local.java | 4 +-
.../src/java/ejb/SessionTest2LocalBusiness.java | 2 +-
.../src/java/ejb/SessionTest2LocalHome.java | 6 +-
.../src/java/ejb/SessionTest2Remote.java | 4 +-
.../src/java/ejb/SessionTest2RemoteBusiness.java | 2 +-
.../src/java/ejb/SessionTest2RemoteHome.java | 6 +-
.../src/java/ejb/SessionTestBean.java | 24 +-
.../src/java/ejb/SessionTestLocal.java | 4 +-
.../src/java/ejb/SessionTestLocalBusiness.java | 2 +-
.../src/java/ejb/SessionTestLocalHome.java | 6 +-
.../qa-functional/data/JBoss4WebTest/build.xml | 38 +-
.../data/JBoss4WebTest/nbproject/build-impl.xml | 0
.../JBoss4WebTest/nbproject/genfiles.properties | 0
.../JBoss4WebTest/nbproject/project.properties | 0
.../data/JBoss4WebTest/nbproject/project.xml | 0
.../data/JBoss4WebTest/src/conf/MANIFEST.MF | 1 -
.../data/JBoss4WebTest/src/java/web/Test.java | 8 +-
.../data/JBoss4WebTest/web/WEB-INF/jboss-web.xml | 0
.../data/JBoss4WebTest/web/WEB-INF/web.xml | 0
.../data/JBoss4WebTest}/web/index.jsp | 2 +-
.../TestDeployDebugWebApp/nbproject/build-impl.xml | 0
.../nbproject/genfiles.properties | 0
.../nbproject/project.properties | 0
.../TestDeployDebugWebApp/nbproject/project.xml | 0
.../TestDeployDebugWebApp/src/conf/MANIFEST.MF | 1 -
.../web/WEB-INF/jboss-web.xml | 0
.../data/TestDeployDebugWebApp/web/WEB-INF/web.xml | 0
.../data/TestDeployDebugWebApp}/web/index.jsp | 2 +-
.../netbeans/test/javaee/lib/ProgressOperator.java | 24 +-
.../src/org/netbeans/test/javaee/lib/Util.java | 37 +-
.../test/javaee/wildfly/JBossValidation.java | 94 ++---
.../wildfly/ide/ui/WildflyPluginUtilsTest.java | 0
nbbuild/cluster.properties | 1 +
235 files changed, 1906 insertions(+), 1223 deletions(-)
diff --git a/contrib/javaee.wildfly/build.xml b/enterprise/javaee.wildfly/build.xml
similarity index 93%
rename from contrib/javaee.wildfly/build.xml
rename to enterprise/javaee.wildfly/build.xml
index 4c451ed..4dc7be4 100644
--- a/contrib/javaee.wildfly/build.xml
+++ b/enterprise/javaee.wildfly/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="contrib/javaee.wildfly">
+<project basedir="." default="build" name="enterprise/javaee.wildfly">
<import file="../../nbbuild/templates/projectized.xml"/>
<property name="resources.dir" value="./src/org/netbeans/modules/javaee/wildfly/resources/"/>
diff --git a/contrib/javaee.wildfly/licenseinfo.xml b/enterprise/javaee.wildfly/licenseinfo.xml
similarity index 95%
rename from contrib/javaee.wildfly/licenseinfo.xml
rename to enterprise/javaee.wildfly/licenseinfo.xml
index dd841ae..8e7121e 100644
--- a/contrib/javaee.wildfly/licenseinfo.xml
+++ b/enterprise/javaee.wildfly/licenseinfo.xml
@@ -41,6 +41,8 @@
</fileset>
<fileset>
<file>src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd</file>
+ <file>src/org/netbeans/modules/javaee/wildfly/resources/datatypes.dtd</file>
+ <file>src/org/netbeans/modules/javaee/wildfly/resources/XMLSchema.dtd</file>
<license ref="W3C2" />
<comment type="CATEGORY_B" />
</fileset>
diff --git a/contrib/javaee.wildfly/manifest.mf b/enterprise/javaee.wildfly/manifest.mf
similarity index 100%
rename from contrib/javaee.wildfly/manifest.mf
rename to enterprise/javaee.wildfly/manifest.mf
diff --git a/contrib/javaee.wildfly/nbproject/project.properties b/enterprise/javaee.wildfly/nbproject/project.properties
similarity index 100%
rename from contrib/javaee.wildfly/nbproject/project.properties
rename to enterprise/javaee.wildfly/nbproject/project.properties
diff --git a/contrib/javaee.wildfly/nbproject/project.xml b/enterprise/javaee.wildfly/nbproject/project.xml
similarity index 100%
rename from contrib/javaee.wildfly/nbproject/project.xml
rename to enterprise/javaee.wildfly/nbproject/project.xml
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ChangelogWildflyPlugin.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ChangelogWildflyPlugin.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ChangelogWildflyPlugin.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ChangelogWildflyPlugin.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
index 4068b8c..466165c 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
@@ -420,4 +420,3 @@ public class WildflyDeploymentFactory implements DeploymentFactory {
}
}
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyTargetModuleID.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyTargetModuleID.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyTargetModuleID.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyTargetModuleID.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WrappedTargetModuleID.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WrappedTargetModuleID.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WrappedTargetModuleID.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WrappedTargetModuleID.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/Bundle.properties
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/Bundle.properties
index eb10f41..595573c 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/Bundle.properties
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/Bundle.properties
@@ -65,4 +65,3 @@ MSG_NoPrefix=Message destination JNDI name {0} doesn't start with either 'queue/
MSG_CannotUpdateFile=Cannot update the {0} configuration file. Please make sure you \
have write access to this file.
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/CarDeploymentConfiguration.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/CarDeploymentConfiguration.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/CarDeploymentConfiguration.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/CarDeploymentConfiguration.java
index 9114b7f..1e34f70 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/CarDeploymentConfiguration.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/CarDeploymentConfiguration.java
@@ -55,7 +55,7 @@ import org.openide.util.lookup.Lookups;
*/
public class CarDeploymentConfiguration extends WildflyDeploymentConfiguration
implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfiguration, PropertyChangeListener {
-
+
private File jbossClientFile;
private JbossClient jbossClient;
@@ -82,7 +82,7 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
// appClient.addPropertyChangeListener(this);
// }
}
-
+
public void dispose() {
// TODO: rewrite
@@ -91,11 +91,11 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
// appClient.removePropertyChangeListener(this);
// }
}
-
+
public Lookup getLookup() {
return Lookups.fixed(this);
}
-
+
/**
* Return JbossClient graph. If it was not created yet, load it from the file
* and cache it. If the file does not exist, generate it.
@@ -134,7 +134,7 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
if (evt.getPropertyName() == DataObject.PROP_MODIFIED && evt.getNewValue() == Boolean.FALSE) {
if (evt.getSource() == deploymentDescriptorDO) { // dataobject has been modified, jbossWeb graph is out of sync
synchronized (this) {
- jbossClient = null;
+ jbossClient = null;
}
} else {
// super.propertyChange(evt);
@@ -178,7 +178,7 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
}
}
-
+
public void save(OutputStream os) throws ConfigurationException {
JbossClient jbossClientDD = getJbossClient();
if (jbossClientDD == null) {
@@ -192,9 +192,9 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
throw new ConfigurationException(msg, ioe);
}
}
-
+
// private helper methods -------------------------------------------------
-
+
/**
* Generate JbossWeb graph.
*/
@@ -203,10 +203,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
//jbossClientDD.setContextRoot(""); // NOI18N
return jbossClientDD;
}
-
+
/**
* Add a new resource reference.
- *
+ *
* @param name resource reference name
*/
private void addResReference(final String name) throws ConfigurationException {
@@ -231,10 +231,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
});
}
-
+
/**
* Add a new mail service reference.
- *
+ *
* @param name mail service name
*/
private void addMailReference(final String name) throws ConfigurationException {
@@ -259,10 +259,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
});
}
-
+
/**
* Add a new connection factory reference.
- *
+ *
* @param name connection factory name
*/
private void addConnectionFactoryReference(final String name) throws ConfigurationException {
@@ -287,10 +287,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
});
}
-
+
/**
* Add a new ejb reference.
- *
+ *
* @param name ejb reference name
*/
private void addEjbReference(final String name) throws ConfigurationException {
@@ -315,10 +315,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
});
}
-
+
/**
* Add a new jndi-name.
- *
+ *
* @param name jndi-name name
*/
private void setJndiName(final String jndiName) throws ConfigurationException {
@@ -328,10 +328,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
});
}
-
+
/**
* Add a new service reference.
- *
+ *
* @param name service reference name
*/
private void addServiceReference(final String name) throws ConfigurationException {
@@ -353,7 +353,7 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
}
});
}
-
+
/**
* Perform jbossWeb changes defined by the jbossWeb modifier. Update editor
* content and save changes, if appropriate.
@@ -369,7 +369,7 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
if (doc == null) {
doc = editor.openDocument();
}
-
+
// get the up-to-date model
JbossClient newJbossClient = null;
try {
@@ -396,10 +396,10 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
// use the old graph
newJbossClient = oldJbossClient;
}
-
+
// perform changes
modifier.modify(newJbossClient);
-
+
// save, if appropriate
boolean modified = deploymentDescriptorDO.isModified();
ResourceConfigurationHelper.replaceDocument(doc, newJbossClient);
@@ -420,9 +420,9 @@ implements ModuleConfiguration, DatasourceConfiguration, DeploymentPlanConfigura
throw new ConfigurationException(msg, ioe);
}
}
-
+
// private helper interface -----------------------------------------------
-
+
private interface JbossClientModifier {
void modify(JbossClient modifiedJbossClient);
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EarDeploymentConfiguration.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EarDeploymentConfiguration.java
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EarDeploymentConfiguration.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EarDeploymentConfiguration.java
index 6d2d5c0..875e3e7 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EarDeploymentConfiguration.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EarDeploymentConfiguration.java
@@ -42,9 +42,9 @@ import org.openide.util.lookup.Lookups;
*
* @author sherold
*/
-public class EarDeploymentConfiguration extends WildflyDeploymentConfiguration
+public class EarDeploymentConfiguration extends WildflyDeploymentConfiguration
implements ModuleConfiguration, DeploymentPlanConfiguration {
-
+
private File jbossAppFile;
private JbossApp jbossApp;
@@ -53,7 +53,7 @@ implements ModuleConfiguration, DeploymentPlanConfiguration {
}
/**
- * Creates a new instance of EarDeploymentConfiguration
+ * Creates a new instance of EarDeploymentConfiguration
*/
public EarDeploymentConfiguration(J2eeModule j2eeModule, WildflyPluginUtils.Version version, boolean isWildFly) {
super(j2eeModule, version, isWildFly);
@@ -67,16 +67,16 @@ implements ModuleConfiguration, DeploymentPlanConfiguration {
}
}
}
-
+
@Override
public void dispose() {
}
-
+
@Override
public Lookup getLookup() {
return Lookups.fixed(this);
}
-
+
/**
* Return jbossApp graph. If it was not created yet, load it from the file
* and cache it. If the file does not exist, generate it.
@@ -106,7 +106,7 @@ implements ModuleConfiguration, DeploymentPlanConfiguration {
}
return jbossApp;
}
-
+
@Override
public void save(OutputStream os) throws ConfigurationException {
JbossApp jbossApp = getJbossApp();
@@ -121,13 +121,13 @@ implements ModuleConfiguration, DeploymentPlanConfiguration {
throw new ConfigurationException(msg, ioe);
}
}
-
+
// private helper methods -------------------------------------------------
-
+
/**
* Genereate Context graph.
*/
private JbossApp genereatejbossApp() {
return new JbossApp();
- }
+ }
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EjbDeploymentConfiguration.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EjbDeploymentConfiguration.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EjbDeploymentConfiguration.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/EjbDeploymentConfiguration.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossDataSourceRefModifier.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossDataSourceRefModifier.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossDataSourceRefModifier.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossDataSourceRefModifier.java
index eb6801b..cbccb1e 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossDataSourceRefModifier.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossDataSourceRefModifier.java
@@ -62,10 +62,10 @@ final class JBossDataSourceRefModifier {
addEntityResReference(modifiedJboss, resRefName, beanNames, jndiName);
}
}
-
+
/**
* Add a new resource reference to the session beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param resRefName resource reference name
* @param sessionNames the sessions (ejb-name value) which might need to add resource reference specified by resRefName
@@ -76,7 +76,7 @@ final class JBossDataSourceRefModifier {
List/*<Session>*/ sesssionsWithoutReference = new LinkedList();
EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();
-
+
Session[] sessions = eb.getSession();
for (int i = 0; i < sessions.length; i++) {
String ejbName = sessions[i].getEjbName();
@@ -94,7 +94,7 @@ final class JBossDataSourceRefModifier {
}
}
- //no session tag yet (sessions.length == 0) or
+ //no session tag yet (sessions.length == 0) or
//there are sessions in sessionNames which were not found among the existing ones (those were not removed)
for (Iterator it = sessionNames.iterator(); it.hasNext(); ) {
String sessionName = (String)it.next();
@@ -119,10 +119,10 @@ final class JBossDataSourceRefModifier {
}
}
-
+
/**
* Add a new resource reference to the entity beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param resRefName resource reference name
* @param entityNames the entities (ejb-name value) which might need to add resource reference specified by resRefName
@@ -151,7 +151,7 @@ final class JBossDataSourceRefModifier {
}
}
- //no entity tag yet (entities.length == 0) or
+ //no entity tag yet (entities.length == 0) or
//there are entities in entityNames which were not found among the existing ones (those were not removed)
for (Iterator it = entityNames.iterator(); it.hasNext(); ) {
String entityName = (String)it.next();
@@ -176,7 +176,7 @@ final class JBossDataSourceRefModifier {
}
}
-
+
/**
* Add a reference to the given resource to the message-driven beans if it does not exist yet.
*
@@ -185,7 +185,7 @@ final class JBossDataSourceRefModifier {
* @param beans the bean names (ejb-name) mapped to the message destinations (message-destination-link)
* which might need to add resource reference specified by resRefName
* @param jndiName JNDI name of the resource
- *
+ *
* @deprecated
*/
static void modifyMsgDrv(Jboss modifiedJboss, String resRefName, Map beans, String jndiName) {
@@ -197,16 +197,16 @@ final class JBossDataSourceRefModifier {
addMsgDrvResReference(modifiedJboss, resRefName, beans, jndiName);
}
-
+
/**
* Add a new resource reference to the message-driven beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param resRefName resource reference name
* @param beans the bean names (ejb-name) mapped to the message destinations (message-destination-link)
* which might need to add resource reference specified by resRefName
* @param jndiName JNDI name of the resource
- *
+ *
* @deprecated
*/
private static void addMsgDrvResReference(Jboss modifiedJboss, String resRefName, Map beans, String jndiName) {
@@ -232,7 +232,7 @@ final class JBossDataSourceRefModifier {
}
}
- //no message-driven tag yet (msgDrivens.length == 0) or
+ //no message-driven tag yet (msgDrivens.length == 0) or
//there are MDBs in beans map which were not found among the existing ones (those were not removed)
for (Iterator it = beans.entrySet().iterator(); it.hasNext(); ) {
Map.Entry entry = (Map.Entry) it.next();
@@ -273,7 +273,7 @@ final class JBossDataSourceRefModifier {
addMsgDrvResReference(modifiedJboss, resRefName, mdbName, jndiName);
}
-
+
private static void addMsgDrvResReference(Jboss modifiedJboss, String resRefName, String mdbName, String jndiName) {
EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();
@@ -297,5 +297,5 @@ final class JBossDataSourceRefModifier {
}
}
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossEjbRefModifier.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossEjbRefModifier.java
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossEjbRefModifier.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossEjbRefModifier.java
index b4d307a..5386824 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossEjbRefModifier.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossEjbRefModifier.java
@@ -62,22 +62,22 @@ final class JBossEjbRefModifier {
addEntityEjbReference(modifiedJboss, ejbRefName, referencedEjbName, beanNames);
}
}
-
+
/**
* Add a new ejb reference to the session beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param ejbRefName ejb reference name
* @param referencedEjbName name of the referenced EJB
* @param sessionNames the sessions (ejb-name value) which might need to add ejb reference specified by ejbRefName
*/
- private static void addSessionEjbReference(Jboss modifiedJboss, String ejbRefName,
+ private static void addSessionEjbReference(Jboss modifiedJboss, String ejbRefName,
String referencedEjbName, Set sessionNames) {
List/*<Session>*/ sesssionsWithoutReference = new LinkedList();
EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();
-
+
Session[] sessions = eb.getSession();
for (int i = 0; i < sessions.length; i++) {
String ejbName = sessions[i].getEjbName();
@@ -95,7 +95,7 @@ final class JBossEjbRefModifier {
}
}
- //no session tag yet (sessions.length == 0) or
+ //no session tag yet (sessions.length == 0) or
//there are sessions in sessionNames which were not found among the existing ones (those were not removed)
for (Iterator it = sessionNames.iterator(); it.hasNext(); ) {
String sessionName = (String)it.next();
@@ -120,10 +120,10 @@ final class JBossEjbRefModifier {
}
}
-
+
/**
* Add a new ejb reference to the entity beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param ejbRefName ejb reference name
* @param referencedEjbName name of the referenced EJB
@@ -153,7 +153,7 @@ final class JBossEjbRefModifier {
}
}
- //no entity tag yet (entities.length == 0) or
+ //no entity tag yet (entities.length == 0) or
//there are entities in entityNames which were not found among the existing ones (those were not removed)
for (Iterator it = entityNames.iterator(); it.hasNext(); ) {
String entityName = (String)it.next();
@@ -186,7 +186,7 @@ final class JBossEjbRefModifier {
* @param ejbRefName ejb reference name
* @param beans the bean names (ejb-name) mapped to the message destinations (message-destination-link)
* which might need to add ejb reference specified by ejbRefName
- *
+ *
* @deprecated
*/
static void modifyMsgDrv(Jboss modifiedJboss, String ejbRefName, Map beans) {
@@ -201,12 +201,12 @@ final class JBossEjbRefModifier {
/**
* Add a new ejb reference to the message-driven beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param ejbRefName ejb reference name
* @param beans the bean names (ejb-name) mapped to the message destinations (message-destination-link)
* which might need to add ejb reference specified by ejbRefName
- *
+ *
* @deprecated
*/
private static void addMsgDrvEjbReference(Jboss modifiedJboss, String ejbRefName, Map beans) {
@@ -232,7 +232,7 @@ final class JBossEjbRefModifier {
}
}
- //no message-driven tag yet (msgDrivens.length == 0) or
+ //no message-driven tag yet (msgDrivens.length == 0) or
//there are MDBs in beans map which were not found among the existing ones (those were not removed)
for (Iterator it = beans.entrySet().iterator(); it.hasNext(); ) {
Map.Entry entry = (Map.Entry) it.next();
@@ -267,7 +267,7 @@ final class JBossEjbRefModifier {
* @param ejbRefName ejb reference name
* @param referencedEjbName name of the referenced EJB
*/
- static void modifyMsgDrv(Jboss modifiedJboss, String mdbName,
+ static void modifyMsgDrv(Jboss modifiedJboss, String mdbName,
String ejbRefName, String referencedEjbName) {
if (modifiedJboss.getEnterpriseBeans() == null)
@@ -278,7 +278,7 @@ final class JBossEjbRefModifier {
/**
* Add a new ejb reference to the message-driven beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param mdbName the MDB (ejb-name value) which might need to add EJB
* reference specified by ejbRefName
@@ -309,5 +309,5 @@ final class JBossEjbRefModifier {
}
}
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossMsgDestRefModifier.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossMsgDestRefModifier.java
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossMsgDestRefModifier.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossMsgDestRefModifier.java
index e7cab8f..95ce220 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossMsgDestRefModifier.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/JBossMsgDestRefModifier.java
@@ -49,7 +49,7 @@ final class JBossMsgDestRefModifier {
* @param destPrefix prefix of the message destination
* @param destName message destination name
*/
- static void modify(Jboss modifiedJboss, String msgDestRefName, Set beanNames,
+ static void modify(Jboss modifiedJboss, String msgDestRefName, Set beanNames,
BEAN_TYPE beanType, String destPrefix, String destName) {
assert(beanNames.size() > 0);
@@ -64,23 +64,23 @@ final class JBossMsgDestRefModifier {
addEntityMsgDestReference(modifiedJboss, msgDestRefName, beanNames, destPrefix, destName);
}
}
-
+
/**
* Add a new message destination reference to the session beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param resRefName message destination reference name
* @param sessionNames the sessions (ejb-name value) which might need to add message destination reference specified by msgDestRefName
* @param destPrefix prefix of the message destination
* @param destName message destination name
*/
- private static void addSessionMsgDestReference(Jboss modifiedJboss, String msgDestRefName,
+ private static void addSessionMsgDestReference(Jboss modifiedJboss, String msgDestRefName,
Set sessionNames, String destPrefix, String destName) {
List/*<Session>*/ sesssionsWithoutReference = new LinkedList();
EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();
-
+
Session[] sessions = eb.getSession();
for (int i = 0; i < sessions.length; i++) {
String ejbName = sessions[i].getEjbName();
@@ -98,7 +98,7 @@ final class JBossMsgDestRefModifier {
}
}
- //no session tag yet (sessions.length == 0) or
+ //no session tag yet (sessions.length == 0) or
//there are sessions in sessionNames which were not found among the existing ones (those were not removed)
for (Iterator it = sessionNames.iterator(); it.hasNext(); ) {
String sessionName = (String)it.next();
@@ -124,17 +124,17 @@ final class JBossMsgDestRefModifier {
}
}
-
+
/**
* Add a new message destination reference to the entity beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param resRefName message destination reference name
* @param sessionNames the entities (ejb-name value) which might need to add message destination reference specified by msgDestRefName
* @param destPrefix prefix of the message destination
* @param destName message destination name
*/
- private static void addEntityMsgDestReference(Jboss modifiedJboss, String msgDestRefName,
+ private static void addEntityMsgDestReference(Jboss modifiedJboss, String msgDestRefName,
Set entityNames, String destPrefix, String destName) {
List/*<Entity>*/ entitiesWithoutReference = new LinkedList();
@@ -158,7 +158,7 @@ final class JBossMsgDestRefModifier {
}
}
- //no entity tag yet (entities.length == 0) or
+ //no entity tag yet (entities.length == 0) or
//there are entities in entityNames which were not found among the existing ones (those were not removed)
for (Iterator it = entityNames.iterator(); it.hasNext(); ) {
String entityName = (String)it.next();
@@ -184,7 +184,7 @@ final class JBossMsgDestRefModifier {
}
}
-
+
/**
* Add a reference to the given message destination to the message-driven beans if it does not exist yet.
*
@@ -192,7 +192,7 @@ final class JBossMsgDestRefModifier {
* @param msgDestRefName message destination reference name
* @param beans the beans (ejb-name value) which might need to add message destination reference specified by msgDestRefName
* @param destPrefix prefix of the message destination
- *
+ *
* @deprecated
*/
static void modifyMsgDrv(Jboss modifiedJboss, String msgDestRefName, Map beans, String destPrefix) {
@@ -204,15 +204,15 @@ final class JBossMsgDestRefModifier {
addMsgDrvMsgDestReference(modifiedJboss, msgDestRefName, beans, destPrefix);
}
-
+
/**
* Add a new message destination reference to the message-driven beans without it.
- *
+ *
* @param modifiedJboss Jboss instance being modified
* @param msgDestRefName message destination reference name
* @param beans the beans (ejb-name value) which might need to add message destination reference specified by msgDestRefName
* @param destPrefix prefix of the message destination
- *
+ *
* @deprecated
*/
private static void addMsgDrvMsgDestReference(Jboss modifiedJboss, String msgDestRefName, Map beans, String destPrefix) {
@@ -238,7 +238,7 @@ final class JBossMsgDestRefModifier {
}
}
- //no message-driven tag yet (msgDrivens.length == 0) or
+ //no message-driven tag yet (msgDrivens.length == 0) or
//there are MDBs in beans map which were not found among the existing ones (those were not removed)
for (Iterator it = beans.entrySet().iterator(); it.hasNext(); ) {
Map.Entry entry = (Map.Entry) it.next();
@@ -264,18 +264,18 @@ final class JBossMsgDestRefModifier {
}
}
-
+
/**
* Add a reference to the given message destination to the message-driven beans if it does not exist yet.
*
* @param modifiedJboss Jboss graph instance being modified
* @param msgDestRefName message destination reference name
- * @param mdbName the MDB (ejb-name value) which might need to add message
+ * @param mdbName the MDB (ejb-name value) which might need to add message
* destination reference specified by msgDestRefName
* @param destPrefix prefix of the message destination
* @param destName message destination name
*/
- static void modifyMsgDrv(Jboss modifiedJboss, String msgDestRefName,
+ static void modifyMsgDrv(Jboss modifiedJboss, String msgDestRefName,
String mdbName, String destPrefix, String destName) {
if (modifiedJboss.getEnterpriseBeans() == null)
@@ -283,8 +283,8 @@ final class JBossMsgDestRefModifier {
addMsgDrvMsgDestReference(modifiedJboss, msgDestRefName, mdbName, destPrefix, destName);
}
-
- private static void addMsgDrvMsgDestReference(Jboss modifiedJboss, String msgDestRefName,
+
+ private static void addMsgDrvMsgDestReference(Jboss modifiedJboss, String msgDestRefName,
String mdbName, String destPrefix, String destName) {
EnterpriseBeans eb = modifiedJboss.getEnterpriseBeans();
@@ -309,9 +309,9 @@ final class JBossMsgDestRefModifier {
}
}
}
-
+
private static String getJndiName(String destName, String destPrefix) {
return destPrefix + destName;
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ProgressObjectSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ProgressObjectSupport.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ProgressObjectSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ProgressObjectSupport.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ResourceConfigurationHelper.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ResourceConfigurationHelper.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ResourceConfigurationHelper.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ResourceConfigurationHelper.java
index ea946ac..ddc0891 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ResourceConfigurationHelper.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ResourceConfigurationHelper.java
@@ -45,7 +45,7 @@ public class ResourceConfigurationHelper {
private static final Logger LOGGER = Logger.getLogger(ResourceConfigurationHelper.class.getName());
private ResourceConfigurationHelper() {
}
-
+
public static void writeFile(final File file, final BaseBean bean) throws ConfigurationException {
assert file != null : "File to write can't be null"; // NOI18N
assert file.getParentFile() != null : "File parent folder can't be null"; // NOI18N
@@ -83,7 +83,7 @@ public class ResourceConfigurationHelper {
if (os != null) {
try { os.close(); } catch(IOException ioe) {}
}
- if (lock != null)
+ if (lock != null)
lock.releaseLock();
}
}
@@ -92,7 +92,7 @@ public class ResourceConfigurationHelper {
throw new ConfigurationException (e.getLocalizedMessage ());
}
}
-
+
/**
* Replace the content of the document by the graph.
*/
@@ -114,5 +114,5 @@ public class ResourceConfigurationHelper {
}
});
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WarDeploymentConfiguration.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WarDeploymentConfiguration.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WarDeploymentConfiguration.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WarDeploymentConfiguration.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyConnectionFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyConnectionFactory.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyConnectionFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyConnectionFactory.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasource.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasource.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasource.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasource.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasourceManager.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasourceManager.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasourceManager.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDatasourceManager.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDeploymentConfiguration.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDeploymentConfiguration.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDeploymentConfiguration.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyDeploymentConfiguration.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyJaxrsResource.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyJaxrsResource.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyJaxrsResource.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyJaxrsResource.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMailSessionResource.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMailSessionResource.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMailSessionResource.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMailSessionResource.java
index 056db54..864c8ea 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMailSessionResource.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMailSessionResource.java
@@ -62,7 +62,7 @@ public class WildflyMailSessionResource {
public String getHostName() {
return socket.getHost();
}
-
+
public String getUserName() {
return userName;
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestination.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestination.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestination.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestination.java
index b7fc33a..b10c858 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestination.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestination.java
@@ -34,7 +34,7 @@ public class WildflyMessageDestination implements MessageDestination {
private final String name;
private final Set<String> jndiNames = new HashSet<String>(1);
private final Type type;
-
+
public WildflyMessageDestination(String name, Type type) {
this.name = name;
this.type = type;
@@ -49,13 +49,13 @@ public class WildflyMessageDestination implements MessageDestination {
public Type getType() {
return type;
}
-
+
public void addEntry(String jndiName) {
jndiNames.add(jndiName);
}
-
+
public Set<String> getJndiNames() {
return jndiNames;
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestinationManager.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestinationManager.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestinationManager.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyMessageDestinationManager.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyModuleConfigurationFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyModuleConfigurationFactory.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyModuleConfigurationFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyModuleConfigurationFactory.java
index e27c6d1..34a9773 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyModuleConfigurationFactory.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyModuleConfigurationFactory.java
@@ -30,15 +30,15 @@ import org.netbeans.modules.javaee.wildfly.ide.ui.WildflyPluginUtils.Version;
/**
* JBoss implementation of the ModuleConfigurationFactory.
- *
+ *
* @author sherold
*/
public class WildflyModuleConfigurationFactory implements ModuleConfigurationFactory2 {
-
+
/** Creates a new instance of JBModuleConfigurationFactory */
public WildflyModuleConfigurationFactory() {
}
-
+
@Override
public ModuleConfiguration create(J2eeModule j2eeModule) throws ConfigurationException {
if (J2eeModule.Type.WAR.equals(j2eeModule.getType())) {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyResourceAdapter.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyResourceAdapter.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyResourceAdapter.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflyResourceAdapter.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflySocket.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflySocket.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflySocket.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflySocket.java
index b68af82..d7fc17d 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflySocket.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildflySocket.java
@@ -72,6 +72,6 @@ public class WildflySocket {
public void setSourceInterface(String sourceInterface) {
this.sourceInterface = sourceInterface;
}
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildlfyModuleConfigurationFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildlfyModuleConfigurationFactory.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildlfyModuleConfigurationFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildlfyModuleConfigurationFactory.java
index a0caf85..1c229c5 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildlfyModuleConfigurationFactory.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/WildlfyModuleConfigurationFactory.java
@@ -30,15 +30,15 @@ import org.netbeans.modules.javaee.wildfly.ide.ui.WildflyPluginUtils.Version;
/**
* JBoss implementation of the ModuleConfigurationFactory.
- *
+ *
* @author sherold
*/
public class WildlfyModuleConfigurationFactory implements ModuleConfigurationFactory2 {
-
+
/** Creates a new instance of JBModuleConfigurationFactory */
public WildlfyModuleConfigurationFactory() {
}
-
+
@Override
public ModuleConfiguration create(J2eeModule j2eeModule) throws ConfigurationException {
if (J2eeModule.Type.WAR.equals(j2eeModule.getType())) {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/DatasourceSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/DatasourceSupport.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/DatasourceSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/DatasourceSupport.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/gen/package-info.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/gen/package-info.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/gen/package-info.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/ds/gen/package-info.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/package-info.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/package-info.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/package-info.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/package-info.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/wf10/package-info.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/wf10/package-info.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/wf10/package-info.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/gen/wf10/package-info.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupport.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupport.java
index 0658efd..a0ea163 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupport.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupport.java
@@ -31,5 +31,5 @@ public interface MessageDestinationSupport {
MessageDestination createMessageDestination(String name, MessageDestination.Type type) throws UnsupportedOperationException, ConfigurationException;
Set<MessageDestination> getMessageDestinations() throws ConfigurationException;
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupportImpl.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupportImpl.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupportImpl.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupportImpl.java
index 6347a85..7664a5c 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupportImpl.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/MessageDestinationSupportImpl.java
@@ -72,7 +72,7 @@ public class MessageDestinationSupportImpl implements MessageDestinationSupport
//destination service file object
private FileObject destinationsFO;
-
+
private WildflyDeploymentManager dm;
public MessageDestinationSupportImpl(File resourceDir, String moduleName) throws IOException {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/wf10/MessageDestinationSupportImpl.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/wf10/MessageDestinationSupportImpl.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/wf10/MessageDestinationSupportImpl.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/wf10/MessageDestinationSupportImpl.java
index ee434f0..a5fc2e5 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/wf10/MessageDestinationSupportImpl.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/mdb/wf10/MessageDestinationSupportImpl.java
@@ -75,7 +75,7 @@ public class MessageDestinationSupportImpl implements MessageDestinationSupport
//destination service file object
private FileObject destinationsFO;
-
+
private final WildflyDeploymentManager dm;
public MessageDestinationSupportImpl(File resourceDir, String moduleName) throws IOException {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/AbstractHierarchicalHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/AbstractHierarchicalHandler.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/AbstractHierarchicalHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/AbstractHierarchicalHandler.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ConfigurationParser.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ConfigurationParser.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ConfigurationParser.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ConfigurationParser.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDataSource.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDataSource.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDataSource.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDataSource.java
index 954a8d3..73fedd7 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDataSource.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDataSource.java
@@ -27,7 +27,7 @@ public class WildflyDataSource {
private String url;
private String username;
private String password;
- private String driver;
+ private String driver;
private String name;
private String jndiName;
@@ -81,5 +81,5 @@ public class WildflyDataSource {
public void setJndiName(String jndiName) {
this.jndiName = jndiName;
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourceHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourceHandler.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourceHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourceHandler.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourcesHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourcesHandler.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourcesHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDatasourcesHandler.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriver.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriver.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriver.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriver.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriverHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriverHandler.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriverHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriverHandler.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriversHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriversHandler.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriversHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriversHandler.java
index f0e0e42..7a11bd0 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriversHandler.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflyDriversHandler.java
@@ -33,7 +33,7 @@ import org.xml.sax.helpers.DefaultHandler;
public class WildflyDriversHandler extends AbstractHierarchicalHandler {
private final Map<String, WildflyDriver> drivers = new HashMap<String, WildflyDriver>();
-
+
private WildflyDriverHandler childHandler;
public WildflyDriversHandler(DefaultHandler parent, XMLReader parser) {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflySecurityHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflySecurityHandler.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflySecurityHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/ds/WildflySecurityHandler.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/jms/WildflyMessageDestinationHandler.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/jms/WildflyMessageDestinationHandler.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/jms/WildflyMessageDestinationHandler.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/jms/WildflyMessageDestinationHandler.java
index 123a18d..5b46b94 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/jms/WildflyMessageDestinationHandler.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/config/xml/jms/WildflyMessageDestinationHandler.java
@@ -39,7 +39,7 @@ public class WildflyMessageDestinationHandler extends DefaultHandler {
private boolean isDestination;
private final List<String> jndiNames = new ArrayList<String>();
-
+
private WildflyMessageDestination currentDestination;
public List<WildflyMessageDestination> getMessageDestinations() {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
index d1b6afc..8fc181a 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
@@ -32,7 +32,7 @@ import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl;
/**
* JBoss instance customizer which is accessible from server manager.
*
- *
+ *
*/
public class Customizer extends JTabbedPane {
@@ -77,11 +77,11 @@ public class Customizer extends JTabbedPane {
});
addTab(NbBundle.getMessage(Customizer.class,"TXT_Platform"), new WildflyTabVisualPanel(this.dmp));
addTab(NbBundle.getMessage(Customizer.class,"TXT_Platform"), new CustomizerJVM(custData));
- addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Classes"),
+ addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Classes"),
CustomizerSupport.createClassesCustomizer(custData.getClassModel()));
- addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Sources"),
+ addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Sources"),
CustomizerSupport.createSourcesCustomizer(custData.getSourceModel(), null));
- addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Javadoc"),
+ addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Javadoc"),
CustomizerSupport.createJavadocCustomizer(custData.getJavadocsModel(), null));
}
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerDataSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerDataSupport.java
similarity index 95%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerDataSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerDataSupport.java
index 8d56eef..c7d7413 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerDataSupport.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerDataSupport.java
@@ -41,41 +41,41 @@ import org.openide.util.Exceptions;
/**
- * Customizer data support keeps models for all the customizer components,
+ * Customizer data support keeps models for all the customizer components,
* initializes them, tracks model changes and performs save.
*
* @author sherold
*/
public class CustomizerDataSupport {
-
- // models
+
+ // models
private DefaultComboBoxModel jvmModel;
private Document javaOptsModel;
private ButtonModel proxyModel;
private CustomizerSupport.PathModel sourceModel;
private CustomizerSupport.PathModel classModel;
private CustomizerSupport.PathModel javadocModel;
-
- // model dirty flags
+
+ // model dirty flags
private boolean jvmModelFlag;
private boolean javaOptsModelFlag;
private boolean proxyModelFlag;
private boolean sourceModelFlag;
private boolean javadocModelFlag;
-
+
private WildFlyProperties properties;
-
+
/**
- * Creates a new instance of CustomizerDataSupport
+ * Creates a new instance of CustomizerDataSupport
*/
public CustomizerDataSupport(WildFlyProperties properties) {
this.properties = properties;
init();
}
-
+
/** Initialize the customizer models. */
private void init() {
-
+
// jvmModel
jvmModel = new DefaultComboBoxModel();
loadJvmModel();
@@ -84,14 +84,14 @@ public class CustomizerDataSupport {
jvmModelFlag = true;
store(); // This is just temporary until the server manager has OK and Cancel buttons
}
-
+
public void intervalAdded(ListDataEvent e) {
}
public void intervalRemoved(ListDataEvent e) {
}
});
-
+
// javaOptions
javaOptsModel = createDocument(properties.getJavaOpts());
javaOptsModel.addDocumentListener(new ModelChangeAdapter() {
@@ -100,7 +100,7 @@ public class CustomizerDataSupport {
store(); // This is just temporary until the server manager has OK and Cancel buttons
}
});
-
+
// proxyModel
proxyModel = createToggleButtonModel(properties.getProxyEnabled());
proxyModel.addItemListener(new ModelChangeAdapter() {
@@ -109,10 +109,10 @@ public class CustomizerDataSupport {
store(); // This is just temporary until the server manager has OK and Cancel buttons
}
});
-
+
// classModel
classModel = new CustomizerSupport.PathModel(properties.getClasses());
-
+
// sourceModel
sourceModel = new CustomizerSupport.PathModel(properties.getSources());
sourceModel.addListDataListener(new ModelChangeAdapter() {
@@ -121,7 +121,7 @@ public class CustomizerDataSupport {
store(); // This is just temporary until the server manager has OK and Cancel buttons
}
});
-
+
// javadocModel
javadocModel = new CustomizerSupport.PathModel(properties.getJavadocs());
javadocModel.addListDataListener(new ModelChangeAdapter() {
@@ -131,7 +131,7 @@ public class CustomizerDataSupport {
}
});
}
-
+
/** Update the jvm model */
public void loadJvmModel() {
JavaPlatformManager jpm = JavaPlatformManager.getDefault();
@@ -144,7 +144,7 @@ public class CustomizerDataSupport {
}
jvmModel.removeAllElements();
-
+
// feed the combo with sorted platform list
JavaPlatform[] j2sePlatforms = jpm.getPlatforms(null, new Specification("J2SE", null)); // NOI18N
JavaPlatformAdapter[] platformAdapters = new JavaPlatformAdapter[j2sePlatforms.length];
@@ -160,68 +160,68 @@ public class CustomizerDataSupport {
if (curPlatformName.equals(platformAdapter.getName())) {
jvmModel.setSelectedItem(platformAdapter);
}
- }
+ }
}
}
-
+
// model getters ----------------------------------------------------------
-
+
public DefaultComboBoxModel getJvmModel() {
return jvmModel;
}
-
+
public Document getJavaOptsModel() {
return javaOptsModel;
}
-
+
public ButtonModel getProxyModel() {
return proxyModel;
}
-
+
public CustomizerSupport.PathModel getClassModel() {
return classModel;
}
-
+
public CustomizerSupport.PathModel getSourceModel() {
return sourceModel;
}
-
+
public CustomizerSupport.PathModel getJavadocsModel() {
return javadocModel;
}
-
+
// private helper methods -------------------------------------------------
-
+
/** Save all changes */
private void store() {
-
+
if (jvmModelFlag) {
JavaPlatformAdapter platformAdapter = (JavaPlatformAdapter)jvmModel.getSelectedItem();
properties.setJavaPlatform(platformAdapter.getJavaPlatform());
jvmModelFlag = false;
}
-
+
if (javaOptsModelFlag) {
properties.setJavaOpts(getText(javaOptsModel));
javaOptsModelFlag = false;
}
-
+
if (proxyModelFlag) {
properties.setProxyEnabled(proxyModel.isSelected());
proxyModelFlag = false;
}
-
+
if (sourceModelFlag) {
properties.setSources(sourceModel.getData());
sourceModelFlag = false;
}
-
+
if (javadocModelFlag) {
properties.setJavadocs(javadocModel.getData());
javadocModelFlag = false;
}
}
-
+
/** Create a Document initialized by the specified text parameter, which may be null */
private Document createDocument(String text) {
PlainDocument doc = new PlainDocument();
@@ -234,7 +234,7 @@ public class CustomizerDataSupport {
}
return doc;
}
-
+
/** Get the text value from the document */
private String getText(Document doc) {
try {
@@ -244,25 +244,25 @@ public class CustomizerDataSupport {
return null;
}
}
-
+
/** Create a ToggleButtonModel inilialized by the specified selected parameter. */
private JToggleButton.ToggleButtonModel createToggleButtonModel(boolean selected) {
JToggleButton.ToggleButtonModel model = new JToggleButton.ToggleButtonModel();
model.setSelected(selected);
return model;
}
-
+
// private helper class ---------------------------------------------------
-
- /**
+
+ /**
* Adapter that implements several listeners, which is useful for dirty model
* monitoring.
*/
- private abstract class ModelChangeAdapter implements ListDataListener,
+ private abstract class ModelChangeAdapter implements ListDataListener,
DocumentListener, ItemListener, ChangeListener {
-
+
public abstract void modelChanged();
-
+
public void contentsChanged(ListDataEvent e) {
modelChanged();
}
@@ -295,27 +295,27 @@ public class CustomizerDataSupport {
modelChanged();
}
}
-
+
/** Java platform combo box model helper */
private static class JavaPlatformAdapter implements Comparable {
private JavaPlatform platform;
-
+
public JavaPlatformAdapter(JavaPlatform platform) {
this.platform = platform;
}
-
+
public JavaPlatform getJavaPlatform() {
return platform;
}
-
+
public String getName() {
return (String)platform.getProperties().get(WildFlyProperties.PLAT_PROP_ANT_NAME);
}
-
+
public String toString() {
return platform.getDisplayName();
}
-
+
public int compareTo(Object o) {
return toString().compareTo(o.toString());
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.form b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.form
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.form
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.form
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.java
index a339b5c..1616ac6 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerJVM.java
@@ -27,18 +27,18 @@ import org.netbeans.api.java.platform.PlatformsCustomizer;
* @author sherold
*/
public class CustomizerJVM extends javax.swing.JPanel {
-
+
private CustomizerDataSupport custData;
-
+
/** Creates new form CustomizerJVM */
public CustomizerJVM(CustomizerDataSupport custData) {
this.custData = custData;
initComponents();
-
+
// mnemonics generated in the guarded block do not work
proxyCheckBox.setMnemonic(org.openide.util.NbBundle.getMessage(CustomizerJVM.class, "MNE_Proxy").charAt(0));
}
-
+
/** This method is called from within the constructor to
* initialize the form.
* WARNING: Do NOT modify this code. The content of this method is
@@ -168,8 +168,8 @@ public class CustomizerJVM extends javax.swing.JPanel {
PlatformsCustomizer.showCustomizer(null);
custData.loadJvmModel();
}//GEN-LAST:event_jvmButtonActionPerformed
-
-
+
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
@@ -181,5 +181,5 @@ public class CustomizerJVM extends javax.swing.JPanel {
private javax.swing.JLabel jvmLabel;
private javax.swing.JCheckBox proxyCheckBox;
// End of variables declaration//GEN-END:variables
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/CustomizerSupport.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
similarity index 96%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
index 230986a..a747063 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
@@ -40,21 +40,21 @@ public final class WildflyTabVisualPanel extends JPanel {
* If you need to fire state changes or something similar, you can
* use this handle to do so.
*/
-
+
transient private final WildFlyProperties targetData;
transient private final WildflyDeploymentManager dm;
-
-
+
+
/**
* Creates new form WildflyTabVisualPanel
*/
public WildflyTabVisualPanel(DeploymentManager dm) {
this.dm = (WildflyDeploymentManager)dm;
- targetData = new WildFlyProperties(this.dm);
+ targetData = new WildFlyProperties(this.dm);
initComponents();
configFile.setText(targetData.getServerProfile());
-
-
+
+
configFile.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void changedUpdate(DocumentEvent e) {
@@ -70,19 +70,19 @@ public final class WildflyTabVisualPanel extends JPanel {
}
});
}
-
+
@Override
public String getName() {
return NbBundle.getMessage(WildflyTabVisualPanel.class,
"StepName_EnterDomainDirectory"); // NOI18N
}
-
-
-
+
+
+
String getParentDirectory() {
return configFile.getText();
}
-
+
// Event handling
//
private final Set/*<ChangeListener>*/ listeners = new HashSet/*<ChangeListener>*/(1);
@@ -106,33 +106,33 @@ public final class WildflyTabVisualPanel extends JPanel {
((ChangeListener)it.next()).stateChanged(ev);
}
}
-
+
void locationChanged() {
fireChangeEvent();
}
-
-
+
+
private String browseDomainLocation(){
String insLocation = null;
JFileChooser chooser = new JFileChooser();
-
+
decorateChooser(chooser,configFile.getText(),
NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_Choose_Domain")); //NOI18N
int returnValue = chooser.showDialog(this,
NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_Choose_Button")); //NOI18N
-
+
if(returnValue == JFileChooser.APPROVE_OPTION){
insLocation = chooser.getSelectedFile().getAbsolutePath();
}
return insLocation;
}
-
+
void decorateChooser(JFileChooser chooser,String fname,String title) {
chooser.setDialogTitle(title); //NOI18N
chooser.setDialogType(JFileChooser.CUSTOM_DIALOG);
-
+
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
chooser.setFileFilter(new FileFilter() {
@@ -146,18 +146,18 @@ public final class WildflyTabVisualPanel extends JPanel {
return "";
}
});
- chooser.setApproveButtonMnemonic(NbBundle.getMessage(WildflyTabVisualPanel.class,
+ chooser.setApproveButtonMnemonic(NbBundle.getMessage(WildflyTabVisualPanel.class,
"Choose_Button_Mnemonic").charAt(0)); //NOI18N
chooser.setMultiSelectionEnabled(false);
chooser.setAcceptAllFileFilterUsed(false);
- chooser.setApproveButtonToolTipText(NbBundle.getMessage(WildflyTabVisualPanel.class,
+ chooser.setApproveButtonToolTipText(NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_Chooser_Name")); //NOI18N
-
+
chooser.getAccessibleContext().
- setAccessibleName(NbBundle.getMessage(WildflyTabVisualPanel.class,
+ setAccessibleName(NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_Chooser_Name")); //NOI18N
chooser.getAccessibleContext().
- setAccessibleDescription(NbBundle.getMessage(WildflyTabVisualPanel.class,
+ setAccessibleDescription(NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_Chooser_Name")); //NOI18N
if (null != fname && fname.length() > 0) {
File sel = new File(fname);
@@ -167,9 +167,9 @@ public final class WildflyTabVisualPanel extends JPanel {
chooser.setSelectedFile(sel);
}
}
-
-
-
+
+
+
/** This method is called from within the constructor to
* initialize the form.
* WARNING: Do NOT modify this code. The content of this method is
@@ -241,15 +241,15 @@ public final class WildflyTabVisualPanel extends JPanel {
gridBagConstraints.weighty = 1.0;
add(spaceHack, gridBagConstraints);
}// </editor-fold>//GEN-END:initComponents
-
+
private void openInstanceDirectorySelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_openInstanceDirectorySelectorActionPerformed
String val = browseDomainLocation();
- dm.getInstanceProperties().setProperty(WildflyPluginProperties.PROPERTY_CONFIG_FILE, val);
+ dm.getInstanceProperties().setProperty(WildflyPluginProperties.PROPERTY_CONFIG_FILE, val);
if (null != val && val.length() >=1)
configFile.setText(val);
}//GEN-LAST:event_openInstanceDirectorySelectorActionPerformed
-
-
+
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JTextField configFile;
private javax.swing.JLabel description;
@@ -257,6 +257,5 @@ public final class WildflyTabVisualPanel extends JPanel {
private javax.swing.JLabel parentDirectoryLabel;
private javax.swing.JLabel spaceHack;
// End of variables declaration//GEN-END:variables
-
-}
+}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyDeploymentStatus.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyDeploymentStatus.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyDeploymentStatus.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyDeploymentStatus.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyProgressObject.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyProgressObject.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyProgressObject.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/deploy/WildflyProgressObject.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JBossJaxWsStack.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JBossJaxWsStack.java
similarity index 94%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JBossJaxWsStack.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JBossJaxWsStack.java
index d5d05fc..f96a85a 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JBossJaxWsStack.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JBossJaxWsStack.java
@@ -46,11 +46,11 @@ import org.netbeans.modules.websvc.wsstack.spi.WSToolImplementation;
*/
public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
private static final String JAXWS_TOOLS_JAR = "client/jaxws-tools.jar"; //NOI18N
-
+
private File root;
private String version;
private JaxWs jaxWs;
-
+
public JBossJaxWsStack(File root) {
this.root = root;
try {
@@ -91,28 +91,28 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
return new JaxWs.UriDescriptor() {
@Override
- public String getServiceUri(String applicationRoot, String serviceName,
- String portName, boolean isEjb)
+ public String getServiceUri(String applicationRoot, String serviceName,
+ String portName, boolean isEjb)
{
return applicationRoot+"/"+serviceName; //NOI18N
}
@Override
- public String getDescriptorUri(String applicationRoot,
- String serviceName, String portName, boolean isEjb)
+ public String getDescriptorUri(String applicationRoot,
+ String serviceName, String portName, boolean isEjb)
{
- return getServiceUri(applicationRoot, serviceName, portName,
+ return getServiceUri(applicationRoot, serviceName, portName,
isEjb)+"?wsdl"; //NOI18N
}
@Override
- public String getTesterPageUri(String host, String port,
- String applicationRoot, String serviceName, String portName,
- boolean isEjb)
+ public String getTesterPageUri(String host, String port,
+ String applicationRoot, String serviceName, String portName,
+ boolean isEjb)
{
return "";
}
-
+
};
}
@@ -120,7 +120,7 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
public boolean isFeatureSupported(Feature feature) {
if (feature == JaxWs.Feature.JSR109) {
return true;
- } else if (feature == JaxWs.Feature.WSIT && new File(root,
+ } else if (feature == JaxWs.Feature.WSIT && new File(root,
"client/jbossws-metro-wsit-tools.jar").exists()) //NOI18N
{
return true;
@@ -128,12 +128,12 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
return false;
}
}
-
+
private String resolveImplementationVersion() throws IOException {
// take webservices-tools.jar file
File wsToolsJar = new File(root, JAXWS_TOOLS_JAR);
-
- if (wsToolsJar.exists()) {
+
+ if (wsToolsJar.exists()) {
JarFile jarFile = new JarFile(wsToolsJar);
JarEntry entry = jarFile.getJarEntry("com/sun/tools/ws/version.properties"); //NOI18N
if (entry != null) {
@@ -149,11 +149,11 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
}
r.close();
return ver;
- }
+ }
}
return null;
}
-
+
private class JaxWsTool implements WSToolImplementation {
JaxWs.Tool tool;
JaxWsTool(JaxWs.Tool tool) {
@@ -167,16 +167,16 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
@Override
public URL[] getLibraries() {
-
+
File clientRoot = new File(root, "client"); // NOI18N
try {
File loggingJar = new File(clientRoot, "jboss-common-client.jar"); // NOI18N
if (!loggingJar.exists()) {
loggingJar = new File(clientRoot, "jboss-logging-spi.jar"); // NOI18N
}
-
+
File jaxWsAPILib = new File(clientRoot, "jboss-jaxws.jar"); // NOI18N
- // JBoss without jbossws
+ // JBoss without jbossws
if (jaxWsAPILib.exists()) {
return new URL[] {
new File(clientRoot, "wstx.jar").toURI().toURL(), // NOI18N
@@ -191,10 +191,10 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
}
jaxWsAPILib = new File(clientRoot, "jbossws-native-jaxws.jar"); // NOI18N
// JBoss+jbossws-native
- if (jaxWsAPILib.exists()) {
+ if (jaxWsAPILib.exists()) {
return new URL[] {
new File(clientRoot, "wstx.jar").toURI().toURL(), // NOI18N
- new File(clientRoot, "jaxws-tools.jar").toURI().toURL(), // NOI18N
+ new File(clientRoot, "jaxws-tools.jar").toURI().toURL(), // NOI18N
loggingJar.toURI().toURL(),
new File(clientRoot, "stax-api.jar").toURI().toURL(), // NOI18N
jaxWsAPILib.toURI().toURL(), // NOI18N
@@ -221,7 +221,7 @@ public class JBossJaxWsStack implements WSStackImplementation<JaxWs> {
}
return new URL[0];
}
-
+
}
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JpaSupportImpl.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JpaSupportImpl.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JpaSupportImpl.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/JpaSupportImpl.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyFindJSPServlet.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyFindJSPServlet.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyFindJSPServlet.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyFindJSPServlet.java
index a5f71cb..6e0d977 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyFindJSPServlet.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyFindJSPServlet.java
@@ -30,9 +30,9 @@ import org.netbeans.modules.javaee.wildfly.ide.ui.WildflyPluginProperties;
* @author Libor Kotouc
*/
public class WildFlyFindJSPServlet implements FindJSPServlet {
-
+
private final WildflyDeploymentManager dm;
-
+
public WildFlyFindJSPServlet(WildflyDeploymentManager manager) {
dm = manager;
}
@@ -53,14 +53,14 @@ public class WildFlyFindJSPServlet implements FindJSPServlet {
if (moduleContextPath.length() == 0) {
moduleContextPath = "/";
}
-
+
return moduleContextPath.replace('/', '_');
}
-
+
public String getServletResourcePath(String moduleContextPath, String jspResourcePath) {
String path = null;
-
+
String extension = jspResourcePath.substring(jspResourcePath.lastIndexOf("."));
if (".jsp".equals(extension)) { // NOI18N
String pkgName = getServletPackageName(jspResourcePath);
@@ -68,7 +68,7 @@ public class WildFlyFindJSPServlet implements FindJSPServlet {
String clzName = getServletClassName(jspResourcePath);
path = pkgPath + '/' + clzName + ".java"; // NOI18N
}
-
+
return path;
}
@@ -99,12 +99,12 @@ public class WildFlyFindJSPServlet implements FindJSPServlet {
}
}
return modClassName.toString();
- }
-
+ }
+
public String getServletEncoding(String moduleContextPath, String jspResourcePath) {
return "UTF8"; // NOI18N
}
-
-
-
+
+
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyInstanceDescriptor.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyInstanceDescriptor.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyInstanceDescriptor.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildFlyInstanceDescriptor.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyDeploymentStatus.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyDeploymentStatus.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyDeploymentStatus.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyDeploymentStatus.java
index 280cacf..397a31c 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyDeploymentStatus.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyDeploymentStatus.java
@@ -35,7 +35,7 @@ public class WildflyDeploymentStatus implements DeploymentStatus {
private final CommandType command;
private final StateType state;
private final String message;
-
+
/** Creates a new instance of JBDeploymentStatus */
public WildflyDeploymentStatus(ActionType action, CommandType command, StateType state, String message) {
this.action = action;
@@ -59,7 +59,7 @@ public class WildflyDeploymentStatus implements DeploymentStatus {
public ActionType getAction() {
return action;
}
-
+
public boolean isRunning() {
return StateType.RUNNING.equals(state);
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyIncrementalDeployment.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyIncrementalDeployment.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyIncrementalDeployment.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyIncrementalDeployment.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJ2eePlatformFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJ2eePlatformFactory.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJ2eePlatformFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJ2eePlatformFactory.java
index f307c56..f0b081e 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJ2eePlatformFactory.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJ2eePlatformFactory.java
@@ -118,7 +118,7 @@ public class WildflyJ2eePlatformFactory extends J2eePlatformFactory {
EAP6_PROFILES.add(Profile.JAVA_EE_6_WEB);
EAP6_PROFILES.add(Profile.JAVA_EE_6_FULL);
}
-
+
private static final Set<Profile> WILDFLY_WEB_PROFILES = new HashSet<Profile>();
static {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJdbcDriverDeployer.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJdbcDriverDeployer.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJdbcDriverDeployer.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyJdbcDriverDeployer.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyKiller.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOptionalDeploymentManagerFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOptionalDeploymentManagerFactory.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOptionalDeploymentManagerFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOptionalDeploymentManagerFactory.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyProgressObject.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyProgressObject.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyProgressObject.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyProgressObject.java
index bb23c0a..af2de90 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyProgressObject.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyProgressObject.java
@@ -34,7 +34,7 @@ import javax.enterprise.deploy.spi.status.ProgressObject;
* @author Petr Hejl
*/
public class WildflyProgressObject implements ProgressObject {
-
+
private final List<ProgressListener> listeners = new CopyOnWriteArrayList<ProgressListener>();
private final TargetModuleID[] moduleIds;
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
index 5e17ab1..e813b9d 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
@@ -134,9 +134,9 @@ class WildflyStartRunnable implements Runnable {
if (!logManagerJar.isEmpty()) {
javaOptsBuilder.append(" -Xbootclasspath/p:").append(logManagerJar)
.append(" -Djava.util.logging.manager=org.jboss.logmanager.LogManager");
- FileObject loggingProperties = FileUtil.toFileObject(new File(ip.getProperty(WildflyPluginProperties.PROPERTY_ROOT_DIR)
+ FileObject loggingProperties = FileUtil.toFileObject(new File(ip.getProperty(WildflyPluginProperties.PROPERTY_ROOT_DIR)
+ separatorChar + "standalone" + separatorChar + "configuration", "logging.properties")); // NOI18N
-
+
javaOptsBuilder.append(" -Dlogging.configuration=").append(loggingProperties.toURL());
}
}
@@ -200,7 +200,7 @@ class WildflyStartRunnable implements Runnable {
} else {
javaOptsBuilder.append(" -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true");
}
-
+
if (ip.getProperty(WildflyPluginProperties.PROPERTY_CONFIG_FILE) != null) {
File configFile = new File(ip.getProperty(WildflyPluginProperties.PROPERTY_CONFIG_FILE));
if (configFile.exists() && configFile.getParentFile().exists() && configFile.getParentFile().getParentFile().exists()) {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartServer.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartServer.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartServer.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartServer.java
index 0051346..f5b2162 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartServer.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartServer.java
@@ -75,7 +75,7 @@ public class WildflyStartServer extends StartServer implements ProgressObject {
private MODE mode;
private final WildflyDeploymentManager dm;
-
+
private boolean consoleConfigured = false;
private static final Set<String> IS_DEBUG_MODE_URI = Collections.synchronizedSet(
@@ -276,7 +276,7 @@ public class WildflyStartServer extends StartServer implements ProgressObject {
}
return true;
}
-
+
private InputOutput openConsole() {
InputOutput io = UISupport.getServerIO(dm.getUrl());
if (io == null) {
@@ -290,9 +290,9 @@ public class WildflyStartServer extends StartServer implements ProgressObject {
// no op
}
io.select();
-
+
return io;
- }
+ }
// ---------- Implementation of ProgressObject interface
private Vector listeners = new Vector();
@@ -370,7 +370,7 @@ public class WildflyStartServer extends StartServer implements ProgressObject {
return mode;
}
-
+
void setConsoleConfigured(boolean console){
this.consoleConfigured = console;
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStopRunnable.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStopRunnable.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStopRunnable.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStopRunnable.java
index a472b24..2fe121d 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStopRunnable.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStopRunnable.java
@@ -154,4 +154,3 @@ class WildflyStopRunnable implements Runnable {
}
}
}
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Authentication.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Authentication.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Authentication.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Authentication.java
index d68c122..1f13e58 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Authentication.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Authentication.java
@@ -48,7 +48,7 @@ public class Authentication {
this.password = Arrays.copyOf(password, password.length);
this.callBackHandler = createCallBackHandler();
}
-
+
private CallbackHandler createCallBackHandler(){
return new CallbackHandler() {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Constants.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Constants.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Constants.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/Constants.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyClient.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyExplodedDeployer.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyExplodedDeployer.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyExplodedDeployer.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyExplodedDeployer.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
index 97ac9b1..338f247 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyManagementAPI.java
@@ -41,7 +41,7 @@ import org.netbeans.modules.javaee.wildfly.ide.ui.WildflyPluginUtils.Version;
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class WildflyManagementAPI {
-
+
private static final String SASL_DISALLOWED_MECHANISMS = "SASL_DISALLOWED_MECHANISMS";
private static final String JBOSS_LOCAL_USER = "JBOSS-LOCAL-USER";
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyModule.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyModule.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyModule.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/commands/WildflyModule.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationPanel.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationVisualPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationVisualPanel.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationVisualPanel.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerLocationVisualPanel.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesPanel.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
index 695b212..e84fb97 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/AddServerPropertiesVisualPanel.java
@@ -589,8 +589,3 @@ class DomainComboModel extends AbstractListModel implements ComboBoxModel{
}
}
-
-
-
-
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyInstantiatingIterator.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginProperties.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
index aae3558..cdee875 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtils.java
@@ -50,15 +50,15 @@ import org.openide.filesystems.JarFileSystem;
public class WildflyPluginUtils {
public static final Version JBOSS_7_0_0 = new Version("7.0.0", true); // NOI18N
-
- public static final Version EAP_6_1_0 = new Version("7.2.0", false); // NOI18N
-
+
+ public static final Version EAP_6_1_0 = new Version("7.2.0", false); // NOI18N
+
public static final Version EAP_6_2_0 = new Version("7.3.0", false); // NOI18N
public static final Version EAP_6_3_0 = new Version("7.4.0", false); // NOI18N
public static final Version EAP_6_4_0 = new Version("7.5.0", false); // NOI18N
-
+
public static final Version EAP_7_0 = new Version("7.0.0", false); // NOI18N
public static final Version WILDFLY_8_0_0 = new Version("8.0.0", true); // NOI18N
@@ -68,7 +68,7 @@ public class WildflyPluginUtils {
public static final Version WILDFLY_8_2_0 = new Version("8.2.0", true); // NOI18N
public static final Version WILDFLY_9_0_0 = new Version("9.0.0", true); // NOI18N
-
+
public static final Version WILDFLY_10_0_0 = new Version("10.0.0", true); // NOI18N
public static final Version WILDFLY_11_0_0 = new Version("11.0.0", true); // NOI18N
@@ -442,7 +442,7 @@ public class WildflyPluginUtils {
private String microNumber = "0";
private String update = "";
-
+
private boolean wildfly = true;
/**
@@ -452,7 +452,7 @@ public class WildflyPluginUtils {
* @param version spec version string with the following format:
* <code>MAJOR_NUMBER[.MINOR_NUMBER[.MICRO_NUMBER[.UPDATE]]]</code>
*/
- public Version(String version, boolean wildfly) {
+ public Version(String version, boolean wildfly) {
assert version != null : "Version can't be null"; // NOI18N
this.wildfly = wildfly;
String[] tokens = version.split("\\.");
@@ -590,7 +590,7 @@ public class WildflyPluginUtils {
}
if(this.wildfly != o.wildfly) {
return convertEAP(this).compareToIgnoreUpdate(convertEAP(o));
-
+
}
int comparison = compare(majorNumber, o.majorNumber);
if (comparison != 0) {
@@ -602,7 +602,7 @@ public class WildflyPluginUtils {
}
return compare(microNumber, o.microNumber);
}
-
+
private Version convertEAP(Version version) {
if (!version.isWidlfy()) {
if (version.compareToIgnoreUpdate(EAP_7_0) >= 0) {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/AbstractStateNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/AbstractStateNode.java
similarity index 93%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/AbstractStateNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/AbstractStateNode.java
index 13ef178..38f0734 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/AbstractStateNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/AbstractStateNode.java
@@ -77,19 +77,19 @@ public abstract class AbstractStateNode extends AbstractNode {
} else if (isRunning()) {
badge = ImageUtilities.loadImage(RUNNING_ICON);
}
- /* case ServerInstance.STATE_DEBUGGING :
+ /* case ServerInstance.STATE_DEBUGGING :
badge = ImageUtilities.loadImage(DEBUGGING_ICON);
break;
- case ServerInstance.STATE_SUSPENDED :
+ case ServerInstance.STATE_SUSPENDED :
badge = ImageUtilities.loadImage(SUSPENDED_ICON);
break;
- case ServerInstance.STATE_PROFILING :
+ case ServerInstance.STATE_PROFILING :
badge = ImageUtilities.loadImage(PROFILING_ICON);
break;
- case ServerInstance.STATE_PROFILER_BLOCKING :
+ case ServerInstance.STATE_PROFILER_BLOCKING :
badge = ImageUtilities.loadImage(PROFILER_BLOCKING_ICON);
break;
- case ServerInstance.STATE_PROFILER_STARTING :
+ case ServerInstance.STATE_PROFILER_STARTING :
badge = ImageUtilities.loadImage(WAITING_ICON);
break;
default:
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/SimplePropertySupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/SimplePropertySupport.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/SimplePropertySupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/SimplePropertySupport.java
index a1535f9..7afe573 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/SimplePropertySupport.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/SimplePropertySupport.java
@@ -43,5 +43,5 @@ public class SimplePropertySupport extends PropertySupport<String> {
public void setValue(String val) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
this.value = val;
}
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Util.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Util.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Util.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/Util.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyApplicationsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyApplicationsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyApplicationsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyApplicationsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyAsyncChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyAsyncChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyAsyncChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyAsyncChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoriesChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoriesChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoriesChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoriesChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoryNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoryNode.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoryNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoryNode.java
index 1700def..55ccdee 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoryNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyConnectionFactoryNode.java
@@ -33,7 +33,7 @@ import org.openide.util.NbBundle;
import org.openide.util.actions.SystemAction;
/**
- *
+ *
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class WildflyConnectionFactoryNode extends AbstractNode {
@@ -47,8 +47,8 @@ public class WildflyConnectionFactoryNode extends AbstractNode {
initProperties(connectionFactory.getConfiguration());
}
- protected final void initProperties(Map<String, String> configuration) {
- for(Map.Entry<String, String> property : configuration.entrySet()) {
+ protected final void initProperties(Map<String, String> configuration) {
+ for(Map.Entry<String, String> property : configuration.entrySet()) {
addProperty(property.getKey(), property.getValue());
}
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourceNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourceNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourceNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourceNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourcesChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourcesChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourcesChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDatasourcesChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDeploymentChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDeploymentChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDeploymentChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDeploymentChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationNode.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationNode.java
index 75fb253..bb77ea6 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationNode.java
@@ -36,7 +36,7 @@ import org.openide.util.NbBundle;
import org.openide.util.actions.SystemAction;
/**
- *
+ *
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class WildflyDestinationNode extends AbstractNode {
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyDestinationsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarApplicationsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarModulesChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarModulesChildren.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarModulesChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarModulesChildren.java
index 39170e3..5156a0b 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarModulesChildren.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEarModulesChildren.java
@@ -55,7 +55,7 @@ public class WildflyEarModulesChildren extends WildflyAsyncChildren implements R
setKeys(new Object[]{Util.WAIT_NODE});
getExecutorService().submit(new WildflyEarModulesNodeUpdater(), 0);
}
-
+
class WildflyEarModulesNodeUpdater implements Runnable {
List keys = new ArrayList();
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentNode.java
similarity index 89%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentNode.java
index 0de6662..0289c22 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentNode.java
@@ -33,30 +33,30 @@ import org.openide.util.actions.SystemAction;
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class WildflyEjbComponentNode extends AbstractNode {
-
- public enum Type {
- MDB("message-driven-bean", EJB_MESSAGE_ICON),
- SINGLETON("singleton-bean", EJB_SESSION_ICON),
- STATELESS( "stateless-session-bean", EJB_SESSION_ICON),
- ENTITY("entity-bean", EJB_ENTITY_ICON),
+
+ public enum Type {
+ MDB("message-driven-bean", EJB_MESSAGE_ICON),
+ SINGLETON("singleton-bean", EJB_SESSION_ICON),
+ STATELESS( "stateless-session-bean", EJB_SESSION_ICON),
+ ENTITY("entity-bean", EJB_ENTITY_ICON),
STATEFULL("stateful-session-bean", EJB_SESSION_ICON);
-
+
private final String propertyName;
private final String icon;
Type(final String propertyName, final String icon) {
this.propertyName = propertyName;
this.icon = icon;
}
-
+
public String getPropertyName() {
return this.propertyName;
}
-
+
public String getIcon() {
return this.icon;
}
};
-
+
private final Type ejbType;
public WildflyEjbComponentNode(String ejbName, Type ejbType) {
super(Children.LEAF);
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbComponentsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModuleNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModuleNode.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModuleNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModuleNode.java
index c295bf9..0c27996 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModuleNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModuleNode.java
@@ -33,18 +33,18 @@ import org.openide.util.Lookup;
import org.openide.util.actions.SystemAction;
/**
- *
+ *
* Node which describes an EJB Module.
*
* @author Michal Mocnak
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class WildflyEjbModuleNode extends AbstractNode {
-
+
public WildflyEjbModuleNode(String fileName, Lookup lookup) {
this(fileName, lookup, new ArrayList<WildflyEjbComponentNode>(), false);
}
-
+
public WildflyEjbModuleNode(String fileName, Lookup lookup, boolean isEJB3) {
this(fileName, lookup, new ArrayList<WildflyEjbComponentNode>(), isEJB3);
}
@@ -59,7 +59,7 @@ public class WildflyEjbModuleNode extends AbstractNode {
getCookieSet().add(new UndeployModuleCookieImpl(fileName, ResourceType.EJB, lookup));
}
}
-
+
@Override
public Action[] getActions(boolean context){
if(getParentNode() instanceof WildflyEarApplicationNode)
@@ -69,7 +69,7 @@ public class WildflyEjbModuleNode extends AbstractNode {
SystemAction.get(UndeployModuleAction.class)
};
}
-
+
@Override
public Image getIcon(int type) {
return UISupport.getIcon(ServerIcon.EJB_ARCHIVE);
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModulesChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModulesChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModulesChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyEjbModulesChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyItemNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyItemNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyItemNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyItemNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceMethodsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceMethodsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceMethodsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceMethodsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceNode.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceNode.java
index e732536..75f1c62 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJaxrsResourceNode.java
@@ -42,7 +42,7 @@ public class WildflyJaxrsResourceNode extends AbstractNode {
setDisplayName(String.format("%s [%s]", resourceName, resource.getPath()));
setDisplayName(String.format("%s [%s]", resourceName, resource.getPath()));
}
-
+
@Override
public Image getIcon(int type) {
return ImageUtilities.loadImage(Util.JAXRS_ICON);
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJmsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJmsChildren.java
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJmsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJmsChildren.java
index 93fe055..27416e5 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJmsChildren.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyJmsChildren.java
@@ -54,12 +54,12 @@ public class WildflyJmsChildren extends Children.Keys {
final WildflyResourcesItemNode createConnectionFactoriesNode(Lookup lookup) {
- return new WildflyResourcesItemNode(new WildflyConnectionFactoriesChildren(lookup),
+ return new WildflyResourcesItemNode(new WildflyConnectionFactoriesChildren(lookup),
NbBundle.getMessage(WildflyTargetNode.class, "LBL_Resources_ConnectionFactories"), Util.CONNECTOR_ICON);
}
-
+
final WildflyResourcesItemNode createDestinationsNode(Lookup lookup) {
- return new WildflyResourcesItemNode(new WildflyDestinationsChildren(lookup),
+ return new WildflyResourcesItemNode(new WildflyDestinationsChildren(lookup),
NbBundle.getMessage(WildflyTargetNode.class, "LBL_Resources_Destinations"), Util.JMS_ICON);
}
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyMailSessionsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyManagerNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyRegistryNodeFactory.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyRegistryNodeFactory.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyRegistryNodeFactory.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyRegistryNodeFactory.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdapterNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdapterNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdapterNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdapterNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdaptersChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdaptersChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdaptersChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourceAdaptersChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesItemNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesItemNode.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesItemNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesItemNode.java
index eff2781..3c0da8e 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesItemNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyResourcesItemNode.java
@@ -38,7 +38,7 @@ import org.openide.util.actions.SystemAction;
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class WildflyResourcesItemNode extends AbstractNode {
-
+
private final String icon;
public WildflyResourcesItemNode(Children children, String name, String icon) {
@@ -86,4 +86,3 @@ public class WildflyResourcesItemNode extends AbstractNode {
}
}
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyTargetNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyTargetNode.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyTargetNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyTargetNode.java
index 857390e..8d37e9e 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyTargetNode.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyTargetNode.java
@@ -34,10 +34,10 @@ public class WildflyTargetNode extends AbstractNode {
public WildflyTargetNode(Lookup lookup) {
super(new Children.Array());
getChildren().add(new Node[] {
- new WildflyItemNode(new WildflyApplicationsChildren(lookup), NbBundle.getMessage(WildflyTargetNode.class, "LBL_Apps")),
+ new WildflyItemNode(new WildflyApplicationsChildren(lookup), NbBundle.getMessage(WildflyTargetNode.class, "LBL_Apps")),
new WildflyResourcesItemNode(new WildflyResourcesChildren(lookup), NbBundle.getMessage(WildflyTargetNode.class, "LBL_Resources"), Util.RESOURCES_ICON)});
}
-
+
@Override
public Action[] getActions(boolean b) {
return new Action[] {};
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebApplicationsChildren.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebApplicationsChildren.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebApplicationsChildren.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebApplicationsChildren.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebModuleNode.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebModuleNode.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebModuleNode.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/WildflyWebModuleNode.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/KillServerAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/KillServerAction.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/KillServerAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/KillServerAction.java
index c5123e5..cad0643 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/KillServerAction.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/KillServerAction.java
@@ -46,7 +46,7 @@ import org.openide.util.RequestProcessor;
public class KillServerAction extends CookieAction {
private static final RequestProcessor PROCESSOR = new RequestProcessor ("JBoss kill UI", 1); // NOI18N
-
+
private static final Logger LOGGER = Logger.getLogger(KillServerAction.class.getName());
private final WildflyKiller killer = new WildflyKiller();
@@ -62,7 +62,7 @@ public class KillServerAction extends CookieAction {
if ((nodes == null) || (nodes.length != 1)) {
return;
}
-
+
final WildflyManagerNode managerNode = nodes[0].getCookie(WildflyManagerNode.class);
if (managerNode == null) {
return;
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenServerLogAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenServerLogAction.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenServerLogAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenServerLogAction.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLAction.java
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLAction.java
index b8a9be8..685ca5e 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLAction.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLAction.java
@@ -35,7 +35,7 @@ import org.openide.util.actions.NodeAction;
* @author Michal Mocnak
*/
public class OpenURLAction extends NodeAction {
-
+
protected void performAction(Node[] nodes) {
for (int i = 0; i < nodes.length; i++) {
OpenURLActionCookie oCookie = (OpenURLActionCookie) nodes[i].getCookie(OpenURLActionCookie.class);
@@ -49,36 +49,36 @@ public class OpenURLAction extends NodeAction {
}
}
}
-
+
protected boolean enable(Node[] nodes) {
for (int i = 0; i < nodes.length; i++) {
OpenURLActionCookie oCookie = (OpenURLActionCookie)nodes[i].getCookie(OpenURLActionCookie.class);
UndeployModuleCookie uCookie = (UndeployModuleCookie)nodes[i].getCookie(UndeployModuleCookie.class);
UndeployModuleCookie upCookie = (UndeployModuleCookie)nodes[i].getParentNode().getCookie(UndeployModuleCookie.class);
-
+
if(uCookie != null)
if(uCookie.isRunning())
return false;
-
+
if(upCookie != null)
if(upCookie.isRunning())
return false;
-
+
if (oCookie != null)
return true;
}
-
+
return false;
}
-
+
public String getName() {
return NbBundle.getMessage(OpenURLAction.class, "LBL_OpenInBrowserAction"); // NOI18N
}
-
+
protected boolean asynchronous() {
return false;
}
-
+
public HelpCtx getHelpCtx() {
return HelpCtx.DEFAULT_HELP;
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLActionCookie.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLActionCookie.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLActionCookie.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLActionCookie.java
index 878d98b..556058d 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLActionCookie.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/OpenURLActionCookie.java
@@ -26,6 +26,6 @@ import org.openide.nodes.Node;
* @author Michal Mocnak
*/
public interface OpenURLActionCookie extends Node.Cookie {
-
+
public String getWebURL();
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesAction.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesAction.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesCookie.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesCookie.java
similarity index 96%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesCookie.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesCookie.java
index d8ee3c0..392d783 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesCookie.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/RefreshModulesCookie.java
@@ -26,6 +26,6 @@ import org.openide.nodes.Node;
* @author Michal Mocnak
*/
public interface RefreshModulesCookie extends Node.Cookie {
-
- public void refresh();
+
+ public void refresh();
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Refreshable.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Refreshable.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Refreshable.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/Refreshable.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ResourceType.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ResourceType.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ResourceType.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ResourceType.java
index 82b839e..8c826f8 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ResourceType.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ResourceType.java
@@ -24,5 +24,5 @@ package org.netbeans.modules.javaee.wildfly.nodes.actions;
*/
public enum ResourceType {
EAR, EJB, CAR, RAR, WAR, QUEUE, TOPIC, DATASOURCE;
-
+
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ShowAdminToolAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ShowAdminToolAction.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ShowAdminToolAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/ShowAdminToolAction.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleAction.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleAction.java
index 9a82b73..271bfda 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleAction.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleAction.java
@@ -28,7 +28,7 @@ import org.openide.util.RequestProcessor.Task;
import org.openide.util.actions.NodeAction;
/**
- *
+ *
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class StartModuleAction extends NodeAction {
@@ -39,13 +39,13 @@ public class StartModuleAction extends NodeAction {
protected void performAction(Node[] nodes) {
if( (nodes == null) || (nodes.length < 1) )
return;
-
+
for (int i = 0; i < nodes.length; i++) {
StartModuleCookie uCookie = (StartModuleCookie)nodes[i].getCookie(StartModuleCookie.class);
if (uCookie != null) {
final Task t = uCookie.start();
final Node node = nodes[i].getParentNode();
-
+
PROCESSOR.post(new Runnable() {
public void run() {
t.waitFinished();
@@ -68,7 +68,7 @@ public class StartModuleAction extends NodeAction {
}
}
}
-
+
@Override
protected boolean enable(Node[] nodes) {
StartModuleCookie cookie;
@@ -77,16 +77,16 @@ public class StartModuleAction extends NodeAction {
if (cookie == null || cookie.isRunning())
return false;
}
-
+
return true;
}
-
+
public String getName() {
return NbBundle.getMessage(StartModuleAction.class, "LBL_StartAction");
}
-
+
protected boolean asynchronous() { return false; }
-
+
public org.openide.util.HelpCtx getHelpCtx() {
return HelpCtx.DEFAULT_HELP;
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookie.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookie.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookie.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookie.java
index cff81b6..20bf5f1 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookie.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookie.java
@@ -23,12 +23,12 @@ import org.openide.nodes.Node;
import org.openide.util.RequestProcessor.Task;
/**
- *
+ *
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public interface StartModuleCookie extends Node.Cookie {
-
+
public Task start();
-
+
public boolean isRunning();
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookieImpl.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookieImpl.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookieImpl.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StartModuleCookieImpl.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleAction.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleAction.java
index 4acdbf4..28e21db 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleAction.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleAction.java
@@ -28,7 +28,7 @@ import org.openide.util.RequestProcessor.Task;
import org.openide.util.actions.NodeAction;
/**
- *
+ *
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public class StopModuleAction extends NodeAction {
@@ -39,13 +39,13 @@ public class StopModuleAction extends NodeAction {
protected void performAction(Node[] nodes) {
if( (nodes == null) || (nodes.length < 1) )
return;
-
+
for (int i = 0; i < nodes.length; i++) {
StopModuleCookie uCookie = (StopModuleCookie)nodes[i].getCookie(StopModuleCookie.class);
if (uCookie != null) {
final Task t = uCookie.stop();
final Node node = nodes[i].getParentNode();
-
+
PROCESSOR.post(new Runnable() {
public void run() {
t.waitFinished();
@@ -68,7 +68,7 @@ public class StopModuleAction extends NodeAction {
}
}
}
-
+
@Override
protected boolean enable(Node[] nodes) {
StopModuleCookie cookie;
@@ -77,18 +77,18 @@ public class StopModuleAction extends NodeAction {
if (cookie == null || cookie.isRunning())
return false;
}
-
+
return true;
}
-
+
@Override
public String getName() {
return NbBundle.getMessage(StopModuleAction.class, "LBL_StopAction");
}
-
+
@Override
protected boolean asynchronous() { return false; }
-
+
@Override
public org.openide.util.HelpCtx getHelpCtx() {
return HelpCtx.DEFAULT_HELP;
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookie.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookie.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookie.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookie.java
index d2723df..5a84bbb 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookie.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookie.java
@@ -23,12 +23,12 @@ import org.openide.nodes.Node;
import org.openide.util.RequestProcessor.Task;
/**
- *
+ *
* @author Emmanuel Hugonnet (ehsavoie) <eh...@netbeans.org>
*/
public interface StopModuleCookie extends Node.Cookie {
-
+
public Task stop();
-
+
public boolean isRunning();
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookieImpl.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookieImpl.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookieImpl.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/StopModuleCookieImpl.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleAction.java
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleAction.java
index 4583c6c..78adef0 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleAction.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleAction.java
@@ -38,13 +38,13 @@ public class UndeployModuleAction extends NodeAction {
protected void performAction(Node[] nodes) {
if( (nodes == null) || (nodes.length < 1) )
return;
-
+
for (int i = 0; i < nodes.length; i++) {
UndeployModuleCookie uCookie = (UndeployModuleCookie)nodes[i].getCookie(UndeployModuleCookie.class);
if (uCookie != null) {
final Task t = uCookie.undeploy();
final Node node = nodes[i].getParentNode();
-
+
PROCESSOR.post(new Runnable() {
public void run() {
t.waitFinished();
@@ -67,7 +67,7 @@ public class UndeployModuleAction extends NodeAction {
}
}
}
-
+
protected boolean enable(Node[] nodes) {
UndeployModuleCookie cookie;
for (int i=0; i<nodes.length; i++) {
@@ -75,16 +75,16 @@ public class UndeployModuleAction extends NodeAction {
if (cookie == null || cookie.isRunning())
return false;
}
-
+
return true;
}
-
+
public String getName() {
return NbBundle.getMessage(UndeployModuleAction.class, "LBL_UndeployAction");
}
-
+
protected boolean asynchronous() { return false; }
-
+
public org.openide.util.HelpCtx getHelpCtx() {
return HelpCtx.DEFAULT_HELP;
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookie.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookie.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookie.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookie.java
index 4a8898a..5fedab2 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookie.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookie.java
@@ -27,8 +27,8 @@ import org.openide.util.RequestProcessor.Task;
* @author Michal Mocnak
*/
public interface UndeployModuleCookie extends Node.Cookie {
-
+
public Task undeploy();
-
+
public boolean isRunning();
}
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookieImpl.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookieImpl.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookieImpl.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookieImpl.java
index 38e0f4a..3338c16 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookieImpl.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/UndeployModuleCookieImpl.java
@@ -60,7 +60,7 @@ public class UndeployModuleCookieImpl implements UndeployModuleCookie {
@Override
public Task undeploy() {
final WildflyDeploymentManager dm = (WildflyDeploymentManager) lookup.lookup(WildflyDeploymentManager.class);
-
+
final String nameWoExt;
if(fileName.indexOf('.') > 0) {
nameWoExt = fileName.substring(0, fileName.lastIndexOf('.'));
@@ -91,7 +91,7 @@ public class UndeployModuleCookieImpl implements UndeployModuleCookie {
case DATASOURCE:
dm.getClient().removeDatasource(fileName);
break;
-
+
}
} catch (IOException ex) {
Logger.getLogger(UndeployModuleCookieImpl.class.getName()).log(Level.INFO, null, ex);
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/WildflyEditConfigAction.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/WildflyEditConfigAction.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/WildflyEditConfigAction.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/nodes/actions/WildflyEditConfigAction.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/Bundle.properties b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/Bundle.properties
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/Bundle.properties
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/Bundle.properties
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/EntityBean.png b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/EntityBean.png
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/EntityBean.png
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/EntityBean.png
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/MessageBean.png b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/MessageBean.png
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/MessageBean.png
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/MessageBean.png
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/ResNodeNodeIcon.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/ResNodeNodeIcon.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/ResNodeNodeIcon.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/ResNodeNodeIcon.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/SessionBean.png b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/SessionBean.png
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/SessionBean.png
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/SessionBean.png
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/XMLSchema.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/XMLSchema.dtd
new file mode 100644
index 0000000..8b3a726
--- /dev/null
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/XMLSchema.dtd
@@ -0,0 +1,449 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!-- DTD for XML Schemas: Part 1: Structures
+ Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
+ Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
+<!-- $Id$ -->
+<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
+<!-- prose copy in the structures REC is the definitive version --> <!--d-->
+<!-- (which shouldn't differ from this one except for this --> <!--d-->
+<!-- comment and entity expansions, but just in case) --> <!--d-->
+<!-- With the exception of cases with multiple namespace
+ prefixes for the XML Schema namespace, any XML document which is
+ not valid per this DTD given redefinitions in its internal subset of the
+ 'p' and 's' parameter entities below appropriate to its namespace
+ declaration of the XML Schema namespace is almost certainly not
+ a valid schema. -->
+
+<!-- The simpleType element and its constituent parts
+ are defined in XML Schema: Part 2: Datatypes -->
+<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
+
+<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
+ schema document to establish a different
+ namespace prefix -->
+<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
+ also define %s as the suffix for the appropriate
+ namespace declaration (e.g. :foo) -->
+<!ENTITY % nds 'xmlns%s;'>
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % schema "%p;schema">
+<!ENTITY % complexType "%p;complexType">
+<!ENTITY % complexContent "%p;complexContent">
+<!ENTITY % simpleContent "%p;simpleContent">
+<!ENTITY % extension "%p;extension">
+<!ENTITY % element "%p;element">
+<!ENTITY % unique "%p;unique">
+<!ENTITY % key "%p;key">
+<!ENTITY % keyref "%p;keyref">
+<!ENTITY % selector "%p;selector">
+<!ENTITY % field "%p;field">
+<!ENTITY % group "%p;group">
+<!ENTITY % all "%p;all">
+<!ENTITY % choice "%p;choice">
+<!ENTITY % sequence "%p;sequence">
+<!ENTITY % any "%p;any">
+<!ENTITY % anyAttribute "%p;anyAttribute">
+<!ENTITY % attribute "%p;attribute">
+<!ENTITY % attributeGroup "%p;attributeGroup">
+<!ENTITY % include "%p;include">
+<!ENTITY % import "%p;import">
+<!ENTITY % redefine "%p;redefine">
+<!ENTITY % notation "%p;notation">
+
+<!-- annotation elements -->
+<!ENTITY % annotation "%p;annotation">
+<!ENTITY % appinfo "%p;appinfo">
+<!ENTITY % documentation "%p;documentation">
+
+<!-- Customisation entities for the ATTLIST of each element type.
+ Define one of these if your schema takes advantage of the
+ anyAttribute='##other' in the schema for schemas -->
+
+<!ENTITY % schemaAttrs ''>
+<!ENTITY % complexTypeAttrs ''>
+<!ENTITY % complexContentAttrs ''>
+<!ENTITY % simpleContentAttrs ''>
+<!ENTITY % extensionAttrs ''>
+<!ENTITY % elementAttrs ''>
+<!ENTITY % groupAttrs ''>
+<!ENTITY % allAttrs ''>
+<!ENTITY % choiceAttrs ''>
+<!ENTITY % sequenceAttrs ''>
+<!ENTITY % anyAttrs ''>
+<!ENTITY % anyAttributeAttrs ''>
+<!ENTITY % attributeAttrs ''>
+<!ENTITY % attributeGroupAttrs ''>
+<!ENTITY % uniqueAttrs ''>
+<!ENTITY % keyAttrs ''>
+<!ENTITY % keyrefAttrs ''>
+<!ENTITY % selectorAttrs ''>
+<!ENTITY % fieldAttrs ''>
+<!ENTITY % includeAttrs ''>
+<!ENTITY % importAttrs ''>
+<!ENTITY % redefineAttrs ''>
+<!ENTITY % notationAttrs ''>
+<!ENTITY % annotationAttrs ''>
+<!ENTITY % appinfoAttrs ''>
+<!ENTITY % documentationAttrs ''>
+
+<!ENTITY % complexDerivationSet "CDATA">
+ <!-- #all or space-separated list drawn from derivationChoice -->
+<!ENTITY % blockSet "CDATA">
+ <!-- #all or space-separated list drawn from
+ derivationChoice + 'substitution' -->
+
+<!ENTITY % mgs '%all; | %choice; | %sequence;'>
+<!ENTITY % cs '%choice; | %sequence;'>
+<!ENTITY % formValues '(qualified|unqualified)'>
+
+
+<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
+
+<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
+
+<!-- This is used in part2 -->
+<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
+
+%xs-datatypes;
+
+<!-- the duplication below is to produce an unambiguous content model
+ which allows annotation everywhere -->
+<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
+ ((%simpleType; | %complexType;
+ | %element; | %attribute;
+ | %attributeGroup; | %group;
+ | %notation; ),
+ (%annotation;)*)* )>
+<!ATTLIST %schema;
+ targetNamespace %URIref; #IMPLIED
+ version CDATA #IMPLIED
+ %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema'
+ xmlns CDATA #IMPLIED
+ finalDefault %complexDerivationSet; ''
+ blockDefault %blockSet; ''
+ id ID #IMPLIED
+ elementFormDefault %formValues; 'unqualified'
+ attributeFormDefault %formValues; 'unqualified'
+ xml:lang CDATA #IMPLIED
+ %schemaAttrs;>
+<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
+ because at the Infoset level where schemas operate,
+ xmlns(:prefix) is NOT an attribute! -->
+<!-- The declaration of xmlns is a convenience for schema authors -->
+
+<!-- The id attribute here and below is for use in external references
+ from non-schemas using simple fragment identifiers.
+ It is NOT used for schema-to-schema reference, internal or
+ external. -->
+
+<!-- a type is a named content type specification which allows attribute
+ declarations-->
+<!-- -->
+
+<!ELEMENT %complexType; ((%annotation;)?,
+ (%simpleContent;|%complexContent;|
+ %particleAndAttrs;))>
+
+<!ATTLIST %complexType;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %complexDerivationSet; #IMPLIED
+ mixed (true|false) 'false'
+ %complexTypeAttrs;>
+
+<!-- particleAndAttrs is shorthand for a root type -->
+<!-- mixed is disallowed if simpleContent, overriden if complexContent
+ has one too. -->
+
+<!-- If anyAttribute appears in one or more referenced attributeGroups
+ and/or explicitly, the intersection of the permissions is used -->
+
+<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %complexContent;
+ mixed (true|false) #IMPLIED
+ id ID #IMPLIED
+ %complexContentAttrs;>
+
+<!-- restriction should use the branch defined above, not the simple
+ one from part2; extension should use the full model -->
+
+<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
+<!ATTLIST %simpleContent;
+ id ID #IMPLIED
+ %simpleContentAttrs;>
+
+<!-- restriction should use the simple branch from part2, not the
+ one defined above; extension should have no particle -->
+
+<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
+<!ATTLIST %extension;
+ base %QName; #REQUIRED
+ id ID #IMPLIED
+ %extensionAttrs;>
+
+<!-- an element is declared by either:
+ a name and a type (either nested or referenced via the type attribute)
+ or a ref to an existing element declaration -->
+
+<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
+ (%unique; | %key; | %keyref;)*)>
+<!-- simpleType or complexType only if no type|ref attribute -->
+<!-- ref not allowed at top level -->
+<!ATTLIST %element;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ nillable %boolean; #IMPLIED
+ substitutionGroup %QName; #IMPLIED
+ abstract %boolean; #IMPLIED
+ final %complexDerivationSet; #IMPLIED
+ block %blockSet; #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %elementAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- In the absence of type AND ref, type defaults to type of
+ substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
+<!-- default and fixed are mutually exclusive -->
+
+<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
+<!ATTLIST %group;
+ name %NCName; #IMPLIED
+ ref %QName; #IMPLIED
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %groupAttrs;>
+
+<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
+<!ATTLIST %all;
+ minOccurs (1) #IMPLIED
+ maxOccurs (1) #IMPLIED
+ id ID #IMPLIED
+ %allAttrs;>
+
+<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %choice;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %choiceAttrs;>
+
+<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
+<!ATTLIST %sequence;
+ minOccurs %nonNegativeInteger; #IMPLIED
+ maxOccurs CDATA #IMPLIED
+ id ID #IMPLIED
+ %sequenceAttrs;>
+
+<!-- an anonymous grouping in a model, or
+ a top-level named group definition, or a reference to same -->
+
+<!-- Note that if order is 'all', group is not allowed inside.
+ If order is 'all' THIS group must be alone (or referenced alone) at
+ the top level of a content model -->
+<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
+<!-- Should allow minOccurs=0 inside order='all' . . . -->
+
+<!ELEMENT %any; (%annotation;)?>
+<!ATTLIST %any;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ minOccurs %nonNegativeInteger; '1'
+ maxOccurs CDATA '1'
+ id ID #IMPLIED
+ %anyAttrs;>
+
+<!-- namespace is interpreted as follows:
+ ##any - - any non-conflicting WFXML at all
+
+ ##other - - any non-conflicting WFXML from namespace other
+ than targetNamespace
+
+ ##local - - any unqualified non-conflicting WFXML/attribute
+ one or - - any non-conflicting WFXML from
+ more URI the listed namespaces
+ references
+
+ ##targetNamespace ##local may appear in the above list,
+ with the obvious meaning -->
+
+<!ELEMENT %anyAttribute; (%annotation;)?>
+<!ATTLIST %anyAttribute;
+ namespace CDATA '##any'
+ processContents (skip|lax|strict) 'strict'
+ id ID #IMPLIED
+ %anyAttributeAttrs;>
+<!-- namespace is interpreted as for 'any' above -->
+
+<!-- simpleType only if no type|ref attribute -->
+<!-- ref not allowed at top level, name iff at top level -->
+<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
+<!ATTLIST %attribute;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ type %QName; #IMPLIED
+ use (prohibited|optional|required) #IMPLIED
+ default CDATA #IMPLIED
+ fixed CDATA #IMPLIED
+ form %formValues; #IMPLIED
+ %attributeAttrs;>
+<!-- type and ref are mutually exclusive.
+ name and ref are mutually exclusive, one is required -->
+<!-- default for use is optional when nested, none otherwise -->
+<!-- default and fixed are mutually exclusive -->
+<!-- type attr and simpleType content are mutually exclusive -->
+
+<!-- an attributeGroup is a named collection of attribute decls, or a
+ reference thereto -->
+<!ELEMENT %attributeGroup; ((%annotation;)?,
+ (%attribute; | %attributeGroup;)*,
+ (%anyAttribute;)?) >
+<!ATTLIST %attributeGroup;
+ name %NCName; #IMPLIED
+ id ID #IMPLIED
+ ref %QName; #IMPLIED
+ %attributeGroupAttrs;>
+
+<!-- ref iff no content, no name. ref iff not top level -->
+
+<!-- better reference mechanisms -->
+<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %unique;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %uniqueAttrs;>
+
+<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %key;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ %keyAttrs;>
+
+<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
+<!ATTLIST %keyref;
+ name %NCName; #REQUIRED
+ refer %QName; #REQUIRED
+ id ID #IMPLIED
+ %keyrefAttrs;>
+
+<!ELEMENT %selector; ((%annotation;)?)>
+<!ATTLIST %selector;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %selectorAttrs;>
+<!ELEMENT %field; ((%annotation;)?)>
+<!ATTLIST %field;
+ xpath %XPathExpr; #REQUIRED
+ id ID #IMPLIED
+ %fieldAttrs;>
+
+<!-- Schema combination mechanisms -->
+<!ELEMENT %include; (%annotation;)?>
+<!ATTLIST %include;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %includeAttrs;>
+
+<!ELEMENT %import; (%annotation;)?>
+<!ATTLIST %import;
+ namespace %URIref; #IMPLIED
+ schemaLocation %URIref; #IMPLIED
+ id ID #IMPLIED
+ %importAttrs;>
+
+<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
+ %attributeGroup; | %group;)*>
+<!ATTLIST %redefine;
+ schemaLocation %URIref; #REQUIRED
+ id ID #IMPLIED
+ %redefineAttrs;>
+
+<!ELEMENT %notation; (%annotation;)?>
+<!ATTLIST %notation;
+ name %NCName; #REQUIRED
+ id ID #IMPLIED
+ public CDATA #REQUIRED
+ system %URIref; #IMPLIED
+ %notationAttrs;>
+
+<!-- Annotation is either application information or documentation -->
+<!-- By having these here they are available for datatypes as well
+ as all the structures elements -->
+
+<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
+<!ATTLIST %annotation; %annotationAttrs;>
+
+<!-- User must define annotation elements in internal subset for this
+ to work -->
+<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
+<!ATTLIST %appinfo;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ %appinfoAttrs;>
+<!ELEMENT %documentation; ANY> <!-- too restrictive -->
+<!ATTLIST %documentation;
+ source %URIref; #IMPLIED
+ id ID #IMPLIED
+ xml:lang CDATA #IMPLIED
+ %documentationAttrs;>
+
+<!NOTATION XMLSchemaStructures PUBLIC
+ 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
+<!NOTATION XML PUBLIC
+ 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/connector.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/connector.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/connector.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/connector.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datasources_1_4_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datasources_1_4_1.xsd
similarity index 94%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datasources_1_4_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datasources_1_4_1.xsd
index cd28671..dca896a 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datasources_1_4_1.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datasources_1_4_1.xsd
@@ -8,9 +8,9 @@
~ are made available under the terms of the Eclipse Public License v1.0
~ which accompanies this distribution, and is available at
~ http://www.eclipse.org/legal/epl-v10.html
-~
+~
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
targetNamespace="http://www.ironjacamar.org/doc/schema"
xmlns="http://www.ironjacamar.org/doc/schema">
@@ -19,7 +19,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The datasources element is the root of the JDBC datasource configuration
+ The datasources element is the root of the JDBC datasource configuration
]]>
</xs:documentation>
</xs:annotation>
@@ -92,10 +92,10 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The connection-property element allows you to pass in arbitrary connection
- properties to the Driver.connect(url, props) method. Each connection-property
- specifies a string name/value pair with the property name coming from the
- name attribute and the value coming from the element content. Ex:
+ The connection-property element allows you to pass in arbitrary connection
+ properties to the Driver.connect(url, props) method. Each connection-property
+ specifies a string name/value pair with the property name coming from the
+ name attribute and the value coming from the element content. Ex:
<connection-property name="char.encoding">UTF-8</connection-property>
]]>
</xs:documentation>
@@ -105,7 +105,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specify an SQL statement to execute whenever a connection is added
+ Specify an SQL statement to execute whenever a connection is added
to the connection pool.
]]>
</xs:documentation>
@@ -115,9 +115,9 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Set java.sql.Connection transaction isolation level to use. The constants
- defined by transaction-isolation-values are the possible transaction isolation
- levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
+ Set java.sql.Connection transaction isolation level to use. The constants
+ defined by transaction-isolation-values are the possible transaction isolation
+ levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
]]>
</xs:documentation>
@@ -204,18 +204,18 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specifies a property to assign to the XADataSource implementation class.
- Each property is identified by the name attribute and the property value
- is given by the xa-datasource-property element content. The property is mapped
- onto the XADataSource implementation by looking for a JavaBeans style getter
- method for the property name. If found, the value of the property is set
- using the JavaBeans setter with the element text translated to the true property
- type using the java.beans.PropertyEditor for the type. Ex:
+ Specifies a property to assign to the XADataSource implementation class.
+ Each property is identified by the name attribute and the property value
+ is given by the xa-datasource-property element content. The property is mapped
+ onto the XADataSource implementation by looking for a JavaBeans style getter
+ method for the property name. If found, the value of the property is set
+ using the JavaBeans setter with the element text translated to the true property
+ type using the java.beans.PropertyEditor for the type. Ex:
<xa-datasource-property name="IfxWAITTIME">10</xa-datasource-property>
- <xa-datasource-property name="IfxIFXHOST">myhost.mydomain.com</xa-datasource-property>
+ <xa-datasource-property name="IfxIFXHOST">myhost.mydomain.com</xa-datasource-property>
<xa-datasource-property name="PortNumber">1557</xa-datasource-property>
<xa-datasource-property name="DatabaseName">mydb</xa-datasource-property>
- <xa-datasource-property name="ServerName">myserver</xa-datasource-property>
+ <xa-datasource-property name="ServerName">myserver</xa-datasource-property>
]]>
</xs:documentation>
</xs:annotation>
@@ -224,7 +224,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The fully qualifed name of the javax.sql.XADataSource implementation
+ The fully qualifed name of the javax.sql.XADataSource implementation
class. Ex: <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
]]>
</xs:documentation>
@@ -271,7 +271,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specifies an SQL statement to execute whenever a connection is added
+ Specifies an SQL statement to execute whenever a connection is added
to the connection pool.
]]>
</xs:documentation>
@@ -281,9 +281,9 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Set java.sql.Connection transaction isolation level to use. The constants
- defined by transaction-isolation-values are the possible transaction isolation
- levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
+ Set java.sql.Connection transaction isolation level to use. The constants
+ defined by transaction-isolation-values are the possible transaction isolation
+ levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
]]>
</xs:documentation>
@@ -465,22 +465,22 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides
- a SQLException isValidConnection(Connection e) method to validate is a connection
- is valid. An exception means the connection is destroyed. This overrides
+ An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides
+ a SQLException isValidConnection(Connection e) method to validate is a connection
+ is valid. An exception means the connection is destroyed. This overrides
the check-valid-connection-sql when present. Ex:
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.vendor.OracleValidConnectionChecker"/>
]]>
</xs:documentation>
</xs:annotation>
</xs:element>
-
+
<xs:element name="check-valid-connection-sql" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specify an SQL statement to check validity of a pool connection. This
- may be called when managed connection is taken from pool for use.
+ Specify an SQL statement to check validity of a pool connection. This
+ may be called when managed connection is taken from pool for use.
]]>
</xs:documentation>
</xs:annotation>
@@ -489,10 +489,10 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The validate-on-match element indicates whether or not connection
- level validation should be done when a connection factory attempts to match
- a managed connection for a given set. This is typically exclusive to the
- use of background validation
+ The validate-on-match element indicates whether or not connection
+ level validation should be done when a connection factory attempts to match
+ a managed connection for a given set. This is typically exclusive to the
+ use of background validation
]]>
</xs:documentation>
</xs:annotation>
@@ -501,8 +501,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- An element to specify that connections should be validated on a background
- thread versus being validated prior to use
+ An element to specify that connections should be validated on a background
+ thread versus being validated prior to use
]]>
</xs:documentation>
</xs:annotation>
@@ -511,8 +511,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The background-validation-millis element specifies the amount of
- time, in millis, that background validation will run.
+ The background-validation-millis element specifies the amount of
+ time, in millis, that background validation will run.
]]>
</xs:documentation>
</xs:annotation>
@@ -521,8 +521,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Whether fail a connection allocation on the first connection if it
- is invalid (true) or keep trying until the pool is exhausted of all potential
+ Whether fail a connection allocation on the first connection if it
+ is invalid (true) or keep trying until the pool is exhausted of all potential
connections (false) default false. e.g. <use-fast-fail>true</use-fast-fail>
]]>
</xs:documentation>
@@ -532,10 +532,10 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides
- a boolean isStaleConnection(SQLException e) method which if it it returns
- true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException
- which is a subclass of SQLException. Ex:
+ An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides
+ a boolean isStaleConnection(SQLException e) method which if it it returns
+ true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException
+ which is a subclass of SQLException. Ex:
<stale-connection-checker class-name="org.jboss.jca.adapters.jdbc.vendor.OracleStaleConnectionChecker"/>
]]>
</xs:documentation>
@@ -545,10 +545,10 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a
- boolean isExceptionFatal(SQLException e) method to validate is an exception
- should be broadcast to all javax.resource.spi.ConnectionEventListener as
- a connectionErrorOccurred message. Ex:
+ An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a
+ boolean isExceptionFatal(SQLException e) method to validate is an exception
+ should be broadcast to all javax.resource.spi.ConnectionEventListener as
+ a connectionErrorOccurred message. Ex:
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.OracleExceptionSorter"/>
]]>
</xs:documentation>
@@ -562,11 +562,11 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The blocking-timeout-millis element indicates the maximum time in
- milliseconds to block while waiting for a connection before throwing an exception.
- Note that this blocks only while waiting for a permit for a connection, and
- will never throw an exception if creating a new connection takes an inordinately
- long time. The default is 30000 (30 seconds).
+ The blocking-timeout-millis element indicates the maximum time in
+ milliseconds to block while waiting for a connection before throwing an exception.
+ Note that this blocks only while waiting for a permit for a connection, and
+ will never throw an exception if creating a new connection takes an inordinately
+ long time. The default is 30000 (30 seconds).
]]>
</xs:documentation>
</xs:annotation>
@@ -575,10 +575,10 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The idle-timeout-minutes elements indicates the maximum time in minutes
- a connection may be idle before being closed. The actual maximum time depends
- also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes
- of any pool.
+ The idle-timeout-minutes elements indicates the maximum time in minutes
+ a connection may be idle before being closed. The actual maximum time depends
+ also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes
+ of any pool.
]]>
</xs:documentation>
</xs:annotation>
@@ -587,8 +587,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Whether to set the query timeout based on the time remaining until
- transaction timeout, any configured query timeout will be used if there is
+ Whether to set the query timeout based on the time remaining until
+ transaction timeout, any configured query timeout will be used if there is
no transaction. The default is false. e.g. <set-tx-query-timeout/>
]]>
</xs:documentation>
@@ -598,7 +598,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Any configured query timeout in seconds The default is no timeout
+ Any configured query timeout in seconds The default is no timeout
e.g. 5 minutes <query-timeout>300</query-timeout>
]]>
</xs:documentation>
@@ -608,7 +608,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Any configured timeout for internal locks on the resource adapter
+ Any configured timeout for internal locks on the resource adapter
objects in seconds The default is a 60 second timeout e.g. 5 minutes <use-try-lock>300</use-try-lock>
]]>
</xs:documentation>
@@ -618,8 +618,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The allocation retry element indicates the number of times that allocating
- a connection should be tried before throwing an exception. The default is 0.
+ The allocation retry element indicates the number of times that allocating
+ a connection should be tried before throwing an exception. The default is 0.
]]>
</xs:documentation>
</xs:annotation>
@@ -628,8 +628,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The allocation retry wait millis element indicates the time in milliseconds
- to wait between retrying to allocate a connection. The default is 5000 (5 seconds).
+ The allocation retry wait millis element indicates the time in milliseconds
+ to wait between retrying to allocate a connection. The default is 5000 (5 seconds).
]]>
</xs:documentation>
</xs:annotation>
@@ -638,7 +638,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Passed to XAResource.setTransactionTimeout() Default is zero which
+ Passed to XAResource.setTransactionTimeout() Default is zero which
does not invoke the setter. In seconds e.g. 5 minutes <xa-resource-timeout>300</xa-resource-timeout>
]]>
</xs:documentation>
@@ -659,11 +659,11 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Whether to check for unclosed statements when a connection is returned
- to the pool and result sets are closed when a statement is closed/return
- to the prepared statement cache. valid values are: false - do not track statements
- and results true - track statements and result sets and warn when they are
- not closed nowarn - track statements but do no warn about them being unclosed
+ Whether to check for unclosed statements when a connection is returned
+ to the pool and result sets are closed when a statement is closed/return
+ to the prepared statement cache. valid values are: false - do not track statements
+ and results true - track statements and result sets and warn when they are
+ not closed nowarn - track statements but do no warn about them being unclosed
(the default) e.g. <track-statements>nowarn</track-statements>
]]>
</xs:documentation>
@@ -682,8 +682,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Whether to share prepare statements, i.e. whether asking for same
- statement twice without closing uses the same underlying prepared statement.
+ Whether to share prepare statements, i.e. whether asking for same
+ statement twice without closing uses the same underlying prepared statement.
The default is false. e.g. <share-prepared-statements/>
]]>
</xs:documentation>
@@ -697,7 +697,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The min-pool-size element indicates the minimum number of connections
+ The min-pool-size element indicates the minimum number of connections
a pool should hold. This default to 0. Ex: <min-pool-size>1</min-pool-size>
]]>
</xs:documentation>
@@ -707,7 +707,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The initial-pool-size element indicates the initial number of connections
+ The initial-pool-size element indicates the initial number of connections
a pool should hold. This default to 0. Ex: <initial-pool-size>1</initial-pool-size>
]]>
</xs:documentation>
@@ -717,9 +717,9 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The max-pool-size element indicates the maximum number of connections
- for a pool. No more connections will be created in each sub-pool.
- This defaults to 20.
+ The max-pool-size element indicates the maximum number of connections
+ for a pool. No more connections will be created in each sub-pool.
+ This defaults to 20.
]]>
</xs:documentation>
</xs:annotation>
@@ -728,7 +728,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Whether to attempt to prefill the connection pool. Empty element denotes
+ Whether to attempt to prefill the connection pool. Empty element denotes
a true value. e.g. <prefill>true</prefill>.
Default is false
]]>
@@ -790,7 +790,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- An org.jboss.jca.adapters.jdbc.spi.listener.ConnectionListener that provides
+ An org.jboss.jca.adapters.jdbc.spi.listener.ConnectionListener that provides
a possible to listen for connection activation and passivation in order to
perform actions before the connection is returned to the application or returned
to the pool. Ex:
@@ -809,8 +809,8 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The is-same-rm-override element allows one to unconditionally
- set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns
+ The is-same-rm-override element allows one to unconditionally
+ set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns
true or false. Ex: <is-same-rm-override>true</is-same-rm-override>
]]>
</xs:documentation>
@@ -820,7 +820,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- An element to enable interleaving for XA connection factories
+ An element to enable interleaving for XA connection factories
Ex: <interleaving/>
]]>
</xs:documentation>
@@ -830,7 +830,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Oracle does not like XA connections getting used both inside and outside a JTA transaction.
+ Oracle does not like XA connections getting used both inside and outside a JTA transaction.
To workaround the problem you can create separate sub-pools for the different contexts
using <no-tx-separate-pools/>
Ex: <no-tx-separate-pools/>
@@ -869,7 +869,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specify the username used when creating a new connection.
+ Specify the username used when creating a new connection.
Ex: <user-name>sa</user-name>
]]>
</xs:documentation>
@@ -879,7 +879,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specify the password used when creating a new connection.
+ Specify the password used when creating a new connection.
Ex: <password>sa-pass</password>
]]>
</xs:documentation>
@@ -889,7 +889,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Indicates Subject (from security domain) are used to distinguish connections in the pool.
+ Indicates Subject (from security domain) are used to distinguish connections in the pool.
The content of the security-domain is the name of the JAAS security manager that will handle
authentication. This name correlates to the JAAS login-config.xml descriptor
application-policy/name attribute.
@@ -948,7 +948,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Specifies the extension plugin used in spi (core.spi.xa)
+ Specifies the extension plugin used in spi (core.spi.xa)
which can be implemented by various plugins to provide better feedback to the XA recovery system.
]]>
</xs:documentation>
@@ -982,7 +982,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The fully qualifed name of the javax.sql.DataSource implementation
+ The fully qualifed name of the javax.sql.DataSource implementation
class.
]]>
</xs:documentation>
@@ -991,7 +991,7 @@
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The fully qualifed name of the javax.sql.XADataSource implementation
+ The fully qualifed name of the javax.sql.XADataSource implementation
class. Ex: <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
]]>
</xs:documentation>
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datatypes.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datatypes.dtd
new file mode 100644
index 0000000..130bc89
--- /dev/null
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/datatypes.dtd
@@ -0,0 +1,250 @@
+<!--
+
+W3C Software and Document Notice and License
+
+This work is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+- The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+- Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice should
+ be included.
+- Notice of any changes or modifications, through a copyright statement on the
+ new code or document such as "This software or document includes material
+ copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+Changes:
+
+- Added license header
+
+-->
+<!--
+ DTD for XML Schemas: Part 2: Datatypes
+ $Id$
+ Note this DTD is NOT normative, or even definitive. - - the
+ prose copy in the datatypes REC is the definitive version
+ (which shouldn't differ from this one except for this comment
+ and entity expansions, but just in case)
+ -->
+
+<!--
+ This DTD cannot be used on its own, it is intended
+ only for incorporation in XMLSchema.dtd, q.v.
+ -->
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % simpleType "%p;simpleType">
+<!ENTITY % restriction "%p;restriction">
+<!ENTITY % list "%p;list">
+<!ENTITY % union "%p;union">
+<!ENTITY % maxExclusive "%p;maxExclusive">
+<!ENTITY % minExclusive "%p;minExclusive">
+<!ENTITY % maxInclusive "%p;maxInclusive">
+<!ENTITY % minInclusive "%p;minInclusive">
+<!ENTITY % totalDigits "%p;totalDigits">
+<!ENTITY % fractionDigits "%p;fractionDigits">
+<!ENTITY % length "%p;length">
+<!ENTITY % minLength "%p;minLength">
+<!ENTITY % maxLength "%p;maxLength">
+<!ENTITY % enumeration "%p;enumeration">
+<!ENTITY % whiteSpace "%p;whiteSpace">
+<!ENTITY % pattern "%p;pattern">
+
+<!--
+ Customisation entities for the ATTLIST of each element
+ type. Define one of these if your schema takes advantage
+ of the anyAttribute='##other' in the schema for schemas
+ -->
+
+<!ENTITY % simpleTypeAttrs "">
+<!ENTITY % restrictionAttrs "">
+<!ENTITY % listAttrs "">
+<!ENTITY % unionAttrs "">
+<!ENTITY % maxExclusiveAttrs "">
+<!ENTITY % minExclusiveAttrs "">
+<!ENTITY % maxInclusiveAttrs "">
+<!ENTITY % minInclusiveAttrs "">
+<!ENTITY % totalDigitsAttrs "">
+<!ENTITY % fractionDigitsAttrs "">
+<!ENTITY % lengthAttrs "">
+<!ENTITY % minLengthAttrs "">
+<!ENTITY % maxLengthAttrs "">
+<!ENTITY % enumerationAttrs "">
+<!ENTITY % whiteSpaceAttrs "">
+<!ENTITY % patternAttrs "">
+
+<!-- Define some entities for informative use as attribute
+ types -->
+<!ENTITY % URIref "CDATA">
+<!ENTITY % XPathExpr "CDATA">
+<!ENTITY % QName "NMTOKEN">
+<!ENTITY % QNames "NMTOKENS">
+<!ENTITY % NCName "NMTOKEN">
+<!ENTITY % nonNegativeInteger "NMTOKEN">
+<!ENTITY % boolean "(true|false)">
+<!ENTITY % simpleDerivationSet "CDATA">
+<!--
+ #all or space-separated list drawn from derivationChoice
+ -->
+
+<!--
+ Note that the use of 'facet' below is less restrictive
+ than is really intended: There should in fact be no
+ more than one of each of minInclusive, minExclusive,
+ maxInclusive, maxExclusive, totalDigits, fractionDigits,
+ length, maxLength, minLength within datatype,
+ and the min- and max- variants of Inclusive and Exclusive
+ are mutually exclusive. On the other hand, pattern and
+ enumeration may repeat.
+ -->
+<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
+<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
+<!ENTITY % bounds "%minBound; | %maxBound;">
+<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
+<!ENTITY % ordered "%bounds; | %numeric;">
+<!ENTITY % unordered
+ "%pattern; | %enumeration; | %whiteSpace; | %length; |
+ %maxLength; | %minLength;">
+<!ENTITY % facet "%ordered; | %unordered;">
+<!ENTITY % facetAttr
+ "value CDATA #REQUIRED
+ id ID #IMPLIED">
+<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
+<!ENTITY % facetModel "(%annotation;)?">
+<!ELEMENT %simpleType;
+ ((%annotation;)?, (%restriction; | %list; | %union;))>
+<!ATTLIST %simpleType;
+ name %NCName; #IMPLIED
+ final %simpleDerivationSet; #IMPLIED
+ id ID #IMPLIED
+ %simpleTypeAttrs;>
+<!-- name is required at top level -->
+<!ELEMENT %restriction; ((%annotation;)?,
+ (%restriction1; |
+ ((%simpleType;)?,(%facet;)*)),
+ (%attrDecls;))>
+<!ATTLIST %restriction;
+ base %QName; #IMPLIED
+ id ID #IMPLIED
+ %restrictionAttrs;>
+<!--
+ base and simpleType child are mutually exclusive,
+ one is required.
+
+ restriction is shared between simpleType and
+ simpleContent and complexContent (in XMLSchema.xsd).
+ restriction1 is for the latter cases, when this
+ is restricting a complex type, as is attrDecls.
+ -->
+<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
+<!ATTLIST %list;
+ itemType %QName; #IMPLIED
+ id ID #IMPLIED
+ %listAttrs;>
+<!--
+ itemType and simpleType child are mutually exclusive,
+ one is required
+ -->
+<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
+<!ATTLIST %union;
+ id ID #IMPLIED
+ memberTypes %QNames; #IMPLIED
+ %unionAttrs;>
+<!--
+ At least one item in memberTypes or one simpleType
+ child is required
+ -->
+
+<!ELEMENT %maxExclusive; %facetModel;>
+<!ATTLIST %maxExclusive;
+ %facetAttr;
+ %fixedAttr;
+ %maxExclusiveAttrs;>
+<!ELEMENT %minExclusive; %facetModel;>
+<!ATTLIST %minExclusive;
+ %facetAttr;
+ %fixedAttr;
+ %minExclusiveAttrs;>
+
+<!ELEMENT %maxInclusive; %facetModel;>
+<!ATTLIST %maxInclusive;
+ %facetAttr;
+ %fixedAttr;
+ %maxInclusiveAttrs;>
+<!ELEMENT %minInclusive; %facetModel;>
+<!ATTLIST %minInclusive;
+ %facetAttr;
+ %fixedAttr;
+ %minInclusiveAttrs;>
+
+<!ELEMENT %totalDigits; %facetModel;>
+<!ATTLIST %totalDigits;
+ %facetAttr;
+ %fixedAttr;
+ %totalDigitsAttrs;>
+<!ELEMENT %fractionDigits; %facetModel;>
+<!ATTLIST %fractionDigits;
+ %facetAttr;
+ %fixedAttr;
+ %fractionDigitsAttrs;>
+
+<!ELEMENT %length; %facetModel;>
+<!ATTLIST %length;
+ %facetAttr;
+ %fixedAttr;
+ %lengthAttrs;>
+<!ELEMENT %minLength; %facetModel;>
+<!ATTLIST %minLength;
+ %facetAttr;
+ %fixedAttr;
+ %minLengthAttrs;>
+<!ELEMENT %maxLength; %facetModel;>
+<!ATTLIST %maxLength;
+ %facetAttr;
+ %fixedAttr;
+ %maxLengthAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %enumeration; %facetModel;>
+<!ATTLIST %enumeration;
+ %facetAttr;
+ %enumerationAttrs;>
+
+<!ELEMENT %whiteSpace; %facetModel;>
+<!ATTLIST %whiteSpace;
+ %facetAttr;
+ %fixedAttr;
+ %whiteSpaceAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %pattern; %facetModel;>
+<!ATTLIST %pattern;
+ %facetAttr;
+ %patternAttrs;>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/eap.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/eap.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/eap.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/eap.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_6.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_6.xsd
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_6.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_6.xsd
index b9ac4c0..b96b2f1 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_6.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_6.xsd
@@ -879,8 +879,8 @@ Other names may be trademarks of their respective owners.
java.lang.Long
java.lang.Float
java.lang.Double
- java.lang.Class
- any enumeration type (i.e. a subclass of java.lang.Enum)
+ java.lang.Class
+ any enumeration type (i.e. a subclass of java.lang.Enum)
Examples:
@@ -1049,8 +1049,8 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- The following transaction isolation levels are allowed
- (see documentation for the java.sql.Connection interface):
+ The following transaction isolation levels are allowed
+ (see documentation for the java.sql.Connection interface):
TRANSACTION_READ_UNCOMMITTED
TRANSACTION_READ_COMMITTED
TRANSACTION_REPEATABLE_READ
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_8.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_8.xsd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_8.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_8.xsd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_3.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_3.xsd
similarity index 90%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_3.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_3.xsd
index bfb1719..8c62a96 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_3.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_3.xsd
@@ -99,10 +99,10 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The service-interface element declares the fully qualified class
- name of the JAX-RPC Service interface the client depends on.
+ name of the JAX-RPC Service interface the client depends on.
In most cases the value will be javax.xml.rpc.Service. A JAX-RPC
generated Service Interface class may also be specified.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -113,18 +113,18 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- The service-ref-type element declares the type of the service-ref
+ The service-ref-type element declares the type of the service-ref
element that is injected or returned when a JNDI lookup is done.
- This must be either a fully qualified name of Service class or
- the fully qualified name of service endpoint interface class.
- This is only used with JAX-WS runtime where the corresponding
+ This must be either a fully qualified name of Service class or
+ the fully qualified name of service endpoint interface class.
+ This is only used with JAX-WS runtime where the corresponding
@WebServiceRef annotation can be used to denote both a Service
or a Port.
-
- If this is not specified, then the type of service-ref element
- that is injected or returned when a JNDI lookup is done is
+
+ If this is not specified, then the type of service-ref element
+ that is injected or returned when a JNDI lookup is done is
always a Service interface/class.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -137,7 +137,7 @@ Other names may be trademarks of their respective owners.
The wsdl-file element contains the URI location of a WSDL
file. The location is relative to the root of the module.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -150,11 +150,11 @@ Other names may be trademarks of their respective owners.
The jaxrpc-mapping-file element contains the name of a file that
describes the JAX-RPC mapping between the Java interaces used by
- the application and the WSDL description in the wsdl-file. The
+ the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module file.
-
+
This is not required when JAX-WS based runtime is used.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -168,7 +168,7 @@ Other names may be trademarks of their respective owners.
The service-qname element declares the specific WSDL service
element that is being refered to. It is not specified if no
wsdl-file is declared.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -184,7 +184,7 @@ Other names may be trademarks of their respective owners.
to a WSDL port. It optionally associates the Service Endpoint
Interface with a particular port-component. This is only used
by the container for a Service.getPort(Class) method call.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -196,14 +196,14 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- Declares the handler for a port-component. Handlers can
- access the init-param name/value pairs using the
- HandlerInfo interface. If port-name is not specified, the
- handler is assumed to be associated with all ports of the
- service.
-
- To be used with JAX-RPC based runtime only.
-
+ Declares the handler for a port-component. Handlers can
+ access the init-param name/value pairs using the
+ HandlerInfo interface. If port-name is not specified, the
+ handler is assumed to be associated with all ports of the
+ service.
+
+ To be used with JAX-RPC based runtime only.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -214,8 +214,8 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- To be used with JAX-WS based runtime only.
-
+ To be used with JAX-WS based runtime only.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -238,7 +238,7 @@ Other names may be trademarks of their respective owners.
to a WSDL port. It optionally associates the Service Endpoint
Interface with a particular port-component. This is only used
by the container for a Service.getPort(Class) method call.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -250,7 +250,7 @@ Other names may be trademarks of their respective owners.
The service-endpoint-interface element defines a fully qualified
Java class that represents the Service Endpoint Interface of a
WSDL port.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -262,10 +262,10 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
Used to enable or disable SOAP MTOM/XOP mechanism on the client
- side for a port-component.
-
+ side for a port-component.
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -278,9 +278,9 @@ Other names may be trademarks of their respective owners.
When MTOM is enabled, binary data above this size in bytes
should be XOP encoded or sent as attachment. Default value is 0.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -294,11 +294,11 @@ Other names may be trademarks of their respective owners.
This specifies the WS-Addressing requirements for a JAX-WS
web service. It corresponds to javax.xml.ws.soap.Addressing
annotation or its feature javax.xml.ws.soap.AddressingFeature.
-
+
See the addressingType for more information.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -314,9 +314,9 @@ Other names may be trademarks of their respective owners.
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -330,13 +330,13 @@ Other names may be trademarks of their respective owners.
The port-component-link element links a port-component-ref
to a specific port-component required to be made available
by a service reference.
-
+
The value of a port-component-link must be the
port-component-name of a port-component in the same module
or another module in the same application unit. The syntax
for specification follows the syntax defined for ejb-link
in the EJB 2.0 specification.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -354,7 +354,7 @@ Other names may be trademarks of their respective owners.
The handler-chains element defines the handlerchains associated with this
service or service endpoint.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -374,17 +374,17 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- The handler-chain element defines the handlerchain.
+ The handler-chain element defines the handlerchain.
Handlerchain can be defined such that the handlers in the
handlerchain operate,all ports of a service, on a specific
port or on a list of protocol-bindings. The choice of elements
service-name-pattern, port-name-pattern and protocol-bindings
are used to specify whether the handlers in handler-chain are
- for a service, port or protocol binding. If none of these
+ for a service, port or protocol binding. If none of these
choices are specified with the handler-chain element then the
- handlers specified in the handler-chain will be applied on
+ handlers specified in the handler-chain will be applied on
everything.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -412,9 +412,9 @@ Other names may be trademarks of their respective owners.
Defines the type used for specifying a list of
protocol-bindingType(s). For e.g.
-
+
##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="javaee:protocol-bindingType"/>
@@ -427,17 +427,17 @@ Other names may be trademarks of their respective owners.
Defines the type used for specifying the URI for the
protocol binding used by the port-component. For
portability one could use one of the following tokens that
- alias the standard binding types:
-
+ alias the standard binding types:
+
##SOAP11_HTTP
##SOAP11_HTTP_MTOM
##SOAP12_HTTP
##SOAP12_HTTP_MTOM
##XML_HTTP
-
+
Other specifications could define tokens that start with ##
to alias new standard binding URIs that are introduced.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/>
@@ -451,18 +451,18 @@ Other names may be trademarks of their respective owners.
start with ## which are used to alias existing standard
protocol bindings and support aliases for new standard
binding URIs that are introduced in future specifications.
-
+
The following tokens alias the standard protocol binding
URIs:
-
+
##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
- ##SOAP11_HTTP_MTOM =
+ ##SOAP11_HTTP_MTOM =
"http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
- ##SOAP12_HTTP_MTOM =
+ ##SOAP12_HTTP_MTOM =
"http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -477,42 +477,42 @@ Other names may be trademarks of their respective owners.
This is used to specify the QName pattern in the
attribute service-name-pattern and port-name-pattern in
the handler-chain element
-
+
For example, the various forms acceptable here for
service-name-pattern attribute in handler-chain element
are :
-
+
Exact Name: service-name-pattern="ns1:EchoService"
-
- In this case, handlers specified in this
- handler-chain element will apply to all ports with
- this exact service name. The namespace prefix must
- have been declared in a namespace declaration
- attribute in either the start-tag of the element
- where the prefix is used or in an an ancestor
- element (i.e. an element in whose content the
- prefixed markup occurs)
-
-
+
+ In this case, handlers specified in this
+ handler-chain element will apply to all ports with
+ this exact service name. The namespace prefix must
+ have been declared in a namespace declaration
+ attribute in either the start-tag of the element
+ where the prefix is used or in an an ancestor
+ element (i.e. an element in whose content the
+ prefixed markup occurs)
+
+
Pattern : service-name-pattern="ns1:EchoService*"
-
- In this case, handlers specified in this
- handler-chain element will apply to all ports whose
- Service names are like EchoService1, EchoServiceFoo
- etc. The namespace prefix must have been declared in
- a namespace declaration attribute in either the
- start-tag of the element where the prefix is used or
- in an an ancestor element (i.e. an element in whose
- content the prefixed markup occurs)
-
+
+ In this case, handlers specified in this
+ handler-chain element will apply to all ports whose
+ Service names are like EchoService1, EchoServiceFoo
+ etc. The namespace prefix must have been declared in
+ a namespace declaration attribute in either the
+ start-tag of the element where the prefix is used or
+ in an an ancestor element (i.e. an element in whose
+ content the prefixed markup occurs)
+
Wild Card : service-name-pattern="*"
-
- In this case, handlers specified in this handler-chain
- element will apply to ports of all service names.
-
+
+ In this case, handlers specified in this handler-chain
+ element will apply to ports of all service names.
+
The same can be applied to port-name attribute in
handler-chain element.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -530,26 +530,26 @@ Other names may be trademarks of their respective owners.
This specifies the WS-Addressing requirements for a JAX-WS web service.
It corresponds to javax.xml.ws.soap.Addressing annotation or its
feature javax.xml.ws.soap.AddressingFeature.
-
+
If the "enabled" element is "true", WS-Addressing is enabled.
It means that the endpoint supports WS-Addressing but does not require
its use. The default value for "enabled" is "true".
-
+
If the WS-Addressing is enabled and the "required" element is "true",
it means that the endpoint requires WS-Addressing. The default value
for "required" is "false".
-
+
If WS-Addressing is enabled, the "responses" element determines
if an endpoint requires the use of only anonymous responses,
or only non-anonymous responses, or all. The value of the "responses"
element must be one of the following:
-
+
ANONYMOUS
NON_ANONYMOUS
ALL
-
+
The default value for the "responses" is ALL.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -578,7 +578,7 @@ Other names may be trademarks of their respective owners.
If WS-Addressing is enabled, this type determines if an endpoint
requires the use of only anonymous responses, or only non-anonymous
responses, or all.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -602,10 +602,10 @@ Other names may be trademarks of their respective owners.
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
If the "enabled" element is "true", wsdl:binding in the
associated WSDL, if any, must be respected/honored.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -625,9 +625,9 @@ Other names may be trademarks of their respective owners.
Declares the handler for a port-component, service-ref. Handlers can
access the init-param name/value pairs using the HandlerInfo interface.
-
+
Used in: port-component, service-ref
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -639,7 +639,7 @@ Other names may be trademarks of their respective owners.
Defines the name of the handler. The name must be unique within the
module.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -649,7 +649,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
Defines a fully qualified class name for the handler implementation.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -661,7 +661,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -674,9 +674,9 @@ Other names may be trademarks of their respective owners.
Defines the QName of a SOAP header that will be processed by the
handler.
-
+
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -689,7 +689,7 @@ Other names may be trademarks of their respective owners.
The soap-role element contains a SOAP actor definition that the
Handler will play as a role.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -704,9 +704,9 @@ Other names may be trademarks of their respective owners.
handler should be associated with. If port-name is not
specified, the handler is assumed to be associated with
all ports of the service.
-
+
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -727,7 +727,7 @@ Other names may be trademarks of their respective owners.
Defines the name of the handler. The name must be unique
within the module.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:handler"/>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_4.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_4.xsd
similarity index 90%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_4.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_4.xsd
index d474a8d..7ff3a95 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_4.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javaee_web_services_client_1_4.xsd
@@ -10,9 +10,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved.
-
+
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
@@ -21,20 +21,20 @@
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.
-
+
When distributing the software, include this License Header Notice in each
file and include the License file at packager/legal/LICENSE.txt.
-
+
GPL Classpath Exception:
Oracle designates this particular file as subject to the "Classpath"
exception as provided by Oracle in the GPL Version 2 section of the License
file that accompanied this code.
-
+
Modifications:
If applicable, add the following below the License Header, with the fields
enclosed by brackets [] replaced by your own identifying information:
"Portions Copyright [year] [name of copyright owner]"
-
+
Contributor(s):
If you wish your version of this file to be governed by only the CDDL or
only the GPL Version 2, indicate your decision by adding "[Contributor]
@@ -46,7 +46,7 @@
and therefore, elected the GPL Version 2 license, then the option applies
only if the new code is made subject to such option by the copyright
holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -54,7 +54,7 @@
<xsd:documentation>
(C) Copyright International Business Machines Corporation 2002
-
+
</xsd:documentation>
</xsd:annotation>
@@ -70,9 +70,9 @@
icons, a declaration of the required Service interface,
an optional WSDL document location, an optional set
of JAX-RPC mappings, an optional QName for the service element,
- an optional set of Service Endpoint Interfaces to be resolved
+ an optional set of Service Endpoint Interfaces to be resolved
by the container to a WSDL port, and an optional set of handlers.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -83,10 +83,10 @@
<xsd:documentation>
The service-ref-name element declares logical name that the
- components in the module use to look up the Web service. It
- is recommended that all service reference names start with
+ components in the module use to look up the Web service. It
+ is recommended that all service reference names start with
"service/".
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -96,10 +96,10 @@
<xsd:documentation>
The service-interface element declares the fully qualified class
- name of the JAX-RPC Service interface the client depends on.
+ name of the JAX-RPC Service interface the client depends on.
In most cases the value will be javax.xml.rpc.Service. A JAX-RPC
generated Service Interface class may also be specified.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -110,18 +110,18 @@
<xsd:annotation>
<xsd:documentation>
- The service-ref-type element declares the type of the service-ref
+ The service-ref-type element declares the type of the service-ref
element that is injected or returned when a JNDI lookup is done.
- This must be either a fully qualified name of Service class or
- the fully qualified name of service endpoint interface class.
- This is only used with JAX-WS runtime where the corresponding
+ This must be either a fully qualified name of Service class or
+ the fully qualified name of service endpoint interface class.
+ This is only used with JAX-WS runtime where the corresponding
@WebServiceRef annotation can be used to denote both a Service
or a Port.
-
- If this is not specified, then the type of service-ref element
- that is injected or returned when a JNDI lookup is done is
+
+ If this is not specified, then the type of service-ref element
+ that is injected or returned when a JNDI lookup is done is
always a Service interface/class.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -134,7 +134,7 @@
The wsdl-file element contains the URI location of a WSDL
file. The location is relative to the root of the module.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -147,11 +147,11 @@
The jaxrpc-mapping-file element contains the name of a file that
describes the JAX-RPC mapping between the Java interaces used by
- the application and the WSDL description in the wsdl-file. The
+ the application and the WSDL description in the wsdl-file. The
file name is a relative path within the module file.
-
+
This is not required when JAX-WS based runtime is used.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -165,7 +165,7 @@
The service-qname element declares the specific WSDL service
element that is being refered to. It is not specified if no
wsdl-file is declared.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -181,7 +181,7 @@
to a WSDL port. It optionally associates the Service Endpoint
Interface with a particular port-component. This is only used
by the container for a Service.getPort(Class) method call.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -193,14 +193,14 @@
<xsd:annotation>
<xsd:documentation>
- Declares the handler for a port-component. Handlers can
- access the init-param name/value pairs using the
- HandlerInfo interface. If port-name is not specified, the
- handler is assumed to be associated with all ports of the
- service.
-
- To be used with JAX-RPC based runtime only.
-
+ Declares the handler for a port-component. Handlers can
+ access the init-param name/value pairs using the
+ HandlerInfo interface. If port-name is not specified, the
+ handler is assumed to be associated with all ports of the
+ service.
+
+ To be used with JAX-RPC based runtime only.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -211,8 +211,8 @@
<xsd:annotation>
<xsd:documentation>
- To be used with JAX-WS based runtime only.
-
+ To be used with JAX-WS based runtime only.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -235,7 +235,7 @@
to a WSDL port. It optionally associates the Service Endpoint
Interface with a particular port-component. This is only used
by the container for a Service.getPort(Class) method call.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -247,7 +247,7 @@
The service-endpoint-interface element defines a fully qualified
Java class that represents the Service Endpoint Interface of a
WSDL port.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -259,10 +259,10 @@
<xsd:documentation>
Used to enable or disable SOAP MTOM/XOP mechanism on the client
- side for a port-component.
-
+ side for a port-component.
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -275,9 +275,9 @@
When MTOM is enabled, binary data above this size in bytes
should be XOP encoded or sent as attachment. Default value is 0.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -291,11 +291,11 @@
This specifies the WS-Addressing requirements for a JAX-WS
web service. It corresponds to javax.xml.ws.soap.Addressing
annotation or its feature javax.xml.ws.soap.AddressingFeature.
-
+
See the addressingType for more information.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -311,9 +311,9 @@
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
Not to be specified for JAX-RPC runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -327,13 +327,13 @@
The port-component-link element links a port-component-ref
to a specific port-component required to be made available
by a service reference.
-
+
The value of a port-component-link must be the
port-component-name of a port-component in the same module
or another module in the same application unit. The syntax
for specification follows the syntax defined for ejb-link
in the EJB 2.0 specification.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -351,7 +351,7 @@
The handler-chains element defines the handlerchains associated with this
service or service endpoint.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -371,17 +371,17 @@
<xsd:annotation>
<xsd:documentation>
- The handler-chain element defines the handlerchain.
+ The handler-chain element defines the handlerchain.
Handlerchain can be defined such that the handlers in the
handlerchain operate,all ports of a service, on a specific
port or on a list of protocol-bindings. The choice of elements
service-name-pattern, port-name-pattern and protocol-bindings
are used to specify whether the handlers in handler-chain are
- for a service, port or protocol binding. If none of these
+ for a service, port or protocol binding. If none of these
choices are specified with the handler-chain element then the
- handlers specified in the handler-chain will be applied on
+ handlers specified in the handler-chain will be applied on
everything.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -409,9 +409,9 @@
Defines the type used for specifying a list of
protocol-bindingType(s). For e.g.
-
+
##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:list itemType="javaee:protocol-bindingType"/>
@@ -424,17 +424,17 @@
Defines the type used for specifying the URI for the
protocol binding used by the port-component. For
portability one could use one of the following tokens that
- alias the standard binding types:
-
+ alias the standard binding types:
+
##SOAP11_HTTP
##SOAP11_HTTP_MTOM
##SOAP12_HTTP
##SOAP12_HTTP_MTOM
##XML_HTTP
-
+
Other specifications could define tokens that start with ##
to alias new standard binding URIs that are introduced.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/>
@@ -448,18 +448,18 @@
start with ## which are used to alias existing standard
protocol bindings and support aliases for new standard
binding URIs that are introduced in future specifications.
-
+
The following tokens alias the standard protocol binding
URIs:
-
+
##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
- ##SOAP11_HTTP_MTOM =
+ ##SOAP11_HTTP_MTOM =
"http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
- ##SOAP12_HTTP_MTOM =
+ ##SOAP12_HTTP_MTOM =
"http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -474,42 +474,42 @@
This is used to specify the QName pattern in the
attribute service-name-pattern and port-name-pattern in
the handler-chain element
-
+
For example, the various forms acceptable here for
service-name-pattern attribute in handler-chain element
are :
-
+
Exact Name: service-name-pattern="ns1:EchoService"
-
- In this case, handlers specified in this
- handler-chain element will apply to all ports with
- this exact service name. The namespace prefix must
- have been declared in a namespace declaration
- attribute in either the start-tag of the element
- where the prefix is used or in an an ancestor
- element (i.e. an element in whose content the
- prefixed markup occurs)
-
-
+
+ In this case, handlers specified in this
+ handler-chain element will apply to all ports with
+ this exact service name. The namespace prefix must
+ have been declared in a namespace declaration
+ attribute in either the start-tag of the element
+ where the prefix is used or in an an ancestor
+ element (i.e. an element in whose content the
+ prefixed markup occurs)
+
+
Pattern : service-name-pattern="ns1:EchoService*"
-
- In this case, handlers specified in this
- handler-chain element will apply to all ports whose
- Service names are like EchoService1, EchoServiceFoo
- etc. The namespace prefix must have been declared in
- a namespace declaration attribute in either the
- start-tag of the element where the prefix is used or
- in an an ancestor element (i.e. an element in whose
- content the prefixed markup occurs)
-
+
+ In this case, handlers specified in this
+ handler-chain element will apply to all ports whose
+ Service names are like EchoService1, EchoServiceFoo
+ etc. The namespace prefix must have been declared in
+ a namespace declaration attribute in either the
+ start-tag of the element where the prefix is used or
+ in an an ancestor element (i.e. an element in whose
+ content the prefixed markup occurs)
+
Wild Card : service-name-pattern="*"
-
- In this case, handlers specified in this handler-chain
- element will apply to ports of all service names.
-
+
+ In this case, handlers specified in this handler-chain
+ element will apply to ports of all service names.
+
The same can be applied to port-name attribute in
handler-chain element.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -527,26 +527,26 @@
This specifies the WS-Addressing requirements for a JAX-WS web service.
It corresponds to javax.xml.ws.soap.Addressing annotation or its
feature javax.xml.ws.soap.AddressingFeature.
-
+
If the "enabled" element is "true", WS-Addressing is enabled.
It means that the endpoint supports WS-Addressing but does not require
its use. The default value for "enabled" is "true".
-
+
If the WS-Addressing is enabled and the "required" element is "true",
it means that the endpoint requires WS-Addressing. The default value
for "required" is "false".
-
+
If WS-Addressing is enabled, the "responses" element determines
if an endpoint requires the use of only anonymous responses,
or only non-anonymous responses, or all. The value of the "responses"
element must be one of the following:
-
+
ANONYMOUS
NON_ANONYMOUS
ALL
-
+
The default value for the "responses" is ALL.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -575,7 +575,7 @@
If WS-Addressing is enabled, this type determines if an endpoint
requires the use of only anonymous responses, or only non-anonymous
responses, or all.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -599,10 +599,10 @@
service feature. This is used to control whether a JAX-WS
implementation must respect/honor the contents of the
wsdl:binding in the WSDL that is associated with the service.
-
+
If the "enabled" element is "true", wsdl:binding in the
associated WSDL, if any, must be respected/honored.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -622,9 +622,9 @@
Declares the handler for a port-component, service-ref. Handlers can
access the init-param name/value pairs using the HandlerInfo interface.
-
+
Used in: port-component, service-ref
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -636,7 +636,7 @@
Defines the name of the handler. The name must be unique within the
module.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -646,7 +646,7 @@
<xsd:documentation>
Defines a fully qualified class name for the handler implementation.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -658,7 +658,7 @@
<xsd:documentation>
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -671,9 +671,9 @@
Defines the QName of a SOAP header that will be processed by the
handler.
-
+
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -686,7 +686,7 @@
The soap-role element contains a SOAP actor definition that the
Handler will play as a role.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -701,9 +701,9 @@
handler should be associated with. If port-name is not
specified, the handler is assumed to be associated with
all ports of the service.
-
+
Not to be specified for JAX-WS runtime
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -724,7 +724,7 @@
Defines the name of the handler. The name must be unique
within the module.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:handler"/>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javamail.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javamail.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javamail.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/javamail.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-app_4_0_1.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-app_4_0_1.dtd
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-app_4_0_1.dtd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-app_4_0_1.dtd
index c3876d2..ca08a49 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-app_4_0_1.dtd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-app_4_0_1.dtd
@@ -31,15 +31,15 @@ DOCTYPE jboss-app
<!--
The value of the module-order could be implicit or strict
<module-order>strict</module-order>
- or
+ or
<module-order>implicit</module-order>
- The strict value indicates that the deployments of the modules will
- be done in the order that would be specified in the application.xml
- and jboss-app.xml file .
- The implicit value indicates the deployment would follow the order
+ The strict value indicates that the deployments of the modules will
+ be done in the order that would be specified in the application.xml
+ and jboss-app.xml file .
+ The implicit value indicates the deployment would follow the order
which would be specified in the DeploymentSorter.
The default order will be implicit to support backward compatibility
--->
+-->
<!ELEMENT module-order (#PCDATA)>
<!--
@@ -157,4 +157,3 @@ Example:
Used in: security-role
-->
<!ELEMENT principal-name (#PCDATA)>
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-as-messaging-deployment_1_0_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-as-messaging-deployment_1_0_1.xsd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-as-messaging-deployment_1_0_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-as-messaging-deployment_1_0_1.xsd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-client_4_0_1.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-client_4_0_1.dtd
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-client_4_0_1.dtd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-client_4_0_1.dtd
index 6a9227e..01b2aea 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-client_4_0_1.dtd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-client_4_0_1.dtd
@@ -29,7 +29,7 @@ j2ee-1.4 application-client_1_4.xsd.
<!ENTITY % service-ref PUBLIC
"-//JBoss//DTD Web Service Reference 4.0//EN"
"http://www.jboss.org/j2ee/dtd/service-ref_4_0_1.dtd">
-
+
%service-ref;
<!-- The jboss-client element is the root element.
@@ -139,4 +139,3 @@ of a URL, you can use the jndi-name to do so.
Used in: resource-ref
-->
<!ELEMENT res-url (#PCDATA)>
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd
index 7fddddc..8a26135 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_6_0_1.xsd
@@ -21,14 +21,14 @@
xmlns:javaee="http://java.sun.com/xml/ns/javaee"
xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
+ elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="6.0.1">
<xsd:annotation>
- <xsd:documentation> JBoss, Home of Professional Open Source, Copyright 2005, Red Hat, Inc., and individual
+ <xsd:documentation> JBoss, Home of Professional Open Source, Copyright 2005, Red Hat, Inc., and individual
contributors as indicated by the @authors tag. Licensed 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
+ 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,
@@ -299,7 +299,7 @@
ejb-jar.xml, but you provide a jndi-name in jboss.xml Used in: entity, session,
message-driven, consumer, and service </xsd:documentation>
</xsd:annotation>
-
+
<xsd:sequence>
<xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ejb-ref-name" type="javaee:ejb-ref-nameType" minOccurs="0"/>
@@ -310,8 +310,8 @@
<xsd:group ref="jboss:resourceGroup"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
-
- <!--
+
+ <!--
<xsd:complexContent>
<xsd:extension base="javaee:ejb-refType">
<xsd:sequence>
@@ -382,7 +382,7 @@
</xsd:choice>
<xsd:element name="injection-target" type="jboss:injection-targetType" minOccurs="0" maxOccurs="unbounded" />
-
+
<xsd:element name="ignore-dependency" type="javaee:emptyType" minOccurs="0"/>
</xsd:sequence>
@@ -448,7 +448,7 @@ Examples:
<xsd:complexType name="service-refType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[
+ <![CDATA[
Runtime settings for a web service reference. In the simplest case,
there is no runtime information required for a service ref. Runtime info
is only needed in the following cases :
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_8_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_8_1.xsd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_8_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-common_8_1.xsd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-service_4_0_1.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-service_4_0_1.dtd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-service_4_0_1.dtd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-service_4_0_1.dtd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_14_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_14_1.xsd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_14_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_14_1.xsd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_4_0_1.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_4_0_1.dtd
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_4_0_1.dtd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_4_0_1.dtd
index cb34c91..0f535d3 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_4_0_1.dtd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_4_0_1.dtd
@@ -28,15 +28,15 @@ releases.
<!ENTITY % service-ref PUBLIC
"-//JBoss//DTD Web Service Reference 4.0//EN"
"http://www.jboss.org/j2ee/dtd/service-ref_4_0_1.dtd">
-
+
%service-ref;
<!-- The jboss-web element is the root element.
-->
<!ELEMENT jboss-web (class-loading?, security-domain?, context-root?,
virtual-host*, use-session-cookies?, replication-config?, resource-env-ref*,
- resource-ref*, security-role*, ejb-ref*, ejb-local-ref*,
- message-destination-ref*, message-destination*,
+ resource-ref*, security-role*, ejb-ref*, ejb-local-ref*,
+ message-destination-ref*, message-destination*,
webservice-description*, service-ref*, depends*, servlet*, authenticators*)>
<!-- The class-loading element allows one to override the default class
@@ -110,7 +110,7 @@ org.jboss.security.RealmMapping interfaces for the domain.
<!-- The flushOnSessionInvalidation attribute is a boolean indicating whether
the associated security domain cache should be flushed when the web session is
-invalidated. If true, the security manager service
+invalidated. If true, the security manager service
flushAuthenticationCache(String, java.security.Principal) is called when the
session is seen to be invalid due to expiration or explicit invalidation.
-->
@@ -223,7 +223,7 @@ Used in: ejb-ref
object to which the servlet ENC binding will link to via a JNDI
LinkRef.
-Used in: resource-ref, resource-env-ref, ejb-ref,
+Used in: resource-ref, resource-env-ref, ejb-ref,
message-destination-ref, message-destination
-->
<!ELEMENT jndi-name (#PCDATA)>
@@ -349,7 +349,7 @@ Examples:
attributes in the session, plus some session data, like lastAccessTime. For sessions
carrying large amounts of data, parts of which are infrequently accessed,
this option can increase replication performance.
-
+
Examples:
<replication-granularity>SESSION</replication-granularity>
or
@@ -440,7 +440,7 @@ jboss-web/servlet/servlet-name.
<!--
Customize the tomcat authenticators at the context or web-app level.
These are keyed in by http-auth method specified in login-config in web.xml
-
+
<authenticators>
<authenticator>
<key>BASIC</key>
@@ -462,7 +462,7 @@ jboss-web/servlet/servlet-name.
<key>NONE</key>
<value>org.apache.catalina.authenticator.NonLoginAuthenticator</value>
</authenticator>
- </authenticators>
+ </authenticators>
-->
<!ELEMENT authenticators (authenticator+)>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd
index e19ea2b..9ee4d0b 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss-web_7_3_1.xsd
@@ -833,7 +833,7 @@
<xsd:element name="file-size-threshold" type="xsd:integer" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
-
+
<xsd:complexType name="enable-websocketsType">
<xsd:annotation>
<xsd:documentation>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss_4_0_1.dtd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss_4_0_1.dtd
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss_4_0_1.dtd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss_4_0_1.dtd
index 928a0e6..d733165 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss_4_0_1.dtd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jboss_4_0_1.dtd
@@ -170,7 +170,7 @@ Overview of the architecture of jboss.xml
<!ENTITY % service-ref PUBLIC
"-//JBoss//DTD Web Service Reference 4.0//EN"
"http://www.jboss.org/j2ee/dtd/service-ref_4_0_1.dtd">
-
+
%service-ref;
<!--
@@ -307,9 +307,9 @@ the ejb container configurations.
and other configuration options to use for the various EJB proxies.
-->
<!ELEMENT proxy-factory-config (client-interceptors?, endpoint-interceptors? , web-class-loader? ,
-activation-config?, JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? ,
+activation-config?, JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? ,
CreateJBossMQDestination? , MinimumSize? , MaximumSize? ,
-KeepAliveMillis? , MaxMessages? , MDBConfig? , poa? , register-ejbs-in-jnp-context? ,
+KeepAliveMillis? , MaxMessages? , MDBConfig? , poa? , register-ejbs-in-jnp-context? ,
jnp-context? , interface-repository-supported?)>
<!--
@@ -459,7 +459,7 @@ jnp-context? , interface-repository-supported?)>
<!ELEMENT webservices (context-root?, webservice-description*)>
<!-- The context-root element specifies the context root of the web
-application that the EJB service endpoints are deployed to.
+application that the EJB service endpoints are deployed to.
If it is not specified it will be derived from the deployment short name.
-->
<!ELEMENT context-root (#PCDATA)>
@@ -572,8 +572,8 @@ Example :
message-driven elements. If it is not provided jboss will assume
"jndi-name" = "ejb-name"
- When used in the ejb-ref, ejb-local-ref, resource-ref, resource-env-ref,
- message-destination-ref, message-destination elements this specifies the jndi name to
+ When used in the ejb-ref, ejb-local-ref, resource-ref, resource-env-ref,
+ message-destination-ref, message-destination elements this specifies the jndi name to
which the reference should link.
Used in: entity, session and message-driven
@@ -624,11 +624,11 @@ Example :
<!--
The timer-persistence element determines whether ejb timers should
be persisted across application redeployment. Defaults to true.
-
+
It must be one of the following:
<timer-persistence>true</timer-persistence>
<timer-persistence>false</timer-persistence>
-
+
Used in: session, entity and message-driven
-->
<!ELEMENT timer-persistence (#PCDATA)>
@@ -809,12 +809,12 @@ or for embedded rars
The partition-name element indicates the name of the HAPartition to be used
by the container to exchange clustering information. This is a name and *not*
a JNDI name. Given name will be prefixed by "/HAPartition/" by the container to get
- the actual JNDI name of the HAPartition.
-
- Must be set; there is no hard coded default. Can be set either in a bean's own
+ the actual JNDI name of the HAPartition.
+
+ Must be set; there is no hard coded default. Can be set either in a bean's own
cluster-config element or in a container-configuration used by the bean.
The standard clustered bean container configurations in conf/standardjboss.xml
- set this to the value of system property "jboss.partition.name", or
+ set this to the value of system property "jboss.partition.name", or
"DefaultPartition" if that property is not set.
Used in: entity, session and container-configuration (in clustered-config element)
@@ -823,9 +823,9 @@ or for embedded rars
<!--
The home-load-balance-policy element indicates the java class name to be used
- to load balance calls in the home proxy.
-
- Must be set; there is no hard coded default. Can be set either in a bean's own
+ to load balance calls in the home proxy.
+
+ Must be set; there is no hard coded default. Can be set either in a bean's own
cluster-config element or in a container-configuration used by the bean.
The standard clustered bean container configurations in conf/standardjboss.xml
set this to "org.jboss.ha.framework.interfaces.RoundRobin".
@@ -836,9 +836,9 @@ or for embedded rars
<!--
The bean-load-balance-policy element indicates the java class name to be used
- to load balance calls in an EJB2 bean proxy.
-
- Must be set; there is no hard coded default. Can be set either in a bean's own
+ to load balance calls in an EJB2 bean proxy.
+
+ Must be set; there is no hard coded default. Can be set either in a bean's own
cluster-config element or in a container-configuration used by the bean.
The standard clustered bean container configurations in conf/standardjboss.xml
set this to "org.jboss.ha.framework.interfaces.RoundRobin" for SLSBs and to
@@ -892,15 +892,15 @@ or for embedded rars
<!ELEMENT invalidation-manager-name (#PCDATA)>
<!--
- The session-state-manager-jndi-name element indicates the name of the
- HASessionState to be used by the container as a backend for EJB2 stateful
- session bean management in the cluster. This *is* a JNDI name (unlike the
- partition-name element).
-
- Must be set; there is no hard coded default. Can be set either in a bean's own
+ The session-state-manager-jndi-name element indicates the name of the
+ HASessionState to be used by the container as a backend for EJB2 stateful
+ session bean management in the cluster. This *is* a JNDI name (unlike the
+ partition-name element).
+
+ Must be set; there is no hard coded default. Can be set either in a bean's own
cluster-config element or in a container-configuration used by the bean.
The standard clustered bean container configurations in conf/standardjboss.xml
- set this to "/HASessionState/" plus the value of system property
+ set this to "/HASessionState/" plus the value of system property
"jboss.partition.name", or "DefaultPartition" if that property is not set.
Used in: session or container-configuration (in cluster-config element)
@@ -1570,66 +1570,66 @@ default is Long.MAX_VALUE or essentially enternity.
<!--
ior-security-config element describes the security configuration information for the IOR.
--->
-<!ELEMENT ior-security-config ( transport-config? , as-context?, sas-context? )>
+-->
+<!ELEMENT ior-security-config ( transport-config? , as-context?, sas-context? )>
<!--
transport-config is the root element for security between the end points
-->
<!ELEMENT transport-config ( integrity, confidentiality,
establish-trust-in-target, establish-trust-in-client, detect-misordering?,
- detect-replay?)>
+ detect-replay?)>
<!--
-integrity element indicates if the server (target) supports integrity protected messages.
+integrity element indicates if the server (target) supports integrity protected messages.
The valid values are NONE, SUPPORTED or REQUIRED
--->
+-->
<!ELEMENT integrity ( #PCDATA)>
<!--
-confidentiality element indicates if the server (target) supports privacy protected
+confidentiality element indicates if the server (target) supports privacy protected
messages. The values are NONE, SUPPORTED or REQUIRED
--->
+-->
<!ELEMENT confidentiality ( #PCDATA)>
<!--
-establish-trust-in-target element indicates if the target is capable of authenticating to a client.
+establish-trust-in-target element indicates if the target is capable of authenticating to a client.
The values are NONE or SUPPORTED.
--->
+-->
<!ELEMENT establish-trust-in-target ( #PCDATA)>
<!--
establish-trust-in-client element indicates if the target is capable of authenticating a client. The
values are NONE, SUPPORTED or REQUIRED.
--->
+-->
<!ELEMENT establish-trust-in-client ( #PCDATA)>
<!--
The optional detect-misordering indicates if the server (target) supports
detection of message sequence errors. The values are NONE, SUPPORTED or REQUIRED.
--->
+-->
<!ELEMENT detect-misordering ( #PCDATA)>
<!--
The optional detect-replay indicates if the server (target) supports detection
of message replay attempts. The values are NONE, SUPPORTED or REQUIRED.
--->
+-->
<!ELEMENT detect-replay ( #PCDATA)>
<!--
-as-context (CSIv2 authentication service) is the element describing the authentication
-mechanism that will be used to authenticate the client. If specified it will be the
+as-context (CSIv2 authentication service) is the element describing the authentication
+mechanism that will be used to authenticate the client. If specified it will be the
username-password mechanism.
--->
-<!ELEMENT as-context ( auth-method, realm, required )>
+-->
+<!ELEMENT as-context ( auth-method, realm, required )>
<!--
required element specifies if the authentication method specified is required
to be used for client authentication. If so the EstablishTrustInClient bit
will be set in the target_requires field of the AS_Context. The element value
-is either true or false.
--->
-<!ELEMENT required ( #PCDATA )>
+is either true or false.
+-->
+<!ELEMENT required ( #PCDATA )>
<!--
auth-method element describes the authentication method. The only supported value
@@ -1643,25 +1643,25 @@ mechanism. Legal values for this element are "BASIC", or "CLIENT-CERT".
Used in: as-context, port-component
--->
-<!ELEMENT auth-method ( #PCDATA )>
+-->
+<!ELEMENT auth-method ( #PCDATA )>
<!--
-realm element describes the realm in which the user is authenticated. Must be
+realm element describes the realm in which the user is authenticated. Must be
a valid realm that is registered in server configuration.
--->
-<!ELEMENT realm ( #PCDATA )>
+-->
+<!ELEMENT realm ( #PCDATA )>
<!--
-sas-context (related to CSIv2 security attribute service) element describes
+sas-context (related to CSIv2 security attribute service) element describes
the sas-context fields.
--->
-<!ELEMENT sas-context ( caller-propagation )>
+-->
+<!ELEMENT sas-context ( caller-propagation )>
<!--
caller-propagation element indicates if the target will accept propagated caller identities
The values are NONE or SUPPORTED.
--->
+-->
<!ELEMENT caller-propagation ( #PCDATA) >
<!-- The port-component element specifies a mapping from a webservice
@@ -1679,9 +1679,9 @@ Used in: port-component
<!ELEMENT port-component-name (#PCDATA) >
<!-- Relative path that is appended to the <context-root> element to form fully qualified
-endpoint address for a web service endpoint.
+endpoint address for a web service endpoint.
-For backwards compatibility, it may also be the absolute path starting with web context root
+For backwards compatibility, it may also be the absolute path starting with web context root
to form fully qualified endpoint address for a web service endpoint. In this case, the port component uri
must contain at least two token seperated by '/'. The first token is the web context root,
which must be identical among all port component uris in a given deployment.
@@ -1714,11 +1714,11 @@ used in message-driven and proxy-factory-config
<!ELEMENT activation-config ( activation-config-property* )>
<!--
-Activation config properties
+Activation config properties
used in activation-config
-->
-<!ELEMENT activation-config-property ( activation-config-property-name,
+<!ELEMENT activation-config-property ( activation-config-property-name,
activation-config-property-value )>
<!--
Activation config property name
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jdbc.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jdbc.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jdbc.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jdbc.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jms.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jms.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jms.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jms.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jndi.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jndi.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jndi.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jndi.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jsp_2_3.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jsp_2_3.xsd
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jsp_2_3.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jsp_2_3.xsd
index 564d309..a173205 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jsp_2_3.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/jsp_2_3.xsd
@@ -10,9 +10,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved.
-
+
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
@@ -21,20 +21,20 @@
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.
-
+
When distributing the software, include this License Header Notice in each
file and include the License file at packager/legal/LICENSE.txt.
-
+
GPL Classpath Exception:
Oracle designates this particular file as subject to the "Classpath"
exception as provided by Oracle in the GPL Version 2 section of the License
file that accompanied this code.
-
+
Modifications:
If applicable, add the following below the License Header, with the fields
enclosed by brackets [] replaced by your own identifying information:
"Portions Copyright [year] [name of copyright owner]"
-
+
Contributor(s):
If you wish your version of this file to be governed by only the CDDL or
only the GPL Version 2, indicate your decision by adding "[Contributor]
@@ -46,7 +46,7 @@
and therefore, elected the GPL Version 2 license, then the option applies
only if the new code is made subject to such option by the copyright
holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -56,11 +56,11 @@
This is the XML Schema for the JSP 2.3 deployment descriptor
types. The JSP 2.3 schema contains all the special
structures and datatypes that are necessary to use JSP files
- from a web application.
-
- The contents of this schema is used by the web-common_3_1.xsd
- file to define JSP specific content.
-
+ from a web application.
+
+ The contents of this schema is used by the web-common_3_1.xsd
+ file to define JSP specific content.
+
</xsd:documentation>
</xsd:annotation>
@@ -69,7 +69,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -78,7 +78,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -94,7 +94,7 @@
The jsp-configType is used to provide global configuration
information for the JSP files in a web application. It has
two subelements, taglib and jsp-property-group.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -120,7 +120,7 @@
The jsp-file element contains the full path to a JSP file
within the web application beginning with a `/'.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -139,7 +139,7 @@
files so they can be given global property information.
All files so described are deemed to be JSP files. The
following additional properties can be described:
-
+
- Control whether EL is ignored.
- Control whether scripting elements are invalid.
- Indicate pageEncoding information.
@@ -153,7 +153,7 @@
- Indicate the default buffering model for JspWriter
- Control whether error should be raised for the use of
undeclared namespaces in a JSP page.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -172,7 +172,7 @@
EL evaluation is enabled for Web Applications using
a Servlet 2.4 or greater web.xml, and disabled
otherwise.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -193,7 +193,7 @@
in a JSP configuration element matching the document.
It is legal to name the same encoding through
mulitple mechanisms.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -206,7 +206,7 @@
Can be used to easily disable scripting in a
group of JSP pages. By default, scripting is
enabled.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -222,7 +222,7 @@
If false, the resources are assumed to not
be JSP documents, unless there is another
property group that indicates otherwise.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -239,7 +239,7 @@
the given path will be automatically included (as
in an include directive) at the beginning of each
JSP page in this jsp-property-group.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -256,7 +256,7 @@
the given path will be automatically included (as
in an include directive) at the end of each
JSP page in this jsp-property-group.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -271,7 +271,7 @@
character sequence is used as a String literal, unless
this element is enabled (true). Disabled (false) by
default.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -285,7 +285,7 @@
must be removed from the response output. It has no
effect on JSP documents (XML syntax). Disabled (false)
by default.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -299,7 +299,7 @@
contentType page directive. It specifies the default
response contentType if the page directive does not include
a contentType attribute.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -313,7 +313,7 @@
buffer page directive. It specifies if buffering should be
used for the output to response, and if so, the size of the
buffer to use.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -328,7 +328,7 @@
set to true, then an error must be raised during the translation
time when an undeclared tag is used in a JSP page. Disabled
(false) by default.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -349,7 +349,7 @@
available to the application. This can be done
to override implicit map entries from TLD files and
from the container.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -364,7 +364,7 @@
absolute URI specification, or a relative URI.
There should be no entries in web.xml with the
same taglib-uri value.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -377,7 +377,7 @@
(as a resource relative to the root of the web
application) where to find the Tag Library
Description file for the tag library.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/layer.xml b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/layer.xml
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/layer.xml
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/layer.xml
index 74efd6c..a5e643c 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/layer.xml
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/layer.xml
@@ -59,7 +59,7 @@
</file>
<folder name="DeploymentFileNames">
<folder name="WAR">
- <file name="WEB-INF\jboss-web.xml"/>
+ <file name="WEB-INF\jboss-web.xml"/>
</folder>
<folder name="EJB">
<file name="META-INF\jboss.xml"/>
@@ -71,7 +71,7 @@
<file name="META-INF\jboss-app.xml"/>
</folder>
</folder>
-
+
</folder>
</folder>
</folder>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/method.png b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/method.png
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/method.png
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/method.png
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/nbdep.xml b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/nbdep.xml
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/nbdep.xml
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/nbdep.xml
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/restservice.png b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/restservice.png
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/restservice.png
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/restservice.png
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wait.gif b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wait.gif
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wait.gif
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wait.gif
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_3_0.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_3_0.xsd
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_3_0.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_3_0.xsd
index ec034df..a74fdee 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_3_0.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_3_0.xsd
@@ -106,7 +106,7 @@ Other names may be trademarks of their respective owners.
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -133,8 +133,8 @@ Other names may be trademarks of their respective owners.
must concatenate the element contents. The multiple occurence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
- one distributable.
-
+ one distributable.
+
</xsd:documentation>
</xsd:annotation>
<xsd:unique name="web-common-servlet-name-uniqueness">
@@ -143,7 +143,7 @@ Other names may be trademarks of their respective owners.
The servlet element contains the name of a servlet.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet"/>
@@ -155,7 +155,7 @@ Other names may be trademarks of their respective owners.
The filter element contains the name of a filter.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:filter"/>
@@ -170,9 +170,9 @@ Other names may be trademarks of their respective owners.
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-local-ref"/>
@@ -187,9 +187,9 @@ Other names may be trademarks of their respective owners.
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-ref"/>
@@ -204,7 +204,7 @@ Other names may be trademarks of their respective owners.
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-env-ref"/>
@@ -219,7 +219,7 @@ Other names may be trademarks of their respective owners.
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:message-destination-ref"/>
@@ -233,7 +233,7 @@ Other names may be trademarks of their respective owners.
resource manager connection factory reference. The name
is a JNDI name relative to the java:comp/env context.
The name must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-ref"/>
@@ -247,7 +247,7 @@ Other names may be trademarks of their respective owners.
application's environment entry. The name is a JNDI
name relative to the java:comp/env context. The name
must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:env-entry"/>
@@ -259,7 +259,7 @@ Other names may be trademarks of their respective owners.
A role-name-key is specified to allow the references
from the security-role-refs.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:security-role"/>
@@ -272,7 +272,7 @@ Other names may be trademarks of their respective owners.
The keyref indicates the references from
security-role-ref to a specified role-name.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
@@ -281,4 +281,3 @@ Other names may be trademarks of their respective owners.
</xsd:element>
</xsd:schema>
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_4_0.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_4_0.xsd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_4_0.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-app_4_0.xsd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_0.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_0.xsd
similarity index 97%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_0.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_0.xsd
index 7f12270..10ae061 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_0.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_0.xsd
@@ -106,7 +106,7 @@ Other names may be trademarks of their respective owners.
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -129,7 +129,7 @@ Other names may be trademarks of their respective owners.
The context-param element contains the declaration
of a web application's servlet context
initialization parameters.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -185,17 +185,17 @@ Other names may be trademarks of their respective owners.
files available to this module and packaged with
this application should be examined for annotations
that specify deployment information.
-
+
If metadata-complete is set to "true", the deployment
tool must ignore any annotations that specify deployment
information, which might be present in the class files
of the application.
-
+
If metadata-complete is not specified or is set to
"false", the deployment tool must examine the class
files of the application for annotations, as
specified by the specifications.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -249,7 +249,7 @@ Other names may be trademarks of their respective owners.
to the portion of the web application described by the
containing security-constraint. The container matches
role names case sensitively when determining access.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -280,9 +280,9 @@ Other names may be trademarks of their respective owners.
using the configured mechanism. Legal values are "BASIC",
"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
authentication scheme.
-
+
Used in: login-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -299,7 +299,7 @@ Other names may be trademarks of their respective owners.
The dispatcher has five legal values: FORWARD, REQUEST,
INCLUDE, ASYNC, and ERROR.
-
+
A value of FORWARD means the Filter will be applied under
RequestDispatcher.forward() calls.
A value of REQUEST means the Filter will be applied under
@@ -310,11 +310,11 @@ Other names may be trademarks of their respective owners.
calls dispatched from an AsyncContext.
A value of ERROR means the Filter will be applied under the
error page mechanism.
-
+
The absence of any dispatcher elements in a filter-mapping
indicates a default of applying filters only under ordinary
client calls to the path or servlet.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -336,9 +336,9 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The error-code contains an HTTP error code, ex: 404
-
+
Used in: error-page
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -360,15 +360,15 @@ Other names may be trademarks of their respective owners.
The error-pageType contains a mapping between an error code
or exception type to the path of a resource in the web
application.
-
+
Error-page declarations using the exception-type element in
the deployment descriptor must be unique up to the class name of
the exception-type. Similarly, error-page declarations using the
status-code element must be unique in the deployment descriptor
up to the status code.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -383,7 +383,7 @@ Other names may be trademarks of their respective owners.
The exception-type contains a fully qualified class
name of a Java exception type.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -397,7 +397,7 @@ Other names may be trademarks of their respective owners.
resource in the web application relative to the root of
the web application. The value of the location must have
a leading `/'.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -419,9 +419,9 @@ Other names may be trademarks of their respective owners.
filter-name value to reference. Filters can access the
initialization parameters declared in the deployment
descriptor at runtime via the FilterConfig interface.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -436,7 +436,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The fully qualified classname of the filter.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -452,7 +452,7 @@ Other names may be trademarks of their respective owners.
The init-param element contains a name/value pair as
an initialization param of a servlet filter
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -469,7 +469,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
Declaration of the filter mappings in this web
- application is done by using filter-mappingType.
+ application is done by using filter-mappingType.
The container uses the filter-mapping
declarations to decide which filters to apply to a request,
and in what order. The container matches the request URI to
@@ -483,7 +483,7 @@ Other names may be trademarks of their respective owners.
filter-name value must be the value of the filter-name
sub-elements of one of the filter declarations in the
deployment descriptor.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -514,7 +514,7 @@ Other names may be trademarks of their respective owners.
This type defines a string which contains at least one
character.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -535,9 +535,9 @@ Other names may be trademarks of their respective owners.
by using filter-nameType. This name is used to map the
filter. Each filter name is unique within the web
application.
-
+
Used in: filter, filter-mapping
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -555,9 +555,9 @@ Other names may be trademarks of their respective owners.
The form-login-configType specifies the login and error
pages that should be used in form based login. If form based
authentication is not used, these elements are ignored.
-
+
Used in: login-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -570,7 +570,7 @@ Other names may be trademarks of their respective owners.
app where the page that can be used for login can be
found. The path begins with a leading / and is interpreted
relative to the root of the WAR.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -581,10 +581,10 @@ Other names may be trademarks of their respective owners.
The form-error-page element defines the location in
the web app where the error page that is displayed
- when login is not successful can be found.
+ when login is not successful can be found.
The path begins with a leading / and is interpreted
relative to the root of the WAR.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -598,7 +598,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
A HTTP method type as defined in HTTP 1.1 section 2.2.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -627,9 +627,9 @@ Other names may be trademarks of their respective owners.
method that should be used, the realm name that should be
used for this application, and the attributes that are
needed by the form login mechanism.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -644,7 +644,7 @@ Other names may be trademarks of their respective owners.
The realm name element specifies the realm name to
use in HTTP Basic authorization.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -665,9 +665,9 @@ Other names may be trademarks of their respective owners.
The mime-mappingType defines a mapping between an extension
and a mime type.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -676,7 +676,7 @@ Other names may be trademarks of their respective owners.
The extension element contains a string describing an
extension. example: "txt"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:element name="extension"
@@ -696,12 +696,12 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The mime-typeType is used to indicate a defined mime type.
-
+
Example:
"text/plain"
-
+
Used in: mime-mapping
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -721,9 +721,9 @@ Other names may be trademarks of their respective owners.
The security-constraintType is used to associate
security constraints with one or more web resource
collections
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -757,9 +757,9 @@ Other names may be trademarks of their respective owners.
servlet. If a jsp-file is specified and the load-on-startup
element is present, then the JSP should be precompiled and
loaded.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -775,7 +775,7 @@ Other names may be trademarks of their respective owners.
The servlet-class element contains the fully
qualified class name of the servlet.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -808,7 +808,7 @@ Other names may be trademarks of their respective owners.
before servlets marked with higher integers. The
container may choose the order of loading of
servlets with the same load-on-start-up value.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -842,10 +842,10 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The servlet-mappingType defines a mapping between a
- servlet and a url pattern.
-
+ servlet and a url pattern.
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -870,7 +870,7 @@ Other names may be trademarks of their respective owners.
The servlet-name element contains the canonical name of the
servlet. Each servlet name is unique within the web
application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -887,9 +887,9 @@ Other names may be trademarks of their respective owners.
The session-configType defines the session parameters
for this web application.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -907,7 +907,7 @@ Other names may be trademarks of their respective owners.
the default behaviour of sessions is never to time
out. If this element is not specified, the container
must set its default timeout period.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -919,7 +919,7 @@ Other names may be trademarks of their respective owners.
The cookie-config element defines the configuration of the
session tracking cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -932,7 +932,7 @@ Other names may be trademarks of their respective owners.
The tracking-mode element defines the tracking modes
for sessions created by this web application
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -950,9 +950,9 @@ Other names may be trademarks of their respective owners.
The cookie-configType defines the configuration for the
session tracking cookies of this web application.
-
+
Used in: session-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -965,7 +965,7 @@ Other names may be trademarks of their respective owners.
The name that will be assigned to any session tracking
cookies created by this web application.
The default is JSESSIONID
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -977,7 +977,7 @@ Other names may be trademarks of their respective owners.
The domain name that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -989,7 +989,7 @@ Other names may be trademarks of their respective owners.
The path that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1001,7 +1001,7 @@ Other names may be trademarks of their respective owners.
The comment that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1011,9 +1011,9 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- Specifies whether any session tracking cookies created
+ Specifies whether any session tracking cookies created
by this web application will be marked as HttpOnly
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1023,11 +1023,11 @@ Other names may be trademarks of their respective owners.
<xsd:annotation>
<xsd:documentation>
- Specifies whether any session tracking cookies created
+ Specifies whether any session tracking cookies created
by this web application will be marked as secure
even if the request that initiated the corresponding session
is using plain HTTP instead of HTTPS
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1040,7 +1040,7 @@ Other names may be trademarks of their respective owners.
The lifetime (in seconds) that will be assigned to any
session tracking cookies created by this web application.
Default is -1
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1059,9 +1059,9 @@ Other names may be trademarks of their respective owners.
The name that will be assigned to any session tracking
cookies created by this web application.
The default is JSESSIONID
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1078,9 +1078,9 @@ Other names may be trademarks of their respective owners.
The domain name that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1097,9 +1097,9 @@ Other names may be trademarks of their respective owners.
The path that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1116,9 +1116,9 @@ Other names may be trademarks of their respective owners.
The comment that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1135,9 +1135,9 @@ Other names may be trademarks of their respective owners.
The tracking modes for sessions created by this web
application
-
+
Used in: session-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1168,9 +1168,9 @@ Other names may be trademarks of their respective owners.
transmission. In most cases, the presence of the INTEGRAL or
CONFIDENTIAL flag will indicate that the use of SSL is
required.
-
+
Used in: user-data-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1192,9 +1192,9 @@ Other names may be trademarks of their respective owners.
The user-data-constraintType is used to indicate how
data communicated between the client and container should be
protected.
-
+
Used in: security-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1219,7 +1219,7 @@ Other names may be trademarks of their respective owners.
The elements that use this type designate a path starting
with a "/" and interpreted relative to the root of a WAR
file.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1236,7 +1236,7 @@ Other names may be trademarks of their respective owners.
This type contains the recognized versions of
web-application supported. It is used to designate the
version of the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -1259,10 +1259,10 @@ Other names may be trademarks of their respective owners.
elements, the security constraint applies to all methods
except those identified in the collection.
http-method-omission and http-method elements are never
- mixed in the same collection.
-
+ mixed in the same collection.
+
Used in: security-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1273,7 +1273,7 @@ Other names may be trademarks of their respective owners.
The web-resource-name contains the name of this web
resource collection.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1295,7 +1295,7 @@ Other names may be trademarks of their respective owners.
Each http-method names an HTTP method to which the
constraint applies.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1308,7 +1308,7 @@ Other names may be trademarks of their respective owners.
Each http-method-omission names an HTTP method to
which the constraint does not apply.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1327,9 +1327,9 @@ Other names may be trademarks of their respective owners.
The welcome-file-list contains an ordered list of welcome
files elements.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1341,7 +1341,7 @@ Other names may be trademarks of their respective owners.
The welcome-file element contains file name to use
as a default welcome file, such as index.html
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1356,7 +1356,7 @@ Other names may be trademarks of their respective owners.
The localeType defines valid locale defined by ISO-639-1
and ISO-3166.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1369,7 +1369,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The encodingType defines IANA character sets.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1386,7 +1386,7 @@ Other names may be trademarks of their respective owners.
The locale-encoding-mapping-list contains one or more
locale-encoding-mapping(s).
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1409,7 +1409,7 @@ Other names may be trademarks of their respective owners.
encoding name. The locale name must be either "Language-code",
such as "ja", defined by ISO-639 or "Language-code_Country-code",
such as "ja_JP". "Country code" is defined by ISO-3166.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1434,7 +1434,7 @@ Other names may be trademarks of their respective owners.
of this application resource relative to other application
configuration resources.
See section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
@@ -1449,7 +1449,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
Please see section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="0"
@@ -1473,7 +1473,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
Please see section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1503,7 +1503,7 @@ Other names may be trademarks of their respective owners.
comes
before or after other documents within the application.
See section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1527,7 +1527,7 @@ Other names may be trademarks of their respective owners.
This element specifies configuration information related to the
handling of multipart/form-data requests.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1539,7 +1539,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The directory location where uploaded files will be stored
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1551,7 +1551,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The maximum size limit of uploaded files
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1563,7 +1563,7 @@ Other names may be trademarks of their respective owners.
<xsd:documentation>
The maximum size limit of multipart/form-data requests
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1576,7 +1576,7 @@ Other names may be trademarks of their respective owners.
The size threshold after which an uploaded file will be
written to disk
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1584,4 +1584,3 @@ Other names may be trademarks of their respective owners.
</xsd:complexType>
</xsd:schema>
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_1.xsd
similarity index 96%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_1.xsd
index 01b3948..574ea7a 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_1.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-common_3_1.xsd
@@ -10,9 +10,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved.
-
+
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
@@ -21,20 +21,20 @@
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.
-
+
When distributing the software, include this License Header Notice in each
file and include the License file at packager/legal/LICENSE.txt.
-
+
GPL Classpath Exception:
Oracle designates this particular file as subject to the "Classpath"
exception as provided by Oracle in the GPL Version 2 section of the License
file that accompanied this code.
-
+
Modifications:
If applicable, add the following below the License Header, with the fields
enclosed by brackets [] replaced by your own identifying information:
"Portions Copyright [year] [name of copyright owner]"
-
+
Contributor(s):
If you wish your version of this file to be governed by only the CDDL or
only the GPL Version 2, indicate your decision by adding "[Contributor]
@@ -46,7 +46,7 @@
and therefore, elected the GPL Version 2 license, then the option applies
only if the new code is made subject to such option by the copyright
holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -58,25 +58,25 @@
web application's war file. All Servlet deployment descriptors
must indicate the web common schema by using the Java EE
namespace:
-
- http://xmlns.jcp.org/xml/ns/javaee
-
- and by indicating the version of the schema by
- using the version element as shown below:
-
+
+ http://xmlns.jcp.org/xml/ns/javaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
- version="3.1">
+ version="3.1">
...
</web-app>
-
+
The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Java EE
namespace with the following location:
-
+
http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -86,7 +86,7 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
same JAR file, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -95,7 +95,7 @@
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -116,7 +116,7 @@
The context-param element contains the declaration
of a web application's servlet context
initialization parameters.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -172,17 +172,17 @@
files available to this module and packaged with
this application should be examined for annotations
that specify deployment information.
-
+
If metadata-complete is set to "true", the deployment
tool must ignore any annotations that specify deployment
information, which might be present in the class files
of the application.
-
+
If metadata-complete is not specified or is set to
"false", the deployment tool must examine the class
files of the application for annotations, as
specified by the specifications.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
@@ -207,7 +207,7 @@
to the portion of the web application described by the
containing security-constraint. The container matches
role names case sensitively when determining access.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -238,9 +238,9 @@
using the configured mechanism. Legal values are "BASIC",
"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
authentication scheme.
-
+
Used in: login-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -257,7 +257,7 @@
The dispatcher has five legal values: FORWARD, REQUEST,
INCLUDE, ASYNC, and ERROR.
-
+
A value of FORWARD means the Filter will be applied under
RequestDispatcher.forward() calls.
A value of REQUEST means the Filter will be applied under
@@ -268,11 +268,11 @@
calls dispatched from an AsyncContext.
A value of ERROR means the Filter will be applied under the
error page mechanism.
-
+
The absence of any dispatcher elements in a filter-mapping
indicates a default of applying filters only under ordinary
client calls to the path or servlet.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -294,9 +294,9 @@
<xsd:documentation>
The error-code contains an HTTP error code, ex: 404
-
+
Used in: error-page
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -318,19 +318,19 @@
The error-pageType contains a mapping between an error code
or exception type to the path of a resource in the web
application.
-
+
Error-page declarations using the exception-type element in
the deployment descriptor must be unique up to the class name of
the exception-type. Similarly, error-page declarations using the
error-code element must be unique in the deployment descriptor
up to the status code.
-
+
If an error-page element in the deployment descriptor does not
contain an exception-type or an error-code element, the error
- page is a default error page.
-
+ page is a default error page.
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -345,7 +345,7 @@
The exception-type contains a fully qualified class
name of a Java exception type.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -359,7 +359,7 @@
resource in the web application relative to the root of
the web application. The value of the location must have
a leading `/'.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -381,9 +381,9 @@
filter-name value to reference. Filters can access the
initialization parameters declared in the deployment
descriptor at runtime via the FilterConfig interface.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -398,7 +398,7 @@
<xsd:documentation>
The fully qualified classname of the filter.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -414,7 +414,7 @@
The init-param element contains a name/value pair as
an initialization param of a servlet filter
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -431,7 +431,7 @@
<xsd:documentation>
Declaration of the filter mappings in this web
- application is done by using filter-mappingType.
+ application is done by using filter-mappingType.
The container uses the filter-mapping
declarations to decide which filters to apply to a request,
and in what order. The container matches the request URI to
@@ -445,7 +445,7 @@
filter-name value must be the value of the filter-name
sub-elements of one of the filter declarations in the
deployment descriptor.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -476,7 +476,7 @@
This type defines a string which contains at least one
character.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -497,9 +497,9 @@
by using filter-nameType. This name is used to map the
filter. Each filter name is unique within the web
application.
-
+
Used in: filter, filter-mapping
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -517,9 +517,9 @@
The form-login-configType specifies the login and error
pages that should be used in form based login. If form based
authentication is not used, these elements are ignored.
-
+
Used in: login-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -532,7 +532,7 @@
app where the page that can be used for login can be
found. The path begins with a leading / and is interpreted
relative to the root of the WAR.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -543,10 +543,10 @@
The form-error-page element defines the location in
the web app where the error page that is displayed
- when login is not successful can be found.
+ when login is not successful can be found.
The path begins with a leading / and is interpreted
relative to the root of the WAR.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -560,7 +560,7 @@
<xsd:documentation>
A HTTP method type as defined in HTTP 1.1 section 2.2.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -589,9 +589,9 @@
method that should be used, the realm name that should be
used for this application, and the attributes that are
needed by the form login mechanism.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -606,7 +606,7 @@
The realm name element specifies the realm name to
use in HTTP Basic authorization.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -627,9 +627,9 @@
The mime-mappingType defines a mapping between an extension
and a mime type.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -638,7 +638,7 @@
The extension element contains a string describing an
extension. example: "txt"
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:element name="extension"
@@ -658,12 +658,12 @@
<xsd:documentation>
The mime-typeType is used to indicate a defined mime type.
-
+
Example:
"text/plain"
-
+
Used in: mime-mapping
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -683,9 +683,9 @@
The security-constraintType is used to associate
security constraints with one or more web resource
collections
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -719,9 +719,9 @@
servlet. If a jsp-file is specified and the load-on-startup
element is present, then the JSP should be precompiled and
loaded.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -737,7 +737,7 @@
The servlet-class element contains the fully
qualified class name of the servlet.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -770,7 +770,7 @@
before servlets marked with higher integers. The
container may choose the order of loading of
servlets with the same load-on-start-up value.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -804,10 +804,10 @@
<xsd:documentation>
The servlet-mappingType defines a mapping between a
- servlet and a url pattern.
-
+ servlet and a url pattern.
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -832,7 +832,7 @@
The servlet-name element contains the canonical name of the
servlet. Each servlet name is unique within the web
application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -849,9 +849,9 @@
The session-configType defines the session parameters
for this web application.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -869,7 +869,7 @@
the default behaviour of sessions is never to time
out. If this element is not specified, the container
must set its default timeout period.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -881,7 +881,7 @@
The cookie-config element defines the configuration of the
session tracking cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -894,7 +894,7 @@
The tracking-mode element defines the tracking modes
for sessions created by this web application
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -912,9 +912,9 @@
The cookie-configType defines the configuration for the
session tracking cookies of this web application.
-
+
Used in: session-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -927,7 +927,7 @@
The name that will be assigned to any session tracking
cookies created by this web application.
The default is JSESSIONID
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -939,7 +939,7 @@
The domain name that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -951,7 +951,7 @@
The path that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -963,7 +963,7 @@
The comment that will be assigned to any session tracking
cookies created by this web application.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -973,9 +973,9 @@
<xsd:annotation>
<xsd:documentation>
- Specifies whether any session tracking cookies created
+ Specifies whether any session tracking cookies created
by this web application will be marked as HttpOnly
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -985,14 +985,14 @@
<xsd:annotation>
<xsd:documentation>
- Specifies whether any session tracking cookies created
+ Specifies whether any session tracking cookies created
by this web application will be marked as secure.
When true, all session tracking cookies must be marked
as secure independent of the nature of the request that
initiated the corresponding session.
When false, the session cookie should only be marked secure
if the request that initiated the session was secure.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1005,7 +1005,7 @@
The lifetime (in seconds) that will be assigned to any
session tracking cookies created by this web application.
Default is -1
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1024,9 +1024,9 @@
The name that will be assigned to any session tracking
cookies created by this web application.
The default is JSESSIONID
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1043,9 +1043,9 @@
The domain name that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1062,9 +1062,9 @@
The path that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1081,9 +1081,9 @@
The comment that will be assigned to any session tracking
cookies created by this web application.
-
+
Used in: cookie-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1100,9 +1100,9 @@
The tracking modes for sessions created by this web
application
-
+
Used in: session-config
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1133,9 +1133,9 @@
transmission. In most cases, the presence of the INTEGRAL or
CONFIDENTIAL flag will indicate that the use of SSL is
required.
-
+
Used in: user-data-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1157,9 +1157,9 @@
The user-data-constraintType is used to indicate how
data communicated between the client and container should be
protected.
-
+
Used in: security-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1184,7 +1184,7 @@
The elements that use this type designate a path starting
with a "/" and interpreted relative to the root of a WAR
file.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1201,7 +1201,7 @@
This type contains the recognized versions of
web-application supported. It is used to designate the
version of the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -1224,10 +1224,10 @@
elements, the security constraint applies to all methods
except those identified in the collection.
http-method-omission and http-method elements are never
- mixed in the same collection.
-
+ mixed in the same collection.
+
Used in: security-constraint
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1238,7 +1238,7 @@
The web-resource-name contains the name of this web
resource collection.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1260,7 +1260,7 @@
Each http-method names an HTTP method to which the
constraint applies.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1273,7 +1273,7 @@
Each http-method-omission names an HTTP method to
which the constraint does not apply.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1292,9 +1292,9 @@
The welcome-file-list contains an ordered list of welcome
files elements.
-
+
Used in: web-app
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1306,7 +1306,7 @@
The welcome-file element contains file name to use
as a default welcome file, such as index.html
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1321,7 +1321,7 @@
The localeType defines valid locale defined by ISO-639-1
and ISO-3166.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1334,7 +1334,7 @@
<xsd:documentation>
The encodingType defines IANA character sets.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1351,7 +1351,7 @@
The locale-encoding-mapping-list contains one or more
locale-encoding-mapping(s).
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1374,7 +1374,7 @@
encoding name. The locale name must be either "Language-code",
such as "ja", defined by ISO-639 or "Language-code_Country-code",
such as "ja_JP". "Country code" is defined by ISO-3166.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1399,7 +1399,7 @@
of this application resource relative to other application
configuration resources.
See section 8.2.2 of the specification for details.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
@@ -1415,7 +1415,7 @@
This element specifies configuration information related to the
handling of multipart/form-data requests.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1427,7 +1427,7 @@
<xsd:documentation>
The directory location where uploaded files will be stored
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1439,7 +1439,7 @@
<xsd:documentation>
The maximum size limit of uploaded files
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1451,7 +1451,7 @@
<xsd:documentation>
The maximum size limit of multipart/form-data requests
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1464,7 +1464,7 @@
The size threshold after which an uploaded file will be
written to disk
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_3_0.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_3_0.xsd
similarity index 98%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_3_0.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_3_0.xsd
index e8e6298..2db08fa 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_3_0.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_3_0.xsd
@@ -106,7 +106,7 @@ Other names may be trademarks of their respective owners.
JAR file's namespace. In general, relative names are
preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -133,8 +133,8 @@ Other names may be trademarks of their respective owners.
must concatenate the element contents. The multiple occurence
of the element distributable is redundant and the container
treats that case exactly in the same way when there is only
- one distributable.
-
+ one distributable.
+
</xsd:documentation>
</xsd:annotation>
<xsd:unique name="web-common-servlet-name-uniqueness">
@@ -143,7 +143,7 @@ Other names may be trademarks of their respective owners.
The servlet element contains the name of a servlet.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet"/>
@@ -155,7 +155,7 @@ Other names may be trademarks of their respective owners.
The filter element contains the name of a filter.
The name must be unique within the web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:filter"/>
@@ -170,9 +170,9 @@ Other names may be trademarks of their respective owners.
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-local-ref"/>
@@ -187,9 +187,9 @@ Other names may be trademarks of their respective owners.
application's environment and is relative to the
java:comp/env context. The name must be unique within
the web application.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-ref"/>
@@ -204,7 +204,7 @@ Other names may be trademarks of their respective owners.
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-env-ref"/>
@@ -219,7 +219,7 @@ Other names may be trademarks of their respective owners.
environment entry name used in the web application code.
The name is a JNDI name relative to the java:comp/env
context and must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:message-destination-ref"/>
@@ -233,7 +233,7 @@ Other names may be trademarks of their respective owners.
resource manager connection factory reference. The name
is a JNDI name relative to the java:comp/env context.
The name must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-ref"/>
@@ -247,7 +247,7 @@ Other names may be trademarks of their respective owners.
application's environment entry. The name is a JNDI
name relative to the java:comp/env context. The name
must be unique within a web application.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:env-entry"/>
@@ -259,7 +259,7 @@ Other names may be trademarks of their respective owners.
A role-name-key is specified to allow the references
from the security-role-refs.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:security-role"/>
@@ -272,7 +272,7 @@ Other names may be trademarks of their respective owners.
The keyref indicates the references from
security-role-ref to a specified role-name.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
@@ -281,4 +281,3 @@ Other names may be trademarks of their respective owners.
</xsd:element>
</xsd:schema>
-
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_4_0.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_4_0.xsd
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_4_0.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/web-fragment_4_0.xsd
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly-messaging-activemq-deployment_1_0_1.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly-messaging-activemq-deployment_1_0_1.xsd
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly-messaging-activemq-deployment_1_0_1.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly-messaging-activemq-deployment_1_0_1.xsd
index 321d63a..123e405 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly-messaging-activemq-deployment_1_0_1.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly-messaging-activemq-deployment_1_0_1.xsd
@@ -24,7 +24,7 @@
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0.1">
-
+
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
<xs:element name="messaging-deployment">
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly.png b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly.png
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly.png
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/wildfly.png
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd
index 81a9a72..4a54c76 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/resources/xml.xsd
@@ -77,7 +77,7 @@ Changes:
<type . . .>
. . .
<attributeGroup ref="xml:specialAttrs"/>
-
+
will define a type which will schema-validate an instance
element with any of those attributes</xs:documentation>
</xs:annotation>
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/PathUtil.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/PathUtil.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/PathUtil.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/PathUtil.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/ProgressEventSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/ProgressEventSupport.java
similarity index 100%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/ProgressEventSupport.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/ProgressEventSupport.java
diff --git a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
similarity index 99%
rename from contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
rename to enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
index 66384a4..e539377 100644
--- a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/util/WildFlyProperties.java
@@ -96,9 +96,9 @@ public class WildFlyProperties {
private static final Logger LOGGER = Logger.getLogger(WildFlyProperties.class.getName());
private final Version version;
-
+
private final boolean wildfly;
-
+
private final boolean servletOnly;
/**
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/build.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/build.xml
similarity index 73%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/build.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/build.xml
index 60b1a98..4ab204d 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/build.xml
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/build.xml
@@ -7,21 +7,21 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
-
- pre-init: called before initialization of project properties
- post-init: called after initialization of project properties
- pre-compile: called before javac compilation
- post-compile: called after javac compilation
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
+
+ pre-init: called before initialization of project properties
+ post-init: called after initialization of project properties
+ pre-compile: called before javac compilation
+ post-compile: called after javac compilation
pre-compile-single: called before javac compilation of single file
post-compile-single: called after javac compilation of single file
- pre-dist: called before jar building
- post-dist: called after jar building
- post-clean: called after cleaning build products
+ pre-dist: called before jar building
+ post-dist: called after jar building
+ post-clean: called after cleaning build products
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -29,20 +29,20 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-debug: defines macro for class debugging
do-dist: jar archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -50,10 +50,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/build-impl.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/build-impl.xml
similarity index 99%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/build-impl.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/build-impl.xml
index e83f87f..33661de 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/build-impl.xml
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/build-impl.xml
@@ -17,9 +17,9 @@ is divided into following sections:
-->
<project name="JBoss4EjbTest-impl" default="build" basedir=".." xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
<target name="default" depends="dist,javadoc" description="Build whole project."/>
- <!--
+ <!--
======================
- INITIALIZATION SECTION
+ INITIALIZATION SECTION
======================
-->
<target name="-pre-init">
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/genfiles.properties b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/genfiles.properties
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/genfiles.properties
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/genfiles.properties
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.properties b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.properties
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.properties
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.properties
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/nbproject/project.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/MANIFEST.MF b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/MANIFEST.MF
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/MANIFEST.MF
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/MANIFEST.MF
index 59499bc..9d885be 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/MANIFEST.MF
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/MANIFEST.MF
@@ -1,2 +1 @@
Manifest-Version: 1.0
-
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/ejb-jar.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/ejb-jar.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/ejb-jar.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/ejb-jar.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/jboss.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/jboss.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/jboss.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/conf/jboss.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Bean.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Bean.java
similarity index 96%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Bean.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Bean.java
index a6d6562..27e357b 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Bean.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Bean.java
@@ -9,7 +9,7 @@ import javax.ejb.*;
*/
public class SessionTest2Bean implements SessionBean, SessionTest2RemoteBusiness, SessionTest2LocalBusiness {
private SessionContext context;
-
+
// <editor-fold defaultstate="collapsed" desc="EJB infrastructure methods. Click the + sign on the left to edit the code.">
// TODO Add code to acquire and use other enterprise resources (DataSource, JMS, enterprise bean, Web services)
// TODO Add business methods or web service operations
@@ -19,29 +19,29 @@ public class SessionTest2Bean implements SessionBean, SessionTest2RemoteBusiness
public void setSessionContext(SessionContext aContext) {
context = aContext;
}
-
+
/**
* @see javax.ejb.SessionBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
+
/**
* @see javax.ejb.SessionBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
+
/**
* @see javax.ejb.SessionBean#ejbRemove()
*/
public void ejbRemove() {
-
+
}
// </editor-fold>
-
+
/**
* See section 7.10.3 of the EJB 2.0 specification
* See section 7.11.3 of the EJB 2.1 specification
@@ -52,12 +52,12 @@ public class SessionTest2Bean implements SessionBean, SessionTest2RemoteBusiness
// spanning all methods can be performed here such as home interfaces
// and data sources.
}
-
-
-
+
+
+
// Add business logic below. (Right-click in editor and choose
// "EJB Methods > Add Business Method" or "Web Service > Add Operation")
-
+
public String greetings(String who) {
//TODO implement greetings
return "Greetings "+who;
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Local.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Local.java
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Local.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Local.java
index bcc2b40..9f36d4c 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Local.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Local.java
@@ -8,6 +8,6 @@ import javax.ejb.EJBLocalObject;
* This is the local interface for SessionTest2 enterprise bean.
*/
public interface SessionTest2Local extends EJBLocalObject, SessionTest2LocalBusiness {
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalBusiness.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalBusiness.java
similarity index 97%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalBusiness.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalBusiness.java
index 01663ec..1853da5 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalBusiness.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalBusiness.java
@@ -7,5 +7,5 @@ package ejb;
*/
public interface SessionTest2LocalBusiness {
String greetings(String who);
-
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalHome.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalHome.java
similarity index 94%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalHome.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalHome.java
index 8413f87..5fbc611 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalHome.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2LocalHome.java
@@ -9,8 +9,8 @@ import javax.ejb.EJBLocalHome;
* This is the local-home interface for SessionTest2 enterprise bean.
*/
public interface SessionTest2LocalHome extends EJBLocalHome {
-
+
SessionTest2Local create() throws CreateException;
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Remote.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Remote.java
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Remote.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Remote.java
index 52cc08f..8abe6db 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Remote.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2Remote.java
@@ -8,6 +8,6 @@ import javax.ejb.EJBObject;
* This is the remote interface for SessionTest2 enterprise bean.
*/
public interface SessionTest2Remote extends EJBObject, SessionTest2RemoteBusiness {
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteBusiness.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteBusiness.java
similarity index 97%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteBusiness.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteBusiness.java
index 2a1aed7..411a515 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteBusiness.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteBusiness.java
@@ -7,5 +7,5 @@ package ejb;
*/
public interface SessionTest2RemoteBusiness {
String greetings(String who) throws java.rmi.RemoteException;
-
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteHome.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteHome.java
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteHome.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteHome.java
index fa83c6c..a64c5f4 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteHome.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTest2RemoteHome.java
@@ -10,8 +10,8 @@ import javax.ejb.EJBHome;
* This is the home interface for SessionTest2 enterprise bean.
*/
public interface SessionTest2RemoteHome extends EJBHome {
-
+
SessionTest2Remote create() throws CreateException, RemoteException;
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestBean.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestBean.java
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestBean.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestBean.java
index 73853b1..1360728 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestBean.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestBean.java
@@ -9,7 +9,7 @@ import javax.ejb.*;
*/
public class SessionTestBean implements SessionBean, SessionTestLocalBusiness {
private SessionContext context;
-
+
// <editor-fold defaultstate="collapsed" desc="EJB infrastructure methods. Click the + sign on the left to edit the code.">
// TODO Add code to acquire and use other enterprise resources (DataSource, JMS, enterprise bean, Web services)
// TODO Add business methods or web service operations
@@ -19,29 +19,29 @@ public class SessionTestBean implements SessionBean, SessionTestLocalBusiness {
public void setSessionContext(SessionContext aContext) {
context = aContext;
}
-
+
/**
* @see javax.ejb.SessionBean#ejbActivate()
*/
public void ejbActivate() {
-
+
}
-
+
/**
* @see javax.ejb.SessionBean#ejbPassivate()
*/
public void ejbPassivate() {
-
+
}
-
+
/**
* @see javax.ejb.SessionBean#ejbRemove()
*/
public void ejbRemove() {
-
+
}
// </editor-fold>
-
+
/**
* See section 7.10.3 of the EJB 2.0 specification
* See section 7.11.3 of the EJB 2.1 specification
@@ -52,14 +52,14 @@ public class SessionTestBean implements SessionBean, SessionTestLocalBusiness {
// spanning all methods can be performed here such as home interfaces
// and data sources.
}
-
-
-
+
+
+
// Add business logic below. (Right-click in editor and choose
// "EJB Methods > Add Business Method" or "Web Service > Add Operation")
public String greetings(String who) {
//TODO implement greetings
return "Greetings "+who;
- }
+ }
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocal.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocal.java
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocal.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocal.java
index c4ace9a..d0aa099 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocal.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocal.java
@@ -8,6 +8,6 @@ import javax.ejb.EJBLocalObject;
* This is the local interface for SessionTest enterprise bean.
*/
public interface SessionTestLocal extends EJBLocalObject, SessionTestLocalBusiness {
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalBusiness.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalBusiness.java
similarity index 97%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalBusiness.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalBusiness.java
index 25d8721..e31063b 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalBusiness.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalBusiness.java
@@ -7,5 +7,5 @@ package ejb;
*/
public interface SessionTestLocalBusiness {
String greetings(String who);
-
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalHome.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalHome.java
similarity index 94%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalHome.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalHome.java
index 0c2aca2..a37e842 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalHome.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4EjbTest/src/java/ejb/SessionTestLocalHome.java
@@ -9,8 +9,8 @@ import javax.ejb.EJBLocalHome;
* This is the local-home interface for SessionTest enterprise bean.
*/
public interface SessionTestLocalHome extends EJBLocalHome {
-
+
SessionTestLocal create() throws CreateException;
-
-
+
+
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/build.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/build.xml
similarity index 85%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/build.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/build.xml
index e3c908f..5ee70ce 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/build.xml
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/build.xml
@@ -12,14 +12,14 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
@@ -28,11 +28,11 @@
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-dist: called before archive building
-post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -40,21 +40,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -62,10 +62,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/build-impl.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/build-impl.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/build-impl.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/build-impl.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/genfiles.properties b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/genfiles.properties
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/genfiles.properties
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/genfiles.properties
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.properties b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.properties
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.properties
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.properties
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/nbproject/project.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/conf/MANIFEST.MF b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/conf/MANIFEST.MF
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/conf/MANIFEST.MF
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/conf/MANIFEST.MF
index 59499bc..9d885be 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/conf/MANIFEST.MF
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/conf/MANIFEST.MF
@@ -1,2 +1 @@
Manifest-Version: 1.0
-
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/java/web/Test.java b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/java/web/Test.java
similarity index 98%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/java/web/Test.java
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/java/web/Test.java
index d273f1e..899a665 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/java/web/Test.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/src/java/web/Test.java
@@ -18,7 +18,7 @@ import javax.servlet.http.*;
* @version
*/
public class Test extends HttpServlet {
-
+
/** Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -39,7 +39,7 @@ public class Test extends HttpServlet {
out.close();
}
-
+
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/** Handles the HTTP <code>GET</code> method.
* @param request servlet request
@@ -49,7 +49,7 @@ public class Test extends HttpServlet {
throws ServletException, IOException {
processRequest(request, response);
}
-
+
/** Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -58,7 +58,7 @@ public class Test extends HttpServlet {
throws ServletException, IOException {
processRequest(request, response);
}
-
+
/** Returns a short description of the servlet.
*/
public String getServletInfo() {
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/jboss-web.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/jboss-web.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/jboss-web.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/jboss-web.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/web.xml b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/web.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/web.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/WEB-INF/web.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/index.jsp b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/index.jsp
similarity index 93%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/index.jsp
rename to enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/index.jsp
index 885a3b1..1e8f35e 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/index.jsp
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/index.jsp
@@ -6,7 +6,7 @@ you must also add the JSTL library to the project. The Add Library... action
on Libraries node in Projects view can be used to add the JSTL 1.1 library.
--%>
<%--
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
--%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/build-impl.xml b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/build-impl.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/build-impl.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/build-impl.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/genfiles.properties b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/genfiles.properties
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/genfiles.properties
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/genfiles.properties
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.properties b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.properties
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.properties
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.properties
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.xml b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/nbproject/project.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/src/conf/MANIFEST.MF b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/src/conf/MANIFEST.MF
similarity index 95%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/src/conf/MANIFEST.MF
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/src/conf/MANIFEST.MF
index 59499bc..9d885be 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/src/conf/MANIFEST.MF
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/src/conf/MANIFEST.MF
@@ -1,2 +1 @@
Manifest-Version: 1.0
-
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/jboss-web.xml b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/jboss-web.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/jboss-web.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/jboss-web.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/web.xml b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/web.xml
similarity index 100%
rename from contrib/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/web.xml
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/WEB-INF/web.xml
diff --git a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/index.jsp b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/index.jsp
similarity index 93%
rename from contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/index.jsp
rename to enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/index.jsp
index 885a3b1..1e8f35e 100644
--- a/contrib/javaee.wildfly/test/qa-functional/data/JBoss4WebTest/web/index.jsp
+++ b/enterprise/javaee.wildfly/test/qa-functional/data/TestDeployDebugWebApp/web/index.jsp
@@ -6,7 +6,7 @@ you must also add the JSTL library to the project. The Add Library... action
on Libraries node in Projects view can be used to add the JSTL 1.1 library.
--%>
<%--
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
--%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
diff --git a/contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/ProgressOperator.java b/enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/ProgressOperator.java
similarity index 97%
rename from contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/ProgressOperator.java
rename to enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/ProgressOperator.java
index 79923c3..cc67556 100644
--- a/contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/ProgressOperator.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/ProgressOperator.java
@@ -49,9 +49,9 @@ public class ProgressOperator {
} catch (InterruptedException e) {
throw new JemmyException("Interrupted.", e);
}
-
+
}
-
+
/** Wait process with given name finished.
*/
public static void waitFinished(final String name, long timeout) {
@@ -69,33 +69,33 @@ public class ProgressOperator {
} catch (InterruptedException e) {
throw new JemmyException("Interrupted.", e);
}
-
+
}
-
+
/** Wait all processes finished.
*/
public static void waitFinished(long timeout) {
waitFinished("", timeout); // NOI18N
}
-
+
private static boolean processInProgress(String name) {
try {
Class<?> clazz = Class.forName("org.netbeans.progress.module.Controller");
Method getDefaultMethod = clazz.getDeclaredMethod("getDefault", (Class[])null);
getDefaultMethod.setAccessible(true);
Object controllerInstance = getDefaultMethod.invoke(null, (Object[])null);
-
+
Method getModelMethod = clazz.getDeclaredMethod("getModel", (Class[])null);
getModelMethod.setAccessible(true);
Object taskModelInstance = getModelMethod.invoke(controllerInstance, (Object[])null);
-
+
//Method getSizeMethod = taskModelInstance.getClass().getDeclaredMethod("getSize", (Class[])null);
//Object size = getSizeMethod.invoke(taskModelInstance, (Object[])null);
//System.out.println("SIZE="+((Integer)size));
-
+
Method getHandlesMethod = taskModelInstance.getClass().getDeclaredMethod("getHandles", (Class[])null);
Object[] handles = (Object[])getHandlesMethod.invoke(taskModelInstance, (Object[])null);
-
+
for(int i=0;i<handles.length;i++) {
Method getDisplayNameMethod = handles[i].getClass().getDeclaredMethod("getDisplayName", (Class[])null);
String displayName = (String)getDisplayNameMethod.invoke(handles[i], (Object[])null);
@@ -105,11 +105,11 @@ public class ProgressOperator {
}
}
return false;
-
+
//Method addListDataListenerMethod = taskModelInstance.getClass().getDeclaredMethod("addListDataListener", ListDataListener.class);
//addListDataListenerMethod.invoke(taskModelInstance, new TestProgressBar());
-
-
+
+
} catch (Exception e) {
throw new JemmyException("Reflection operation failed.", e);
}
diff --git a/contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/Util.java b/enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/Util.java
similarity index 99%
rename from contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/Util.java
rename to enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/Util.java
index f90181f..2e7f807 100644
--- a/contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/Util.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/lib/Util.java
@@ -51,29 +51,29 @@ import org.netbeans.modules.web.project.api.WebProjectCreateData;
* @author jungi
*/
public class Util {
-
+
public static final int J2SE_PROJECT = 0;
public static final int WEB_PROJECT = 1;
public static final int EJB_PROJECT = 2;
public static final int J2EE_PROJECT = 3;
-
+
public static final String DEFAULT_J2EE_LEVEL
= WebModule.J2EE_14_LEVEL;
-
+
public static final String DEFAULT_APPSRV_ID
= "deployer:Sun:AppServer::localhost:4848";
-
+
// public static final String DEFAULT_SRC_STRUCTURE
// = WebProjectGenerator.SRC_STRUCT_BLUEPRINTS;
-
+
public static final String DEFAULT_SRC_STRUCTURE
= WebProjectUtilities.SRC_STRUCT_BLUEPRINTS;
-
+
/** Creates a new instance of J2eeProjectSupport */
private Util() {
throw new UnsupportedOperationException("It is just a helper class.");
}
-
+
/** Opens project in specified directory.
* @param projectDir a directory with project to open
* @return Project instance of opened project
@@ -127,7 +127,7 @@ public class Util {
OpenProjectList.getDefault().removePropertyChangeListener(listener);
}
}
-
+
/** Opens project on specified path.
* @param projectPath path to a directory with project to open
* @return Project instance of opened project
@@ -135,7 +135,7 @@ public class Util {
public static Object openProject(String projectPath) {
return openProject(new File(projectPath));
}
-
+
/** Creates an empty Java project in specified directory and opens it.
* Its name is defined by name parameter.
* @param projectParentPath path to directory where to create name subdirectory and
@@ -146,7 +146,7 @@ public class Util {
public static Object createProject(String projectParentPath, String name) {
return createProject(new File(projectParentPath), name, J2SE_PROJECT, null);
}
-
+
/** Creates an empty project in specified directory and opens it.
* Its name is defined by name parameter.
* @param projectParentDir directory where to create name subdirectory and
@@ -212,7 +212,7 @@ public class Util {
return null;
}
}
-
+
/** Closes project with system or display name equals to given name.
* @param name system or display name of project to be closed.
* @return true if project is closed, false otherwise (i.e. project was
@@ -236,7 +236,7 @@ public class Util {
// project not found
return false;
}
-
+
/** Waits until metadata scanning is finished. */
public static void waitScanFinished() {
try {
@@ -245,7 +245,7 @@ public class Util {
Thread.currentThread().interrupt();
}
}
-
+
/**
*
* @return set of file names under the project root
@@ -264,7 +264,7 @@ public class Util {
}
return retVal;
}
-
+
public static Set getFileSet(String projectRoot) {
File f = new File(projectRoot);
Set dummy = new HashSet();
@@ -279,14 +279,14 @@ public class Util {
}
return retVal;
}
-
+
public static Project getProject(File wd, String relativePath) throws Exception {
File f = new File(wd, relativePath);
f = f.getCanonicalFile();
FileObject fo = FileUtil.toFileObject(f);
return ProjectManager.getDefault().findProject(fo);
}
-
+
// Process all files and directories under dir and put their names to given set
private static void visitAllDirsAndFiles(File dir, Set s) {
s.add(dir.isDirectory() ? dir.getPath() + File.separatorChar : dir.getPath());
@@ -297,11 +297,11 @@ public class Util {
}
}
}
-
+
/** Listener for project open. */
static class ProjectOpenListener implements PropertyChangeListener {
public boolean projectOpened = false;
-
+
/** Listen for property which changes when project is hopefully opened. */
public void propertyChange(PropertyChangeEvent evt) {
if(OpenProjectList.PROPERTY_OPEN_PROJECTS.equals(evt.getPropertyName())) {
@@ -310,4 +310,3 @@ public class Util {
}
}
}
-
diff --git a/contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/wildfly/JBossValidation.java b/enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/wildfly/JBossValidation.java
similarity index 96%
rename from contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/wildfly/JBossValidation.java
rename to enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/wildfly/JBossValidation.java
index f353758..ce3fc1f 100644
--- a/contrib/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/wildfly/JBossValidation.java
+++ b/enterprise/javaee.wildfly/test/qa-functional/src/org/netbeans/test/javaee/wildfly/JBossValidation.java
@@ -37,23 +37,23 @@ import org.netbeans.jemmy.operators.*;
* @author jpospisil
*/
public class JBossValidation extends JellyTestCase {
-
+
public static final String PROJECT_NAME = "TestDeployDebugWebApp";
public static final String EJB_PROJECT_NAME = "ejb";
public static final String EJB_PROJECT_PATH = System.getProperty("xtest.tmpdir") + File.separator + EJB_PROJECT_NAME;
public static final String WEB_PROJECT_PATH = System.getProperty("xtest.tmpdir") + File.separator + PROJECT_NAME;
-
-
-
+
+
+
int modifiers;
-
+
public static String openSourceAction = Bundle.getStringTrimmed("org.openide.actions.Bundle", "Open");
-
+
/** Need to be defined because of JUnit */
public JBossValidation(String name) {
super(name);
}
-
+
public static NbTestSuite suite() {
NbTestSuite suite = new NbTestSuite();
suite.addTest(new JBossValidation("addDefaultJBoss"));
@@ -64,7 +64,7 @@ public class JBossValidation extends JellyTestCase {
suite.addTest(new JBossValidation("stopJBoss"));
return suite;
}
-
+
public void setUp() {
System.out.println("######## "+getName()+" #######");
if (System.getProperty("os.name").startsWith("Mac OS X")) {
@@ -73,8 +73,8 @@ public class JBossValidation extends JellyTestCase {
modifiers = KeyEvent.CTRL_DOWN_MASK;
}
}
-
- public void addJBoss(String domain){
+
+ public void addJBoss(String domain){
String path = System.getProperty("jboss.server.path");
if (path == null) {
throw new RuntimeException("Cannot setup jboss, property jboss.server.path is not set.");
@@ -91,48 +91,48 @@ public class JBossValidation extends JellyTestCase {
new JButtonOperator(dialog,Bundle.getStringTrimmed("org.openide.Bundle", "CTL_FINISH")).push();
new ProjectsTabOperator();
}
-
-
+
+
// Adds JBoss server instance in default domain - working
- public void addDefaultJBoss(){
+ public void addDefaultJBoss(){
addJBoss("default");
}
-
-
+
+
// Adds JBoss server instance in minimal domain - working
public void addMinimalJBoss(){
addJBoss("minimal");
}
-
+
// Adds JBoss server instance in all domain - working
public void addAllJBoss(){
addJBoss("all");
}
-
-
+
+
// Stops running JBoss server - working,test of working server recommended to add
public void stopJBoss(){
RuntimeTabOperator runtimeTab = RuntimeTabOperator.invoke();
Node serverNode = new Node(runtimeTab.getRootNode(), Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "SERVER_REGISTRY_NODE")
- +"|JBoss");
+ +"|JBoss");
serverNode.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "LBL_Stop"));
org.netbeans.test.javaee.lib.ProgressOperator.waitFinished("Stopping JBoss Application Server",300000);
new org.netbeans.jemmy.EventTool().waitNoEvent(2000);
}
-
- public void refreshJBoss(){
+
+ public void refreshJBoss(){
RuntimeTabOperator runtimeTab = RuntimeTabOperator.invoke();
Node serverNode = new Node(runtimeTab.getRootNode(), Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "SERVER_REGISTRY_NODE")
- +"|JBoss");
+ +"|JBoss");
serverNode.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.actions.Bundle", "LBL_Refresh"));
}
-
-
+
+
// Removes JBoss server from Runtime tab - doesn't work/problem with pressing the OK button in Remove dialog
public void removeJBoss(){
RuntimeTabOperator runtimeTab = RuntimeTabOperator.invoke();
Node serverNode = new Node(runtimeTab.getRootNode(), Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "SERVER_REGISTRY_NODE")
- +"|JBoss");
+ +"|JBoss");
serverNode.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.actions.Bundle", "LBL_Remove"));
// The moment test is failing - now is on display dialog with Remove Server Instance in title
JDialogOperator rsi = new JDialogOperator(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.actions.Bundle", "MSG_RemoveInstanceTitle"));
@@ -160,10 +160,10 @@ public class JBossValidation extends JellyTestCase {
//yesButton.push();
//new ProjectsTabOperator();
}
-
-
-
- // Deploys web module on JBoss twice - working
+
+
+
+ // Deploys web module on JBoss twice - working
public void redeployWebModule() {
System.err.println(WEB_PROJECT_PATH);
Util.openProject(WEB_PROJECT_PATH);
@@ -179,7 +179,7 @@ public class JBossValidation extends JellyTestCase {
prn.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.ejbjarproject.ui.Bundle", "LBL_RedeployAction_Name"));
MainWindowOperator.getDefault().getTimeouts().setTimeout("Waiter.WaitingTime", 500000);
MainWindowOperator.getDefault().waitStatusText("Finished building "+PROJECT_NAME+" (run-deploy)");
- }
+ }
// Debugs web module on JBoss - working
public void debugWebModule() {
System.err.println(WEB_PROJECT_PATH);
@@ -192,9 +192,9 @@ public class JBossValidation extends JellyTestCase {
MainWindowOperator.getDefault().getTimeouts().setTimeout("Waiter.WaitingTime", 300000);
MainWindowOperator.getDefault().waitStatusText("User program running");
new org.netbeans.jemmy.EventTool().waitNoEvent(2000);
- }
-
-
+ }
+
+
public void deployEJBModule() {
System.err.println(EJB_PROJECT_PATH);
Util.openProject(EJB_PROJECT_PATH);
@@ -206,31 +206,31 @@ public class JBossValidation extends JellyTestCase {
MainWindowOperator.getDefault().getTimeouts().setTimeout("Waiter.WaitingTime", 300000);
MainWindowOperator.getDefault().waitStatusText("Finished building build.xml (run)");
//new org.netbeans.jemmy.EventTool().waitNoEvent(5000);
-
+
}
-
+
// Starts JBoss server in default mode - working
public void startJBoss(){
RuntimeTabOperator runtimeTab = RuntimeTabOperator.invoke();
Node serverNode = new Node(runtimeTab.getRootNode(), Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "SERVER_REGISTRY_NODE")
+"|JBoss");
-
+
serverNode.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "LBL_Start"));
org.netbeans.test.javaee.lib.ProgressOperator.waitFinished("Starting JBoss Application Server",300000);
new org.netbeans.jemmy.EventTool().waitNoEvent(2000);
}
-
+
// Starts JBoss server id debug mode - working
public void startJBossDebug(){
RuntimeTabOperator runtimeTab = RuntimeTabOperator.invoke();
Node serverNode = new Node(runtimeTab.getRootNode(), Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.Bundle", "SERVER_REGISTRY_NODE")
+"|JBoss");
-
+
serverNode.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.deployment.impl.ui.actions.Bundle", "LBL_DebugOutput"));
// org.netbeans.test.j2ee.lib.ProgressOperator.waitFinished();
new org.netbeans.jemmy.EventTool().waitNoEvent(5000);
}
-
+
// Deploys web module on JBoss - working
public void deployWebModule() {
System.err.println(WEB_PROJECT_PATH);
@@ -243,8 +243,8 @@ public class JBossValidation extends JellyTestCase {
MainWindowOperator.getDefault().getTimeouts().setTimeout("Waiter.WaitingTime", 300000);
MainWindowOperator.getDefault().waitStatusText("Finished building "+PROJECT_NAME+" (run-deploy)");
- }
-
+ }
+
// Deploys web module on JBoss and then debugs it - working partially
public void runDebugWebModule() {
System.err.println(WEB_PROJECT_PATH);
@@ -259,9 +259,9 @@ public class JBossValidation extends JellyTestCase {
prn = projectTab.getProjectRootNode(PROJECT_NAME);
prn.performPopupAction(Bundle.getStringTrimmed("org.netbeans.modules.j2ee.ejbjarproject.ui.Bundle", "LBL_DebugAction_Name"));
new org.netbeans.jemmy.EventTool().waitNoEvent(1000);
-
- }
-
+
+ }
+
//Sets the web browser to Swing
public static void setSwingBrowser() {
OptionsOperator optionsOper = OptionsOperator.invoke();
@@ -270,13 +270,13 @@ public class JBossValidation extends JellyTestCase {
new JButtonOperator(optionsOper,"OK").push();
new org.netbeans.jemmy.EventTool().waitNoEvent(1000);
}
-
-
+
+
/** Use for execution inside IDE */
public static void main(java.lang.String[] args) {
// run whole suite
TestRunner.run(suite());
}
-
+
}
diff --git a/contrib/javaee.wildfly/test/unit/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtilsTest.java b/enterprise/javaee.wildfly/test/unit/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtilsTest.java
similarity index 100%
rename from contrib/javaee.wildfly/test/unit/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtilsTest.java
rename to enterprise/javaee.wildfly/test/unit/src/org/netbeans/modules/javaee/wildfly/ide/ui/WildflyPluginUtilsTest.java
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index af34fd2..f29a7b2 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -788,6 +788,7 @@ nb.cluster.enterprise=\
javaee.project,\
javaee.resources,\
javaee.specs.support,\
+ javaee.wildfly,\
javaee7.api,\
javaee8.api,\
jellytools.enterprise,\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists