Skip to content

Commit d9ec4e5

Browse files
neilcsmith-netneilcsmith-net
authored
Merge pull request #1374 from apache/master
Sync master to release branch for NB 11.1-beta4
2 parents a4a76a5 + ab4e095 commit d9ec4e5

29 files changed

Lines changed: 4352 additions & 979 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ script:
3535
- if [ "x$LICENSE" == "xtrue" ]; then ant -quiet verify-libs-and-licenses -Dverify-libs-and-licenses.haltonfailure=true; fi
3636
- if [ "x$EOL" == "xtrue" ]; then ./nbbuild/travis/check-line-endings.sh; fi
3737
- if [ "x$SIGTEST" == "xtrue" ]; then ant check-sigtests; fi
38+
- if [ "x$SIGTEST" == "xtrue" ]; then ant gen-sigtests-release; fi
3839
- if [ "x$SCRIPT" != "x" ]; then ./$SCRIPT; fi
3940
- if [ "x$CV" == "xtrue" ]; then ant -quiet -f ergonomics/ide.ergonomics/ test -Dtest.config=commit; fi
4041
- if [ "x$RUN_TESTS_JDK8" == "xtrue" ]; then for MODULE in $TEST_MODULES; do cd $MODULE; ant test; done; fi

‎enterprise/j2ee.dd/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ src/org/netbeans/modules/j2ee/dd/impl/application/model_1_4/*
33
src/org/netbeans/modules/j2ee/dd/impl/application/model_5/*
44
src/org/netbeans/modules/j2ee/dd/impl/application/model_6/*
55
src/org/netbeans/modules/j2ee/dd/impl/application/model_7/*
6+
src/org/netbeans/modules/j2ee/dd/impl/application/model_8/*
67
src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4/*
78
src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0/*
89
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/*
1617
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0/*
1718
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag/*
1819
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1/*
19-
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
20+
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
21+
src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0/*
22+
src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag/*

‎enterprise/j2ee.dd/build.xml‎

Lines changed: 773 additions & 640 deletions
Large diffs are not rendered by default.

‎enterprise/j2ee.dd/licenseinfo.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_6.xsd</file>
3737
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.mdd</file>
3838
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_7.xsd</file>
39+
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_8.mdd</file>
3940
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_8.xsd</file>
4041
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.mdd</file>
4142
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_1_4.xsd</file>
@@ -87,6 +88,7 @@
8788
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_0.xsd</file>
8889
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.mdd</file>
8990
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_3_1.xsd</file>
91+
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_4_0.mdd</file>
9092
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_4_0.xsd</file>
9193
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_0.xsd</file>
9294
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_3_1.xsd</file>
@@ -95,6 +97,7 @@
9597
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_0.xsd</file>
9698
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.mdd</file>
9799
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_3_1.xsd</file>
100+
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_4_0.mdd</file>
98101
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_4_0.xsd</file>
99102
<license ref="CDDL-1.1" />
100103
<comment type="CATEGORY_B" />

‎enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ public static EjbJarProxy createEjbJarProxy(FileObject fo) throws IOException {
5252
inputStream.close();
5353
}
5454
}
55-
55+
5656
public static EjbJarProxy createEjbJarProxy(Reader reader) throws IOException {
5757
return createEjbJarProxy(new InputSource(reader));
5858
}
59-
59+
6060
public static EjbJarProxy createEjbJarProxy(InputSource inputSource) throws IOException {
6161
try {
6262
return (EjbJarProxy) DDProvider.getDefault().getDDRoot(inputSource);
@@ -73,8 +73,8 @@ public static EjbJarProxy createEjbJarProxy(InputSource inputSource) throws IOEx
7373
return ejbJarProxy;
7474
}
7575
}
76-
77-
76+
77+
7878
public static void merge(EjbJarProxy ejbJarProxy, Reader reader) {
7979
try {
8080
EjbJarProxy newEjbJarProxy = createEjbJarProxy(reader);
@@ -95,10 +95,10 @@ public static void merge(EjbJarProxy ejbJarProxy, Reader reader) {
9595
// so lets not set the original to null here but wait
9696
// until the file becomes parsable again to do a merge
9797
//ejbJarProxy.setOriginal(null);
98-
} catch (Schema2BeansRuntimeException s2bre){ // see #70286
98+
} catch (Schema2BeansRuntimeException s2bre){ // see #70286
9999
ejbJarProxy.setStatus(EjbJar.STATE_INVALID_UNPARSABLE);
100100
ejbJarProxy.setError(new SAXParseException(null, null, s2bre));
101-
} catch (RuntimeException re){ // see #99047
101+
} catch (RuntimeException re){ // see #99047
102102
if (re.getCause() instanceof Schema2BeansException){
103103
ejbJarProxy.setStatus(EjbJar.STATE_INVALID_UNPARSABLE);
104104
ejbJarProxy.setError(new SAXParseException(null, null, (Schema2BeansException) re.getCause()));
@@ -121,6 +121,8 @@ public static WebApp createWebApp(InputStream is, String version) throws IOExcep
121121
return org.netbeans.modules.j2ee.dd.impl.web.model_3_0.WebApp.createGraph(is);
122122
} else if (WebApp.VERSION_3_1.equals(version)) {
123123
return org.netbeans.modules.j2ee.dd.impl.web.model_3_1.WebApp.createGraph(is);
124+
} else if (WebApp.VERSION_4_0.equals(version)) {
125+
return org.netbeans.modules.j2ee.dd.impl.web.model_4_0.WebApp.createGraph(is);
124126
} else {
125127
return null;
126128
}
@@ -137,7 +139,7 @@ public static WebApp createWebApp(FileObject fo, String version) throws IOExcept
137139
inputStream.close();
138140
}
139141
}
140-
142+
141143
public static AppClient createAppClient(InputStream is, String version) throws IOException, SAXException {
142144
try {
143145
if (AppClient.VERSION_1_4.equals(version)) {

0 commit comments

Comments
 (0)