Merge pull request #1374 from apache/master

Sync master to release branch for NB 11.1-beta4
apache · Jul 13, 2019 · d9ec4e5 · d9ec4e5
2 parents a4a76a5 + ab4e095
commit d9ec4e5
Show file tree

Hide file tree

Showing 29 changed files with 4,352 additions and 979 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ script:
   - if [ "x$LICENSE" == "xtrue" ]; then ant -quiet verify-libs-and-licenses -Dverify-libs-and-licenses.haltonfailure=true; fi
   - if [ "x$EOL" == "xtrue" ]; then ./nbbuild/travis/check-line-endings.sh; fi
   - if [ "x$SIGTEST" == "xtrue" ]; then ant check-sigtests; fi
+  - if [ "x$SIGTEST" == "xtrue" ]; then ant gen-sigtests-release; fi
   - if [ "x$SCRIPT" != "x" ]; then ./$SCRIPT; fi
   - if [ "x$CV" == "xtrue" ]; then ant -quiet -f ergonomics/ide.ergonomics/ test -Dtest.config=commit; fi
   - if [ "x$RUN_TESTS_JDK8" == "xtrue" ]; then for MODULE in $TEST_MODULES; do cd $MODULE; ant test; done; fi

diff --git a/enterprise/j2ee.dd/.gitignore b/enterprise/j2ee.dd/.gitignore
@@ -3,6 +3,7 @@ src/org/netbeans/modules/j2ee/dd/impl/application/model_1_4/*
 src/org/netbeans/modules/j2ee/dd/impl/application/model_5/*
 src/org/netbeans/modules/j2ee/dd/impl/application/model_6/*
 src/org/netbeans/modules/j2ee/dd/impl/application/model_7/*
+src/org/netbeans/modules/j2ee/dd/impl/application/model_8/*
 src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4/*
 src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0/*
 src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0/*
@@ -16,4 +17,6 @@ src/org/netbeans/modules/j2ee/dd/impl/web/model_2_5/*
 src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0/*
 src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag/*
 src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1/*
-src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag/*
diff --git a/enterprise/j2ee.dd/build.xml b/enterprise/j2ee.dd/build.xml
diff --git a/enterprise/j2ee.dd/licenseinfo.xml b/enterprise/j2ee.dd/licenseinfo.xml
@@ -36,6 +36,7 @@
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_6.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_8.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_8.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.xsd</file>
@@ -87,6 +88,7 @@
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_4_0.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_4_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_1.xsd</file>
@@ -95,6 +97,7 @@
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.xsd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.xsd</file>
+        <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_4_0.mdd</file>
         <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_4_0.xsd</file>
         <license ref="CDDL-1.1" />
         <comment type="CATEGORY_B" />

diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
@@ -52,11 +52,11 @@ public static EjbJarProxy createEjbJarProxy(FileObject fo) throws IOException {
             inputStream.close();
         }
     }
-    
+
     public static EjbJarProxy createEjbJarProxy(Reader reader) throws IOException {
         return createEjbJarProxy(new InputSource(reader));
     }
-    
+
     public static EjbJarProxy createEjbJarProxy(InputSource inputSource) throws IOException {
         try {
             return (EjbJarProxy) DDProvider.getDefault().getDDRoot(inputSource);
@@ -73,8 +73,8 @@ public static EjbJarProxy createEjbJarProxy(InputSource inputSource) throws IOEx
             return ejbJarProxy;
         }
     }
-    
-    
+
+
     public static void merge(EjbJarProxy ejbJarProxy, Reader reader) {
         try {
             EjbJarProxy newEjbJarProxy = createEjbJarProxy(reader);
@@ -95,10 +95,10 @@ public static void merge(EjbJarProxy ejbJarProxy, Reader reader) {
             // so lets not set the original to null here but wait
             // until the file becomes parsable again to do a merge
             //ejbJarProxy.setOriginal(null);
-        } catch (Schema2BeansRuntimeException s2bre){ // see #70286    
+        } catch (Schema2BeansRuntimeException s2bre){ // see #70286
             ejbJarProxy.setStatus(EjbJar.STATE_INVALID_UNPARSABLE);
             ejbJarProxy.setError(new SAXParseException(null, null, s2bre));
-        } catch (RuntimeException re){ // see #99047    
+        } catch (RuntimeException re){ // see #99047
             if (re.getCause() instanceof Schema2BeansException){
                 ejbJarProxy.setStatus(EjbJar.STATE_INVALID_UNPARSABLE);
                 ejbJarProxy.setError(new SAXParseException(null, null, (Schema2BeansException) re.getCause()));
@@ -121,6 +121,8 @@ public static WebApp createWebApp(InputStream is, String version) throws IOExcep
                 return org.netbeans.modules.j2ee.dd.impl.web.model_3_0.WebApp.createGraph(is);
             } else if (WebApp.VERSION_3_1.equals(version)) {
                 return org.netbeans.modules.j2ee.dd.impl.web.model_3_1.WebApp.createGraph(is);
+            } else if (WebApp.VERSION_4_0.equals(version)) {
+                return org.netbeans.modules.j2ee.dd.impl.web.model_4_0.WebApp.createGraph(is);
             } else {
                 return null;
             }
@@ -137,7 +139,7 @@ public static WebApp createWebApp(FileObject fo, String version) throws IOExcept
             inputStream.close();
         }
     }
-    
+
     public static AppClient createAppClient(InputStream is, String version) throws IOException, SAXException {
         try {
             if (AppClient.VERSION_1_4.equals(version)) {