You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by GitBox <gi...@apache.org> on 2017/11/30 18:05:29 UTC
[GitHub] matthiasblaesing closed pull request #302: Various license fixes to satisfy rat checks
matthiasblaesing closed pull request #302: Various license fixes to satisfy rat checks
URL: https://github.com/apache/incubator-netbeans/pull/302
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.gitignore b/.gitignore
index b034c3ebd..0d705cac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,6 @@
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
-/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
-/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/
/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/
/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
diff --git a/classfile/jar-excludes.txt b/classfile/jar-excludes.txt
deleted file mode 100644
index e34186bf0..000000000
--- a/classfile/jar-excludes.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-**/*.java
-**/.nbattrs
-**/.#*
-**/i18n.txt
-**/*~
diff --git a/csl.api/changes.txt b/csl.api/changes.txt
index a74564b43..31aa305f7 100644
--- a/csl.api/changes.txt
+++ b/csl.api/changes.txt
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
1)
rewrite HintsProvider.Factory.getManager(JsTokenId.JAVASCRIPT_MIME_TYPE);
to HintsManager.getManagerForMimeType (JsTokenId.JAVASCRIPT_MIME_TYPE);
\ No newline at end of file
diff --git a/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/description.txt b/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/description.txt
index 3ba9178ca..9861ffc02 100644
--- a/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/description.txt
+++ b/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/description.txt
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
Description of the properties file format:
===========================================
diff --git a/form.binding/src/org/netbeans/modules/form/binding/resources/BindingSystemClasses.txt b/form.binding/src/org/netbeans/modules/form/binding/resources/BindingSystemClasses.txt
index b3fceb6fc..e05d6ad7d 100644
--- a/form.binding/src/org/netbeans/modules/form/binding/resources/BindingSystemClasses.txt
+++ b/form.binding/src/org/netbeans/modules/form/binding/resources/BindingSystemClasses.txt
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
org.jdesktop.beansbinding.*
\ No newline at end of file
diff --git a/form/src/org/netbeans/modules/form/project/ClassPathUtils.java b/form/src/org/netbeans/modules/form/project/ClassPathUtils.java
index 1be1d9d25..74699ebe7 100644
--- a/form/src/org/netbeans/modules/form/project/ClassPathUtils.java
+++ b/form/src/org/netbeans/modules/form/project/ClassPathUtils.java
@@ -390,7 +390,7 @@ private static FileObject getClassPatternsFolder(String folderName) {
String line = r.readLine();
while (line != null) {
line = line.trim();
- if (!line.equals("")) { // NOI18N
+ if (!(line.equals("") || line.startsWith("#"))) { // NOI18N
ClassPattern cp;
if (line.endsWith("**")) { // NOI18N
cp = new ClassPattern(line.substring(0, line.length()-2),
diff --git a/form/src/org/netbeans/modules/form/resources/SystemClasses.txt b/form/src/org/netbeans/modules/form/resources/SystemClasses.txt
index 786e3fe18..6a4c5a5f9 100644
--- a/form/src/org/netbeans/modules/form/resources/SystemClasses.txt
+++ b/form/src/org/netbeans/modules/form/resources/SystemClasses.txt
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
org.netbeans.modules.form.**
org.netbeans.beaninfo.editors.*
org.netbeans.modules.i18n.form.*
diff --git a/html.custom/src/org/netbeans/modules/html/custom/spec.txt b/html.custom/src/org/netbeans/modules/html/custom/spec.txt
index bd7888ba5..ca275617c 100644
--- a/html.custom/src/org/netbeans/modules/html/custom/spec.txt
+++ b/html.custom/src/org/netbeans/modules/html/custom/spec.txt
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
-element in any context
-element in a specified context (html element/s or any other custom element/s)
-attribute of any element (html or custom)
diff --git a/html.custom/src/org/netbeans/modules/html/custom/todo.txt b/html.custom/src/org/netbeans/modules/html/custom/todo.txt
index db9837769..81081c97c 100644
--- a/html.custom/src/org/netbeans/modules/html/custom/todo.txt
+++ b/html.custom/src/org/netbeans/modules/html/custom/todo.txt
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
simple:
- checking & completion of attribute values!
- add hyperlinking to the definition file from the usages in html code
diff --git a/html.parser/external/howtoupgrade.txt b/html.parser/external/howtoupgrade.txt
index dfdceeec5..d12eb1de7 100644
--- a/html.parser/external/howtoupgrade.txt
+++ b/html.parser/external/howtoupgrade.txt
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
How to upgrade the htmlparser library:
1) clone the sources of the parser from http://hg.mozilla.org/projects/htmlparser
diff --git a/html.parser/src/org/netbeans/modules/html/parser/todo b/html.parser/src/org/netbeans/modules/html/parser/todo
index 3722597e0..9136c9710 100644
--- a/html.parser/src/org/netbeans/modules/html/parser/todo
+++ b/html.parser/src/org/netbeans/modules/html/parser/todo
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
P4 remove wrapping of the ElementDescriptor as HtmlTags, implement directly
P3 properly resolve the conflicts in the tag names between html-mathml-svg specs,
so far the conflicting elements' enums are prefixed with SVG_ prefix
diff --git a/html.parser/test/unit/data/testfiles/netbeans_org.html b/html.parser/test/unit/data/testfiles/netbeans_org.html
index 65b42f27f..fae4194af 100644
--- a/html.parser/test/unit/data/testfiles/netbeans_org.html
+++ b/html.parser/test/unit/data/testfiles/netbeans_org.html
@@ -1,8 +1,25 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
<!--
-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
-->
+<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<TITLE>Welcome to NetBeans</TITLE>
diff --git a/html.parser/test/unit/data/testfiles/test2.html b/html.parser/test/unit/data/testfiles/test2.html
index 373715259..e8409b92b 100644
--- a/html.parser/test/unit/data/testfiles/test2.html
+++ b/html.parser/test/unit/data/testfiles/test2.html
@@ -1,9 +1,26 @@
<!DOCTYPE HTML>
-<html>
<!--
-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
--->
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<TITLE>Welcome to NetBeans</TITLE>
diff --git a/html.parser/test/unit/src/org/netbeans/modules/html/parser/Html5ParserTest.java b/html.parser/test/unit/src/org/netbeans/modules/html/parser/Html5ParserTest.java
index 095ffbf69..d42e81f18 100644
--- a/html.parser/test/unit/src/org/netbeans/modules/html/parser/Html5ParserTest.java
+++ b/html.parser/test/unit/src/org/netbeans/modules/html/parser/Html5ParserTest.java
@@ -31,6 +31,7 @@
import static junit.framework.Assert.assertNotNull;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.junit.Ignore;
import org.netbeans.modules.html.editor.lib.api.SyntaxAnalyzer;
import org.netbeans.modules.html.editor.lib.api.elements.Attribute;
import org.netbeans.modules.html.editor.lib.api.elements.CloseTag;
@@ -575,47 +576,52 @@ public void testOnlyDivInFile() throws ParseException {
// NodeUtils.dumpTree(root);
}
- public void testParseFileTest1() throws ParseException {
- parse(getTestFile("testfiles/test1.html"));
- }
+// Depends on file not donated by oracle to the apache foundation
+// public void testParseFileTest1() throws ParseException {
+// parse(getTestFile("testfiles/test1.html"));
+// }
public void testParseFileTest2() throws ParseException {
parse(getTestFile("testfiles/test2.html"));
}
- public void testParseFileTest3() throws ParseException {
- parse(getTestFile("testfiles/test3.html"));
- }
-
- public void testParseFileTest4() throws ParseException {
- parse(getTestFile("testfiles/test4.html"));
- }
-
- public void testParseFileTest5() throws ParseException {
- parse(getTestFile("testfiles/test5.html"));
- }
-
- //Bug 211776 - Self-closing element breaks code folding
- public void testIssue211776() throws ParseException {
-// ParseTreeBuilder.setLoggerLevel(Level.ALL);
-
- HtmlParseResult result = parse(getTestFile("testfiles/test6.html"));
- Node root = result.root();
-// ElementUtils.dumpTree(root);
-
- OpenTag body = ElementUtils.query(root, "html/body");
- assertNotNull(body);
- assertFalse(body.isEmpty());
+// Depends on file not donated by oracle to the apache foundation
+// public void testParseFileTest3() throws ParseException {
+// parse(getTestFile("testfiles/test3.html"));
+// }
- OpenTag link = ElementUtils.query(root, "html/head/link");
- assertNotNull(link);
- assertTrue(link.isEmpty());
+// Depends on file not donated by oracle to the apache foundation
+// public void testParseFileTest4() throws ParseException {
+// parse(getTestFile("testfiles/test4.html"));
+// }
- OpenTag div = ElementUtils.query(root, "html/body/div");
- assertNotNull(div);
- assertFalse(div.isEmpty());
+// Depends on file not donated by oracle to the apache foundation
+// public void testParseFileTest5() throws ParseException {
+// parse(getTestFile("testfiles/test5.html"));
+// }
- }
+// Depends on file not donated by oracle to the apache foundation
+// //Bug 211776 - Self-closing element breaks code folding
+// public void testIssue211776() throws ParseException {
+//// ParseTreeBuilder.setLoggerLevel(Level.ALL);
+//
+// HtmlParseResult result = parse(getTestFile("testfiles/test6.html"));
+// Node root = result.root();
+//// ElementUtils.dumpTree(root);
+//
+// OpenTag body = ElementUtils.query(root, "html/body");
+// assertNotNull(body);
+// assertFalse(body.isEmpty());
+//
+// OpenTag link = ElementUtils.query(root, "html/head/link");
+// assertNotNull(link);
+// assertTrue(link.isEmpty());
+//
+// OpenTag div = ElementUtils.query(root, "html/body/div");
+// assertNotNull(div);
+// assertFalse(div.isEmpty());
+//
+// }
public void testAddChildToEmptyTag() throws ParseException {
// ParseTreeBuilder.setLoggerLevel(Level.ALL);
@@ -1021,13 +1027,15 @@ public void testParseNetbeans_org() throws ParseException {
parse(getTestFile("testfiles/netbeans_org.html"));
}
- public void testParseW3c_org() throws ParseException {
- parse(getTestFile("testfiles/w3c_org.html"));
- }
+// Depends on file not donated by oracle to the apache foundation
+// public void testParseW3c_org() throws ParseException {
+// parse(getTestFile("testfiles/w3c_org.html"));
+// }
- public void testParseWikipedia_org() throws ParseException {
- parse(getTestFile("testfiles/wikipedia_org.html"));
- }
+// Depends on file not donated by oracle to the apache foundation
+// public void testParseWikipedia_org() throws ParseException {
+// parse(getTestFile("testfiles/wikipedia_org.html"));
+// }
//Bug 213332 - IllegalStateException: A bug #212445 just happended for source text " scrollbar-arrow-color:"black"; } </STYLE> <TITLE>Cyprus :: Larnaca</TITLE></HEAD> <BOD". Please report a new bug or r
//http://netbeans.org/bugzilla/show_bug.cgi?id=213332
diff --git a/html.validation/external/org.whattf.datatype.patch b/html.validation/external/org.whattf.datatype.patch
index f72e7e735..c8c1bcdce 100644
--- a/html.validation/external/org.whattf.datatype.patch
+++ b/html.validation/external/org.whattf.datatype.patch
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
diff -r a8c706c41383 relaxng/datatype/java/src/org/whattf/datatype/FunctionBody.java
--- a/relaxng/datatype/java/src/org/whattf/datatype/FunctionBody.java Mon May 27 13:11:20 2013 +0300
+++ b/relaxng/datatype/java/src/org/whattf/datatype/FunctionBody.java Thu May 30 16:42:24 2013 +0200
diff --git a/html.validation/test/unit/data/testfiles/test1.xhtml b/html.validation/test/unit/data/testfiles/test1.xhtml
index 54bfd1a19..c313c830e 100644
--- a/html.validation/test/unit/data/testfiles/test1.xhtml
+++ b/html.validation/test/unit/data/testfiles/test1.xhtml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
diff --git a/html.validation/test/unit/data/testfiles/test2.xhtml b/html.validation/test/unit/data/testfiles/test2.xhtml
index ae1aac9e2..3bfcb1bd8 100644
--- a/html.validation/test/unit/data/testfiles/test2.xhtml
+++ b/html.validation/test/unit/data/testfiles/test2.xhtml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>TODO supply a title</title>
diff --git a/html.validation/test/unit/data/testfiles/wicket.xhtml b/html.validation/test/unit/data/testfiles/wicket.xhtml
index 32289ae06..0c90f3bb5 100644
--- a/html.validation/test/unit/data/testfiles/wicket.xhtml
+++ b/html.validation/test/unit/data/testfiles/wicket.xhtml
@@ -1,5 +1,25 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org">
<head>
diff --git a/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/Module.java b/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/Module.java
index 0090851c4..c117751ff 100644
--- a/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/Module.java
+++ b/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/Module.java
@@ -315,7 +315,7 @@ public void test_1_5() {
pw.close();
startHTTPServer();
- checkResult("/repository/org/netbeans/test/gui/httpserver/test.txt",1,"This is test file",false);
+ checkResult("/repository/org/netbeans/test/gui/httpserver/test.txt",1,"Licensed to the Apache Software Foundation (ASF) under one or more contributor",false);
}
// Internal HTTP Server Test Specification: Test suite: 2. Accessing Items on IDE Classpath
diff --git a/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/test.txt b/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/test.txt
index db0e5cbc6..66c9f0498 100644
--- a/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/test.txt
+++ b/httpserver/test/qa-functional/src/org/netbeans/test/gui/httpserver/test.txt
@@ -1,2 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
This is test file.
Do not delete.
\ No newline at end of file
diff --git a/httpserver/test/unit/testfs/org/netbeans/test/httpserver/Page.html b/httpserver/test/unit/testfs/org/netbeans/test/httpserver/Page.html
index 841c621de..78e8d9045 100644
--- a/httpserver/test/unit/testfs/org/netbeans/test/httpserver/Page.html
+++ b/httpserver/test/unit/testfs/org/netbeans/test/httpserver/Page.html
@@ -1,4 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<HTML>
<HEAD>
<TITLE>
diff --git a/httpserver/test/unit/testfs/org/netbeans/test/httpserver/dir with spaces/file with spaces.txt b/httpserver/test/unit/testfs/org/netbeans/test/httpserver/dir with spaces/file with spaces.txt
index 6ce7ca63e..711f8bcf2 100644
--- a/httpserver/test/unit/testfs/org/netbeans/test/httpserver/dir with spaces/file with spaces.txt
+++ b/httpserver/test/unit/testfs/org/netbeans/test/httpserver/dir with spaces/file with spaces.txt
@@ -1 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
this is my file with spaces
diff --git a/httpserver/test/unit/testfs/org/netbeans/test/httpserver/empty b/httpserver/test/unit/testfs/org/netbeans/test/httpserver/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/j2ee.eclipselink/build.xml b/j2ee.eclipselink/build.xml
index 8760a9e2c..1ecb56ef3 100644
--- a/j2ee.eclipselink/build.xml
+++ b/j2ee.eclipselink/build.xml
@@ -22,4 +22,27 @@
<project basedir="." default="netbeans" name="j2ee.eclipselink">
<description>Builds, tests, and runs the project org.netbeans.modules.j2ee.eclipselink</description>
<import file="../nbbuild/templates/projectized.xml"/>
+
+ <target name="-check-jpa-doc" depends="projectized.build-init">
+ <available file="build/javax.persistence-2.1.0-doc.zip" property="jpa-doc-available"/>
+ </target>
+
+ <target name="-build-jpa-doc" depends="-check-jpa-doc" unless="jpa-doc-available">
+ <delete dir="build/javax.persistence-2.1.0-sources" />
+ <delete dir="build/javax.persistence-2.1.0-doc" />
+ <delete file="build/javax.persistence-2.1.0-doc.zip" />
+ <unzip dest="build/javax.persistence-2.1.0-sources"
+ src="external/javax.persistence-2.1.0-sources.jar" />
+ <javadoc destdir="build/javax.persistence-2.1.0-doc">
+ <packageset dir="build/javax.persistence-2.1.0-sources" defaultexcludes="yes">
+ <include name="javax/persistence/**" />
+ </packageset>
+ </javadoc>
+ <zip destfile="build/javax.persistence-2.1.0-doc.zip">
+ <zipfileset dir="build/javax.persistence-2.1.0-doc" prefix="docs/"/>
+ </zip>
+ </target>
+
+ <target name="build-init" depends="projectized.build-init,-build-jpa-doc">
+ </target>
</project>
diff --git a/j2ee.eclipselink/external/binaries-list b/j2ee.eclipselink/external/binaries-list
index 234c44c44..6f546ab66 100644
--- a/j2ee.eclipselink/external/binaries-list
+++ b/j2ee.eclipselink/external/binaries-list
@@ -14,7 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-CD2211635F3011E300CA8FEDC1CE0E1CF61C175B eclipselink.jar
-5BAB675816DBE0F64BB86004B108BF2A00292358 javax.persistence_2.1.0.v201304241213.jar
-29AF1D338CBB76290D1A96F5A6610F1E8C319AE5 org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-A8BD39C5B88571B4D4697E78DD1A56566E44B1DD JPAjavadocs04032013.zip
+04C4E53577658440409783942AEE0D37DA0A67F9 org.eclipse.persistence:org.eclipse.persistence.core:2.5.2
+83298D74D26BDDD95C5025AB2A1E545BB5424739 org.eclipse.persistence:org.eclipse.persistence.asm:2.5.2
+189DB51E5A42710F16B5CF880AECC19B2820B0F9 org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.2
+2A54E88F70B488381F837D644A16A2219FB4FD64 org.eclipse.persistence:org.eclipse.persistence.jpa:2.5.2
+29AF1D338CBB76290D1A96F5A6610F1E8C319AE5 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.5.2
+5BAB675816DBE0F64BB86004B108BF2A00292358 org.eclipse.persistence:javax.persistence:2.1.0
+DA95A959929234C57B988644696C065D79774FC4 org.eclipse.persistence:javax.persistence:2.1.0:sources
diff --git a/j2ee.eclipselink/external/eclipselink-2.5.2-licence.txt b/j2ee.eclipselink/external/eclipselink-2.5.2-license.txt
similarity index 97%
rename from j2ee.eclipselink/external/eclipselink-2.5.2-licence.txt
rename to j2ee.eclipselink/external/eclipselink-2.5.2-license.txt
index 6d1e5b0cb..0a5fad04c 100644
--- a/j2ee.eclipselink/external/eclipselink-2.5.2-licence.txt
+++ b/j2ee.eclipselink/external/eclipselink-2.5.2-license.txt
@@ -1,9 +1,10 @@
Name: EclipseLink
+Origin: Eclipse
Version: 2.5.2
Description: The Eclipse Persistence Services Project ( EclipseLink) project.
-License: Eclipse Public License - v 1.0 and Eclipse Distribution License v 1.0
+License: EPL-1.0
Origin: http://www.eclipse.org/eclipselink/
-Files: eclipselink.jar, javax.persistence_2.1.0.v201304241213.jar, org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+Files: javax.persistence-2.1.0-sources.jar, javax.persistence-2.1.0.jar, org.eclipse.persistence.core-2.5.2.jar, org.eclipse.persistence.asm-2.5.2.jar, org.eclipse.persistence.antlr-2.5.2.jar, org.eclipse.persistence.jpa-2.5.2.jar, org.eclipse.persistence.jpa.jpql-2.5.2.jar
Use of EclipseLink version 2.5.2 is governed by the terms of the license below:
diff --git a/j2ee.eclipselink/nbproject/project.properties b/j2ee.eclipselink/nbproject/project.properties
index 129609bda..aa8d8f16d 100644
--- a/j2ee.eclipselink/nbproject/project.properties
+++ b/j2ee.eclipselink/nbproject/project.properties
@@ -19,12 +19,18 @@ is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
jnlp.indirect.jars=\
- modules/ext/eclipselink/eclipselink.jar,\
- modules/ext/eclipselink/javax.persistence_2.1.0.201304241213.jar,\
- modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.20140319-9ad6abd.jar,\
+ modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar,\
+ modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar,\
+ modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar,\
+ modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar,\
+ modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar,\
+ modules/ext/eclipselink/javax.persistence-2.1.0.jar,\
modules/ext/docs/javax.persistence-2.1.0-doc.zip
-release.external/eclipselink.jar=modules/ext/eclipselink/eclipselink.jar
-release.external/javax.persistence_2.1.0.v201304241213.jar=modules/ext/eclipselink/javax.persistence_2.1.0.201304241213.jar
-release.external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.20140319-9ad6abd.jar
-release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
\ No newline at end of file
+release.external/org.eclipse.persistence.core-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar
+release.external/org.eclipse.persistence.asm-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar
+release.external/org.eclipse.persistence.antlr-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar
+release.external/org.eclipse.persistence.jpa-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar
+release.external/org.eclipse.persistence.jpa.jpql-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar
+release.external/javax.persistence-2.1.0.jar=modules/ext/eclipselink/javax.persistence-2.1.0.jar
+release.build/javax.persistence-2.1.0-doc.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
\ No newline at end of file
diff --git a/j2ee.eclipselink/nbproject/project.xml b/j2ee.eclipselink/nbproject/project.xml
index 998a23ad7..949b8ed88 100644
--- a/j2ee.eclipselink/nbproject/project.xml
+++ b/j2ee.eclipselink/nbproject/project.xml
@@ -30,13 +30,22 @@
<subpackages>javax.persistence</subpackages>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/eclipselink/eclipselink.jar</runtime-relative-path>
+ <runtime-relative-path>ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/eclipselink/javax.persistence_2.1.0.201304241213.jar</runtime-relative-path>
+ <runtime-relative-path>ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar</runtime-relative-path>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.20140319-9ad6abd.jar</runtime-relative-path>
+ <runtime-relative-path>ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar</runtime-relative-path>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar</runtime-relative-path>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar</runtime-relative-path>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/eclipselink/javax.persistence-2.1.0.jar</runtime-relative-path>
</class-path-extension>
</data>
</configuration>
diff --git a/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml b/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml
index 084a370ba..9f2650e37 100644
--- a/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml
+++ b/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/eclipselink_lib.xml
@@ -25,9 +25,12 @@
<localizing-bundle>org.netbeans.modules.j2ee.eclipselink.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/eclipselink.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence_2.1.0.201304241213.jar!/</resource>
- <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.20140319-9ad6abd.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence-2.1.0.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
@@ -38,7 +41,12 @@
<property>
<name>maven-dependencies</name>
<value>
- org.eclipse.persistence:eclipselink:2.5.2:jar
+ org.eclipse.persistence:org.eclipse.persistence.core:2.5.2:jar
+ org.eclipse.persistence:org.eclipse.persistence.asm:2.5.2:jar
+ org.eclipse.persistence:org.eclipse.persistence.antlr:2.5.2:jar
+ org.eclipse.persistence:org.eclipse.persistence.jpa:2.5.2:jar
+ org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.5.2:jar
+ org.eclipse.persistence:javax.persistence:2.1.0:jar
</value>
</property>
</properties>
diff --git a/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/jpa20-persistence.xml b/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/jpa20-persistence.xml
index 9ed4de649..84732cf82 100644
--- a/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/jpa20-persistence.xml
+++ b/j2ee.eclipselink/src/org/netbeans/modules/j2ee/eclipselink/jpa20-persistence.xml
@@ -25,7 +25,7 @@
<localizing-bundle>org.netbeans.modules.j2ee.eclipselink.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence_2.1.0.201304241213.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselink/modules/ext/eclipselink/javax.persistence-2.1.0.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
diff --git a/j2ee.eclipselinkmodelgen/external/binaries-list b/j2ee.eclipselinkmodelgen/external/binaries-list
index b40ecc21c..4870efbfc 100644
--- a/j2ee.eclipselinkmodelgen/external/binaries-list
+++ b/j2ee.eclipselinkmodelgen/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-3CE04BDB48FE315736B1DCE407362C57DFAE286D org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+85A0C541AFE89159B3DD6BC213D8CB95E6FE911B org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.5.2
diff --git a/j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-licence.txt b/j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-license.txt
similarity index 99%
rename from j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-licence.txt
rename to j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-license.txt
index 529c600b6..f4b0c94e7 100644
--- a/j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-licence.txt
+++ b/j2ee.eclipselinkmodelgen/external/eclipselink-2.5.2-license.txt
@@ -4,7 +4,7 @@ Version: 2.5.2
Description: The Eclipse Persistence Services Project ( EclipseLink) project.
License: EPL-1.0
Origin: http://www.eclipse.org/eclipselink/
-Files: org.eclipse.persistence.jpa.modelgen_2.5.2.jar
+Files: org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar
Use of EclipseLink version 2.5.2 is governed by the terms of the license below:
diff --git a/j2ee.eclipselinkmodelgen/nbproject/project.properties b/j2ee.eclipselinkmodelgen/nbproject/project.properties
index e5e86b496..059e56bb5 100644
--- a/j2ee.eclipselinkmodelgen/nbproject/project.properties
+++ b/j2ee.eclipselinkmodelgen/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
jnlp.indirect.jars=\
- modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+ modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar
-release.external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+release.external/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar
diff --git a/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/eclipselinkmodelgen_lib.xml b/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/eclipselinkmodelgen_lib.xml
index 74c86c5bb..9c226285e 100644
--- a/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/eclipselinkmodelgen_lib.xml
+++ b/j2ee.eclipselinkmodelgen/src/org/netbeans/modules/j2ee/eclipselinkmodelgen/eclipselinkmodelgen_lib.xml
@@ -25,7 +25,7 @@
<localizing-bundle>org.netbeans.modules.j2ee.eclipselinkmodelgen.Bundle</localizing-bundle>
<volume>
<type>classpath</type>
- <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselinkmodelgen/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.j2ee.eclipselinkmodelgen/modules/ext/eclipselink/org.eclipse.persistence.jpa.modelgen.processor-2.5.2.jar!/</resource>
</volume>
<volume>
<type>javadoc</type>
diff --git a/j2ee.jpa.refactoring/nbproject/project.properties b/j2ee.jpa.refactoring/nbproject/project.properties
index b1145fb07..6b9d4c8fe 100644
--- a/j2ee.jpa.refactoring/nbproject/project.properties
+++ b/j2ee.jpa.refactoring/nbproject/project.properties
@@ -19,7 +19,15 @@ javac.compilerargs=-Xlint:unchecked
javac.source=1.6
requires.nb.javac=true
-test.unit.run.cp.extra=${j2eeserver.dir}/modules/ext/jsr88javax.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/eclipselink.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar:${masterfs.dir}/modules/org-netbeans-modules-masterfs.jar
+test.unit.run.cp.extra=\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence-2.1.0.jar:\
+ ${j2eeserver.dir}/modules/ext/jsr88javax.jar:\
+ ${masterfs.dir}/modules/org-netbeans-modules-masterfs.jar
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/j2ee.metadata.model.support/nbproject/project.properties b/j2ee.metadata.model.support/nbproject/project.properties
index 4ded2969c..6256427bf 100644
--- a/j2ee.metadata.model.support/nbproject/project.properties
+++ b/j2ee.metadata.model.support/nbproject/project.properties
@@ -20,5 +20,9 @@ javac.source=1.6
requires.nb.javac=true
test.unit.cp.extra=\
- ${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence_2.1.0.201304241213.jar:\
- ${j2ee.persistence.dir}/modules/ext/eclipselink/eclipselink.jar
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence-2.1.0.jar
diff --git a/j2ee.metadata.model.support/nbproject/project.xml b/j2ee.metadata.model.support/nbproject/project.xml
index c2d5b5a51..7eadca133 100644
--- a/j2ee.metadata.model.support/nbproject/project.xml
+++ b/j2ee.metadata.model.support/nbproject/project.xml
@@ -105,7 +105,7 @@
<recursive/>
</test-dependency>
<test-dependency>
- <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
+ <code-name-base>org.netbeans.modules.j2ee.eclipselink</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
@@ -121,6 +121,10 @@
<recursive/>
<compile-dependency/>
</test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
<test-dependency>
<code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
</test-dependency>
@@ -131,12 +135,12 @@
<code-name-base>org.netbeans.modules.projectui</code-name-base>
</test-dependency>
<test-dependency>
- <code-name-base>org.openide.util.ui</code-name-base>
+ <code-name-base>org.openide.util.lookup</code-name-base>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
- <code-name-base>org.openide.util.lookup</code-name-base>
+ <code-name-base>org.openide.util.ui</code-name-base>
<compile-dependency/>
<test/>
</test-dependency>
diff --git a/j2ee.persistenceapi/nbproject/project.properties b/j2ee.persistenceapi/nbproject/project.properties
index ada5cb865..a63db4950 100644
--- a/j2ee.persistenceapi/nbproject/project.properties
+++ b/j2ee.persistenceapi/nbproject/project.properties
@@ -23,7 +23,13 @@ javadoc.apichanges=${basedir}/apichanges.xml
requires.nb.javac=true
spec.version.base=1.37.0
-test.unit.cp.extra=${j2ee.persistence.dir}/modules/ext/eclipselink/eclipselink.jar:${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence_2.1.0.201304241213.jar
+test.unit.cp.extra=\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.core-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.asm-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.antlr-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.jpa-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql-2.5.2.jar:\
+ ${j2ee.persistence.dir}/modules/ext/eclipselink/javax.persistence-2.1.0.jar
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template b/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template
index d4ffb792a..6d814a374 100644
--- a/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template
+++ b/maven.osgi/src/org/netbeans/modules/maven/osgi/templates/Activator.java.template
@@ -1,4 +1,23 @@
-<#-- FreeMarker template (see http://freemarker.org/) -->
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<#assign licenseFirst = "/*">
<#assign licensePrefix = " * ">
<#assign licenseLast = " */">
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-fake-xhtml.dtd b/nbbuild/antsrc/org/netbeans/nbbuild/Arch-fake-xhtml.dtd
deleted file mode 100644
index 6a3b18dcf..000000000
--- a/nbbuild/antsrc/org/netbeans/nbbuild/Arch-fake-xhtml.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!ENTITY % special " none ">
-<!ENTITY % inline "code | b | hr | li | ol | ul | p | pre | a | %special; ">
-<!ENTITY % Flow "(#PCDATA | %inline; )* ">
-
-<!ELEMENT code %Flow; >
-<!ELEMENT b %Flow; >
-<!ELEMENT br %Flow; >
-<!ELEMENT hr %Flow; >
-<!ELEMENT li %Flow; >
-<!ELEMENT ol %Flow; >
-<!ELEMENT ul %Flow; >
-<!ELEMENT p %Flow; >
-<!ELEMENT pre %Flow; >
-<!ELEMENT a %Flow; >
-<!ATTLIST a
- href CDATA #IMPLIED
- name CDATA #IMPLIED
->
-
-
-
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/Arch.java b/nbbuild/antsrc/org/netbeans/nbbuild/Arch.java
index e6720a0d0..40b737868 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/Arch.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/Arch.java
@@ -34,7 +34,9 @@
import java.text.DateFormat;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.regex.Matcher;
@@ -678,13 +680,15 @@ private static Node findDefaultAnswer(Node n) {
return null;
}
- private static Map<String,String> publicIds;
+ private static Set<String> localDTDs;
static {
- publicIds = new HashMap<String,String>();
- publicIds.put("xhtml1-strict.dtd", "Arch-fake-xhtml.dtd");
- publicIds.put("Arch.dtd", "Arch.dtd");
- publicIds.put("Arch-api-questions.xml", "Arch-api-questions.xml");
-
+ localDTDs = new HashSet<String>();
+ localDTDs.add("Arch.dtd");
+ localDTDs.add("Arch-api-questions.xml");
+ localDTDs.add("xhtml1-strict.dtd");
+ localDTDs.add("xhtml-lat1.ent");
+ localDTDs.add("xhtml-special.ent");
+ localDTDs.add("xhtml-symbol.ent");
}
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
@@ -693,46 +697,15 @@ public InputSource resolveEntity(String publicId, String systemId) throws SAXExc
int idx = systemId.lastIndexOf('/');
String last = systemId.substring(idx + 1);
- if (last.equals("xhtml1-strict.dtd")) {
- // try to find relative libraries
- String dtd = "nbbuild/external/xhtml1-dtds/xhtml1-strict.dtd".replace('/', File.separatorChar);
- File f = questionsFile.getParentFile();
- while (f != null) {
- File check = new File(f, dtd);
- if (check.isFile()) {
- String r = check.toURI().toString();
- log("Replacing entity " + publicId + " at " + systemId + " with " + r);
- return new InputSource(r);
- }
- f = f.getParentFile();
- }
- }
-
- String replace = publicIds.get(last);
- if (replace == null) {
- log("Not replacing id", Project.MSG_VERBOSE);
- return null;
- }
-
- try {
- URL u = new URL(systemId);
- u.openStream();
- log("systemId " + systemId + " exists, leaving", Project.MSG_VERBOSE);
- return null;
- } catch (IOException ex) {
- // ok
- }
-
- InputSource is;
- log("Replacing entity " + publicId + " at " + systemId + " with " + replace);
- if (replace.startsWith("http://")) {
- is = new InputSource(new URL(replace).openStream());
- is.setSystemId(replace);
+ if (localDTDs.contains(last)) {
+ log("Resolved to embedded DTD");
+ InputSource is = new InputSource(Arch.class.getResourceAsStream(last));
+ is.setSystemId(systemId);
+ return is;
} else {
- is = new InputSource(Arch.class.getResourceAsStream(replace));
- is.setSystemId(replace);
+ log("Not resolved");
+ return null;
}
- return is;
}
public Source resolve(String href, String base) throws TransformerException {
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent
new file mode 100644
index 000000000..2a33e090d
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent
@@ -0,0 +1,196 @@
+<!-- Portions (C) International Organization for Standardization 1986
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+ %HTMLlat1;
+-->
+
+<!ENTITY nbsp " "> <!-- no-break space = non-breaking space,
+ U+00A0 ISOnum -->
+<!ENTITY iexcl "¡"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
+<!ENTITY cent "¢"> <!-- cent sign, U+00A2 ISOnum -->
+<!ENTITY pound "£"> <!-- pound sign, U+00A3 ISOnum -->
+<!ENTITY curren "¤"> <!-- currency sign, U+00A4 ISOnum -->
+<!ENTITY yen "¥"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
+<!ENTITY brvbar "¦"> <!-- broken bar = broken vertical bar,
+ U+00A6 ISOnum -->
+<!ENTITY sect "§"> <!-- section sign, U+00A7 ISOnum -->
+<!ENTITY uml "¨"> <!-- diaeresis = spacing diaeresis,
+ U+00A8 ISOdia -->
+<!ENTITY copy "©"> <!-- copyright sign, U+00A9 ISOnum -->
+<!ENTITY ordf "ª"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
+<!ENTITY laquo "«"> <!-- left-pointing double angle quotation mark
+ = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY not "¬"> <!-- not sign = angled dash,
+ U+00AC ISOnum -->
+<!ENTITY shy "­"> <!-- soft hyphen = discretionary hyphen,
+ U+00AD ISOnum -->
+<!ENTITY reg "®"> <!-- registered sign = registered trade mark sign,
+ U+00AE ISOnum -->
+<!ENTITY macr "¯"> <!-- macron = spacing macron = overline
+ = APL overbar, U+00AF ISOdia -->
+<!ENTITY deg "°"> <!-- degree sign, U+00B0 ISOnum -->
+<!ENTITY plusmn "±"> <!-- plus-minus sign = plus-or-minus sign,
+ U+00B1 ISOnum -->
+<!ENTITY sup2 "²"> <!-- superscript two = superscript digit two
+ = squared, U+00B2 ISOnum -->
+<!ENTITY sup3 "³"> <!-- superscript three = superscript digit three
+ = cubed, U+00B3 ISOnum -->
+<!ENTITY acute "´"> <!-- acute accent = spacing acute,
+ U+00B4 ISOdia -->
+<!ENTITY micro "µ"> <!-- micro sign, U+00B5 ISOnum -->
+<!ENTITY para "¶"> <!-- pilcrow sign = paragraph sign,
+ U+00B6 ISOnum -->
+<!ENTITY middot "·"> <!-- middle dot = Georgian comma
+ = Greek middle dot, U+00B7 ISOnum -->
+<!ENTITY cedil "¸"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
+<!ENTITY sup1 "¹"> <!-- superscript one = superscript digit one,
+ U+00B9 ISOnum -->
+<!ENTITY ordm "º"> <!-- masculine ordinal indicator,
+ U+00BA ISOnum -->
+<!ENTITY raquo "»"> <!-- right-pointing double angle quotation mark
+ = right pointing guillemet, U+00BB ISOnum -->
+<!ENTITY frac14 "¼"> <!-- vulgar fraction one quarter
+ = fraction one quarter, U+00BC ISOnum -->
+<!ENTITY frac12 "½"> <!-- vulgar fraction one half
+ = fraction one half, U+00BD ISOnum -->
+<!ENTITY frac34 "¾"> <!-- vulgar fraction three quarters
+ = fraction three quarters, U+00BE ISOnum -->
+<!ENTITY iquest "¿"> <!-- inverted question mark
+ = turned question mark, U+00BF ISOnum -->
+<!ENTITY Agrave "À"> <!-- latin capital letter A with grave
+ = latin capital letter A grave,
+ U+00C0 ISOlat1 -->
+<!ENTITY Aacute "Á"> <!-- latin capital letter A with acute,
+ U+00C1 ISOlat1 -->
+<!ENTITY Acirc "Â"> <!-- latin capital letter A with circumflex,
+ U+00C2 ISOlat1 -->
+<!ENTITY Atilde "Ã"> <!-- latin capital letter A with tilde,
+ U+00C3 ISOlat1 -->
+<!ENTITY Auml "Ä"> <!-- latin capital letter A with diaeresis,
+ U+00C4 ISOlat1 -->
+<!ENTITY Aring "Å"> <!-- latin capital letter A with ring above
+ = latin capital letter A ring,
+ U+00C5 ISOlat1 -->
+<!ENTITY AElig "Æ"> <!-- latin capital letter AE
+ = latin capital ligature AE,
+ U+00C6 ISOlat1 -->
+<!ENTITY Ccedil "Ç"> <!-- latin capital letter C with cedilla,
+ U+00C7 ISOlat1 -->
+<!ENTITY Egrave "È"> <!-- latin capital letter E with grave,
+ U+00C8 ISOlat1 -->
+<!ENTITY Eacute "É"> <!-- latin capital letter E with acute,
+ U+00C9 ISOlat1 -->
+<!ENTITY Ecirc "Ê"> <!-- latin capital letter E with circumflex,
+ U+00CA ISOlat1 -->
+<!ENTITY Euml "Ë"> <!-- latin capital letter E with diaeresis,
+ U+00CB ISOlat1 -->
+<!ENTITY Igrave "Ì"> <!-- latin capital letter I with grave,
+ U+00CC ISOlat1 -->
+<!ENTITY Iacute "Í"> <!-- latin capital letter I with acute,
+ U+00CD ISOlat1 -->
+<!ENTITY Icirc "Î"> <!-- latin capital letter I with circumflex,
+ U+00CE ISOlat1 -->
+<!ENTITY Iuml "Ï"> <!-- latin capital letter I with diaeresis,
+ U+00CF ISOlat1 -->
+<!ENTITY ETH "Ð"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
+<!ENTITY Ntilde "Ñ"> <!-- latin capital letter N with tilde,
+ U+00D1 ISOlat1 -->
+<!ENTITY Ograve "Ò"> <!-- latin capital letter O with grave,
+ U+00D2 ISOlat1 -->
+<!ENTITY Oacute "Ó"> <!-- latin capital letter O with acute,
+ U+00D3 ISOlat1 -->
+<!ENTITY Ocirc "Ô"> <!-- latin capital letter O with circumflex,
+ U+00D4 ISOlat1 -->
+<!ENTITY Otilde "Õ"> <!-- latin capital letter O with tilde,
+ U+00D5 ISOlat1 -->
+<!ENTITY Ouml "Ö"> <!-- latin capital letter O with diaeresis,
+ U+00D6 ISOlat1 -->
+<!ENTITY times "×"> <!-- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY Oslash "Ø"> <!-- latin capital letter O with stroke
+ = latin capital letter O slash,
+ U+00D8 ISOlat1 -->
+<!ENTITY Ugrave "Ù"> <!-- latin capital letter U with grave,
+ U+00D9 ISOlat1 -->
+<!ENTITY Uacute "Ú"> <!-- latin capital letter U with acute,
+ U+00DA ISOlat1 -->
+<!ENTITY Ucirc "Û"> <!-- latin capital letter U with circumflex,
+ U+00DB ISOlat1 -->
+<!ENTITY Uuml "Ü"> <!-- latin capital letter U with diaeresis,
+ U+00DC ISOlat1 -->
+<!ENTITY Yacute "Ý"> <!-- latin capital letter Y with acute,
+ U+00DD ISOlat1 -->
+<!ENTITY THORN "Þ"> <!-- latin capital letter THORN,
+ U+00DE ISOlat1 -->
+<!ENTITY szlig "ß"> <!-- latin small letter sharp s = ess-zed,
+ U+00DF ISOlat1 -->
+<!ENTITY agrave "à"> <!-- latin small letter a with grave
+ = latin small letter a grave,
+ U+00E0 ISOlat1 -->
+<!ENTITY aacute "á"> <!-- latin small letter a with acute,
+ U+00E1 ISOlat1 -->
+<!ENTITY acirc "â"> <!-- latin small letter a with circumflex,
+ U+00E2 ISOlat1 -->
+<!ENTITY atilde "ã"> <!-- latin small letter a with tilde,
+ U+00E3 ISOlat1 -->
+<!ENTITY auml "ä"> <!-- latin small letter a with diaeresis,
+ U+00E4 ISOlat1 -->
+<!ENTITY aring "å"> <!-- latin small letter a with ring above
+ = latin small letter a ring,
+ U+00E5 ISOlat1 -->
+<!ENTITY aelig "æ"> <!-- latin small letter ae
+ = latin small ligature ae, U+00E6 ISOlat1 -->
+<!ENTITY ccedil "ç"> <!-- latin small letter c with cedilla,
+ U+00E7 ISOlat1 -->
+<!ENTITY egrave "è"> <!-- latin small letter e with grave,
+ U+00E8 ISOlat1 -->
+<!ENTITY eacute "é"> <!-- latin small letter e with acute,
+ U+00E9 ISOlat1 -->
+<!ENTITY ecirc "ê"> <!-- latin small letter e with circumflex,
+ U+00EA ISOlat1 -->
+<!ENTITY euml "ë"> <!-- latin small letter e with diaeresis,
+ U+00EB ISOlat1 -->
+<!ENTITY igrave "ì"> <!-- latin small letter i with grave,
+ U+00EC ISOlat1 -->
+<!ENTITY iacute "í"> <!-- latin small letter i with acute,
+ U+00ED ISOlat1 -->
+<!ENTITY icirc "î"> <!-- latin small letter i with circumflex,
+ U+00EE ISOlat1 -->
+<!ENTITY iuml "ï"> <!-- latin small letter i with diaeresis,
+ U+00EF ISOlat1 -->
+<!ENTITY eth "ð"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
+<!ENTITY ntilde "ñ"> <!-- latin small letter n with tilde,
+ U+00F1 ISOlat1 -->
+<!ENTITY ograve "ò"> <!-- latin small letter o with grave,
+ U+00F2 ISOlat1 -->
+<!ENTITY oacute "ó"> <!-- latin small letter o with acute,
+ U+00F3 ISOlat1 -->
+<!ENTITY ocirc "ô"> <!-- latin small letter o with circumflex,
+ U+00F4 ISOlat1 -->
+<!ENTITY otilde "õ"> <!-- latin small letter o with tilde,
+ U+00F5 ISOlat1 -->
+<!ENTITY ouml "ö"> <!-- latin small letter o with diaeresis,
+ U+00F6 ISOlat1 -->
+<!ENTITY divide "÷"> <!-- division sign, U+00F7 ISOnum -->
+<!ENTITY oslash "ø"> <!-- latin small letter o with stroke,
+ = latin small letter o slash,
+ U+00F8 ISOlat1 -->
+<!ENTITY ugrave "ù"> <!-- latin small letter u with grave,
+ U+00F9 ISOlat1 -->
+<!ENTITY uacute "ú"> <!-- latin small letter u with acute,
+ U+00FA ISOlat1 -->
+<!ENTITY ucirc "û"> <!-- latin small letter u with circumflex,
+ U+00FB ISOlat1 -->
+<!ENTITY uuml "ü"> <!-- latin small letter u with diaeresis,
+ U+00FC ISOlat1 -->
+<!ENTITY yacute "ý"> <!-- latin small letter y with acute,
+ U+00FD ISOlat1 -->
+<!ENTITY thorn "þ"> <!-- latin small letter thorn,
+ U+00FE ISOlat1 -->
+<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis,
+ U+00FF ISOlat1 -->
\ No newline at end of file
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent
new file mode 100644
index 000000000..321cc457e
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-special.ent
@@ -0,0 +1,80 @@
+<!-- Special characters for XHTML -->
+
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
+ %HTMLspecial;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+ New names (i.e., not in ISO 8879 list) do not clash with any
+ existing ISO 8879 entity names. ISO 10646 character numbers
+ are given for each character, in hex. values are decimal
+ conversions of the ISO 10646 values and refer to the document
+ character set. Names are Unicode names.
+-->
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot """> <!-- quotation mark, U+0022 ISOnum -->
+<!ENTITY amp "&#38;"> <!-- ampersand, U+0026 ISOnum -->
+<!ENTITY lt "&#60;"> <!-- less-than sign, U+003C ISOnum -->
+<!ENTITY gt ">"> <!-- greater-than sign, U+003E ISOnum -->
+<!ENTITY apos "'"> <!-- apostrophe = APL quote, U+0027 ISOnum -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig "Œ"> <!-- latin capital ligature OE,
+ U+0152 ISOlat2 -->
+<!ENTITY oelig "œ"> <!-- latin small ligature oe, U+0153 ISOlat2 -->
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron "Š"> <!-- latin capital letter S with caron,
+ U+0160 ISOlat2 -->
+<!ENTITY scaron "š"> <!-- latin small letter s with caron,
+ U+0161 ISOlat2 -->
+<!ENTITY Yuml "Ÿ"> <!-- latin capital letter Y with diaeresis,
+ U+0178 ISOlat2 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ "ˆ"> <!-- modifier letter circumflex accent,
+ U+02C6 ISOpub -->
+<!ENTITY tilde "˜"> <!-- small tilde, U+02DC ISOdia -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp " "> <!-- en space, U+2002 ISOpub -->
+<!ENTITY emsp " "> <!-- em space, U+2003 ISOpub -->
+<!ENTITY thinsp " "> <!-- thin space, U+2009 ISOpub -->
+<!ENTITY zwnj "‌"> <!-- zero width non-joiner,
+ U+200C NEW RFC 2070 -->
+<!ENTITY zwj "‍"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
+<!ENTITY lrm "‎"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
+<!ENTITY rlm "‏"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
+<!ENTITY ndash "–"> <!-- en dash, U+2013 ISOpub -->
+<!ENTITY mdash "—"> <!-- em dash, U+2014 ISOpub -->
+<!ENTITY lsquo "‘"> <!-- left single quotation mark,
+ U+2018 ISOnum -->
+<!ENTITY rsquo "’"> <!-- right single quotation mark,
+ U+2019 ISOnum -->
+<!ENTITY sbquo "‚"> <!-- single low-9 quotation mark, U+201A NEW -->
+<!ENTITY ldquo "“"> <!-- left double quotation mark,
+ U+201C ISOnum -->
+<!ENTITY rdquo "”"> <!-- right double quotation mark,
+ U+201D ISOnum -->
+<!ENTITY bdquo "„"> <!-- double low-9 quotation mark, U+201E NEW -->
+<!ENTITY dagger "†"> <!-- dagger, U+2020 ISOpub -->
+<!ENTITY Dagger "‡"> <!-- double dagger, U+2021 ISOpub -->
+<!ENTITY permil "‰"> <!-- per mille sign, U+2030 ISOtech -->
+<!ENTITY lsaquo "‹"> <!-- single left-pointing angle quotation mark,
+ U+2039 ISO proposed -->
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo "›"> <!-- single right-pointing angle quotation mark,
+ U+203A ISO proposed -->
+<!-- rsaquo is proposed but not yet ISO standardized -->
+
+<!-- Currency Symbols -->
+<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
\ No newline at end of file
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent
new file mode 100644
index 000000000..7e91b771d
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml-symbol.ent
@@ -0,0 +1,237 @@
+<!-- Mathematical, Greek and Symbolic characters for XHTML -->
+
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
+ %HTMLsymbol;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+ New names (i.e., not in ISO 8879 list) do not clash with any
+ existing ISO 8879 entity names. ISO 10646 character numbers
+ are given for each character, in hex. values are decimal
+ conversions of the ISO 10646 values and refer to the document
+ character set. Names are Unicode names.
+-->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof "ƒ"> <!-- latin small letter f with hook = function
+ = florin, U+0192 ISOtech -->
+
+<!-- Greek -->
+<!ENTITY Alpha "Α"> <!-- greek capital letter alpha, U+0391 -->
+<!ENTITY Beta "Β"> <!-- greek capital letter beta, U+0392 -->
+<!ENTITY Gamma "Γ"> <!-- greek capital letter gamma,
+ U+0393 ISOgrk3 -->
+<!ENTITY Delta "Δ"> <!-- greek capital letter delta,
+ U+0394 ISOgrk3 -->
+<!ENTITY Epsilon "Ε"> <!-- greek capital letter epsilon, U+0395 -->
+<!ENTITY Zeta "Ζ"> <!-- greek capital letter zeta, U+0396 -->
+<!ENTITY Eta "Η"> <!-- greek capital letter eta, U+0397 -->
+<!ENTITY Theta "Θ"> <!-- greek capital letter theta,
+ U+0398 ISOgrk3 -->
+<!ENTITY Iota "Ι"> <!-- greek capital letter iota, U+0399 -->
+<!ENTITY Kappa "Κ"> <!-- greek capital letter kappa, U+039A -->
+<!ENTITY Lambda "Λ"> <!-- greek capital letter lamda,
+ U+039B ISOgrk3 -->
+<!ENTITY Mu "Μ"> <!-- greek capital letter mu, U+039C -->
+<!ENTITY Nu "Ν"> <!-- greek capital letter nu, U+039D -->
+<!ENTITY Xi "Ξ"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
+<!ENTITY Omicron "Ο"> <!-- greek capital letter omicron, U+039F -->
+<!ENTITY Pi "Π"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
+<!ENTITY Rho "Ρ"> <!-- greek capital letter rho, U+03A1 -->
+<!-- there is no Sigmaf, and no U+03A2 character either -->
+<!ENTITY Sigma "Σ"> <!-- greek capital letter sigma,
+ U+03A3 ISOgrk3 -->
+<!ENTITY Tau "Τ"> <!-- greek capital letter tau, U+03A4 -->
+<!ENTITY Upsilon "Υ"> <!-- greek capital letter upsilon,
+ U+03A5 ISOgrk3 -->
+<!ENTITY Phi "Φ"> <!-- greek capital letter phi,
+ U+03A6 ISOgrk3 -->
+<!ENTITY Chi "Χ"> <!-- greek capital letter chi, U+03A7 -->
+<!ENTITY Psi "Ψ"> <!-- greek capital letter psi,
+ U+03A8 ISOgrk3 -->
+<!ENTITY Omega "Ω"> <!-- greek capital letter omega,
+ U+03A9 ISOgrk3 -->
+
+<!ENTITY alpha "α"> <!-- greek small letter alpha,
+ U+03B1 ISOgrk3 -->
+<!ENTITY beta "β"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
+<!ENTITY gamma "γ"> <!-- greek small letter gamma,
+ U+03B3 ISOgrk3 -->
+<!ENTITY delta "δ"> <!-- greek small letter delta,
+ U+03B4 ISOgrk3 -->
+<!ENTITY epsilon "ε"> <!-- greek small letter epsilon,
+ U+03B5 ISOgrk3 -->
+<!ENTITY zeta "ζ"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
+<!ENTITY eta "η"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
+<!ENTITY theta "θ"> <!-- greek small letter theta,
+ U+03B8 ISOgrk3 -->
+<!ENTITY iota "ι"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
+<!ENTITY kappa "κ"> <!-- greek small letter kappa,
+ U+03BA ISOgrk3 -->
+<!ENTITY lambda "λ"> <!-- greek small letter lamda,
+ U+03BB ISOgrk3 -->
+<!ENTITY mu "μ"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
+<!ENTITY nu "ν"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
+<!ENTITY xi "ξ"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
+<!ENTITY omicron "ο"> <!-- greek small letter omicron, U+03BF NEW -->
+<!ENTITY pi "π"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
+<!ENTITY rho "ρ"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
+<!ENTITY sigmaf "ς"> <!-- greek small letter final sigma,
+ U+03C2 ISOgrk3 -->
+<!ENTITY sigma "σ"> <!-- greek small letter sigma,
+ U+03C3 ISOgrk3 -->
+<!ENTITY tau "τ"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
+<!ENTITY upsilon "υ"> <!-- greek small letter upsilon,
+ U+03C5 ISOgrk3 -->
+<!ENTITY phi "φ"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
+<!ENTITY chi "χ"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
+<!ENTITY psi "ψ"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
+<!ENTITY omega "ω"> <!-- greek small letter omega,
+ U+03C9 ISOgrk3 -->
+<!ENTITY thetasym "ϑ"> <!-- greek theta symbol,
+ U+03D1 NEW -->
+<!ENTITY upsih "ϒ"> <!-- greek upsilon with hook symbol,
+ U+03D2 NEW -->
+<!ENTITY piv "ϖ"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
+
+<!-- General Punctuation -->
+<!ENTITY bull "•"> <!-- bullet = black small circle,
+ U+2022 ISOpub -->
+<!-- bullet is NOT the same as bullet operator, U+2219 -->
+<!ENTITY hellip "…"> <!-- horizontal ellipsis = three dot leader,
+ U+2026 ISOpub -->
+<!ENTITY prime "′"> <!-- prime = minutes = feet, U+2032 ISOtech -->
+<!ENTITY Prime "″"> <!-- double prime = seconds = inches,
+ U+2033 ISOtech -->
+<!ENTITY oline "‾"> <!-- overline = spacing overscore,
+ U+203E NEW -->
+<!ENTITY frasl "⁄"> <!-- fraction slash, U+2044 NEW -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp "℘"> <!-- script capital P = power set
+ = Weierstrass p, U+2118 ISOamso -->
+<!ENTITY image "ℑ"> <!-- black-letter capital I = imaginary part,
+ U+2111 ISOamso -->
+<!ENTITY real "ℜ"> <!-- black-letter capital R = real part symbol,
+ U+211C ISOamso -->
+<!ENTITY trade "™"> <!-- trade mark sign, U+2122 ISOnum -->
+<!ENTITY alefsym "ℵ"> <!-- alef symbol = first transfinite cardinal,
+ U+2135 NEW -->
+<!-- alef symbol is NOT the same as hebrew letter alef,
+ U+05D0 although the same glyph could be used to depict both characters -->
+
+<!-- Arrows -->
+<!ENTITY larr "←"> <!-- leftwards arrow, U+2190 ISOnum -->
+<!ENTITY uarr "↑"> <!-- upwards arrow, U+2191 ISOnum-->
+<!ENTITY rarr "→"> <!-- rightwards arrow, U+2192 ISOnum -->
+<!ENTITY darr "↓"> <!-- downwards arrow, U+2193 ISOnum -->
+<!ENTITY harr "↔"> <!-- left right arrow, U+2194 ISOamsa -->
+<!ENTITY crarr "↵"> <!-- downwards arrow with corner leftwards
+ = carriage return, U+21B5 NEW -->
+<!ENTITY lArr "⇐"> <!-- leftwards double arrow, U+21D0 ISOtech -->
+<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
+ but also does not have any other character for that function. So lArr can
+ be used for 'is implied by' as ISOtech suggests -->
+<!ENTITY uArr "⇑"> <!-- upwards double arrow, U+21D1 ISOamsa -->
+<!ENTITY rArr "⇒"> <!-- rightwards double arrow,
+ U+21D2 ISOtech -->
+<!-- Unicode does not say this is the 'implies' character but does not have
+ another character with this function so rArr can be used for 'implies'
+ as ISOtech suggests -->
+<!ENTITY dArr "⇓"> <!-- downwards double arrow, U+21D3 ISOamsa -->
+<!ENTITY hArr "⇔"> <!-- left right double arrow,
+ U+21D4 ISOamsa -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall "∀"> <!-- for all, U+2200 ISOtech -->
+<!ENTITY part "∂"> <!-- partial differential, U+2202 ISOtech -->
+<!ENTITY exist "∃"> <!-- there exists, U+2203 ISOtech -->
+<!ENTITY empty "∅"> <!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY nabla "∇"> <!-- nabla = backward difference,
+ U+2207 ISOtech -->
+<!ENTITY isin "∈"> <!-- element of, U+2208 ISOtech -->
+<!ENTITY notin "∉"> <!-- not an element of, U+2209 ISOtech -->
+<!ENTITY ni "∋"> <!-- contains as member, U+220B ISOtech -->
+<!ENTITY prod "∏"> <!-- n-ary product = product sign,
+ U+220F ISOamsb -->
+<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
+ the same glyph might be used for both -->
+<!ENTITY sum "∑"> <!-- n-ary summation, U+2211 ISOamsb -->
+<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+ though the same glyph might be used for both -->
+<!ENTITY minus "−"> <!-- minus sign, U+2212 ISOtech -->
+<!ENTITY lowast "∗"> <!-- asterisk operator, U+2217 ISOtech -->
+<!ENTITY radic "√"> <!-- square root = radical sign,
+ U+221A ISOtech -->
+<!ENTITY prop "∝"> <!-- proportional to, U+221D ISOtech -->
+<!ENTITY infin "∞"> <!-- infinity, U+221E ISOtech -->
+<!ENTITY ang "∠"> <!-- angle, U+2220 ISOamso -->
+<!ENTITY and "∧"> <!-- logical and = wedge, U+2227 ISOtech -->
+<!ENTITY or "∨"> <!-- logical or = vee, U+2228 ISOtech -->
+<!ENTITY cap "∩"> <!-- intersection = cap, U+2229 ISOtech -->
+<!ENTITY cup "∪"> <!-- union = cup, U+222A ISOtech -->
+<!ENTITY int "∫"> <!-- integral, U+222B ISOtech -->
+<!ENTITY there4 "∴"> <!-- therefore, U+2234 ISOtech -->
+<!ENTITY sim "∼"> <!-- tilde operator = varies with = similar to,
+ U+223C ISOtech -->
+<!-- tilde operator is NOT the same character as the tilde, U+007E,
+ although the same glyph might be used to represent both -->
+<!ENTITY cong "≅"> <!-- approximately equal to, U+2245 ISOtech -->
+<!ENTITY asymp "≈"> <!-- almost equal to = asymptotic to,
+ U+2248 ISOamsr -->
+<!ENTITY ne "≠"> <!-- not equal to, U+2260 ISOtech -->
+<!ENTITY equiv "≡"> <!-- identical to, U+2261 ISOtech -->
+<!ENTITY le "≤"> <!-- less-than or equal to, U+2264 ISOtech -->
+<!ENTITY ge "≥"> <!-- greater-than or equal to,
+ U+2265 ISOtech -->
+<!ENTITY sub "⊂"> <!-- subset of, U+2282 ISOtech -->
+<!ENTITY sup "⊃"> <!-- superset of, U+2283 ISOtech -->
+<!ENTITY nsub "⊄"> <!-- not a subset of, U+2284 ISOamsn -->
+<!ENTITY sube "⊆"> <!-- subset of or equal to, U+2286 ISOtech -->
+<!ENTITY supe "⊇"> <!-- superset of or equal to,
+ U+2287 ISOtech -->
+<!ENTITY oplus "⊕"> <!-- circled plus = direct sum,
+ U+2295 ISOamsb -->
+<!ENTITY otimes "⊗"> <!-- circled times = vector product,
+ U+2297 ISOamsb -->
+<!ENTITY perp "⊥"> <!-- up tack = orthogonal to = perpendicular,
+ U+22A5 ISOtech -->
+<!ENTITY sdot "⋅"> <!-- dot operator, U+22C5 ISOamsb -->
+<!-- dot operator is NOT the same character as U+00B7 middle dot -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil "⌈"> <!-- left ceiling = APL upstile,
+ U+2308 ISOamsc -->
+<!ENTITY rceil "⌉"> <!-- right ceiling, U+2309 ISOamsc -->
+<!ENTITY lfloor "⌊"> <!-- left floor = APL downstile,
+ U+230A ISOamsc -->
+<!ENTITY rfloor "⌋"> <!-- right floor, U+230B ISOamsc -->
+<!ENTITY lang "〈"> <!-- left-pointing angle bracket = bra,
+ U+2329 ISOtech -->
+<!-- lang is NOT the same character as U+003C 'less than sign'
+ or U+2039 'single left-pointing angle quotation mark' -->
+<!ENTITY rang "〉"> <!-- right-pointing angle bracket = ket,
+ U+232A ISOtech -->
+<!-- rang is NOT the same character as U+003E 'greater than sign'
+ or U+203A 'single right-pointing angle quotation mark' -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz "◊"> <!-- lozenge, U+25CA ISOpub -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades "♠"> <!-- black spade suit, U+2660 ISOpub -->
+<!-- black here seems to mean filled as opposed to hollow -->
+<!ENTITY clubs "♣"> <!-- black club suit = shamrock,
+ U+2663 ISOpub -->
+<!ENTITY hearts "♥"> <!-- black heart suit = valentine,
+ U+2665 ISOpub -->
+<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
\ No newline at end of file
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd
new file mode 100644
index 000000000..229617d04
--- /dev/null
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd
@@ -0,0 +1,1025 @@
+<!--
+
+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:
+
+- File content extracted from https://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-strict.dtd
+- Added license information from https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+-->
+<!--
+ Extensible HTML version 1.0 Strict DTD
+
+ This is the same as HTML 4 Strict except for
+ changes due to the differences between XML and SGML.
+
+ Namespace = http://www.w3.org/1999/xhtml
+
+ For further information, see: http://www.w3.org/TR/xhtml1
+
+ Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+ All Rights Reserved.
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+
+ $Revision: 1.1 $
+ $Date: 2002/08/01 13:56:03 $
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+ <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+ <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+ <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+ <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+ <!-- a language code, as per [RFC3066] -->
+
+<!ENTITY % Character "CDATA">
+ <!-- a single character, as per section 2.2 of [XML] -->
+
+<!ENTITY % Number "CDATA">
+ <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+ <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+ <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+ <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+ <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+ <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+ <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+ <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+ <!-- used for titles etc. -->
+
+<!ENTITY % Length "CDATA">
+ <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+ <!-- pixel, percentage, or relative -->
+
+<!ENTITY % Pixels "CDATA">
+ <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+ <!-- comma separated list of lengths -->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+ id document-wide unique id
+ class space separated list of classes
+ style associated style info
+ title advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id ID #IMPLIED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED"
+ >
+
+<!-- internationalization attributes
+ lang language code (backwards compatible)
+ xml:lang language code (as per XML 1.0 spec)
+ dir direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #IMPLIED"
+ >
+
+<!-- attributes for common UI events
+ onclick a pointer button was clicked
+ ondblclick a pointer button was double clicked
+ onmousedown a pointer button was pressed down
+ onmouseup a pointer button was released
+ onmousemove a pointer was moved onto the element
+ onmouseout a pointer was moved away from the element
+ onkeypress a key was pressed and released
+ onkeydown a key was pressed down
+ onkeyup a key was released
+-->
+<!ENTITY % events
+ "onclick %Script; #IMPLIED
+ ondblclick %Script; #IMPLIED
+ onmousedown %Script; #IMPLIED
+ onmouseup %Script; #IMPLIED
+ onmouseover %Script; #IMPLIED
+ onmousemove %Script; #IMPLIED
+ onmouseout %Script; #IMPLIED
+ onkeypress %Script; #IMPLIED
+ onkeydown %Script; #IMPLIED
+ onkeyup %Script; #IMPLIED"
+ >
+
+<!-- attributes for elements that can get the focus
+ accesskey accessibility key character
+ tabindex position in tabbing order
+ onfocus the element got the focus
+ onblur the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey %Character; #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED"
+ >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special.pre
+ "br | span | bdo | map">
+
+
+<!ENTITY % special
+ "%special.pre; | object | img ">
+
+<!ENTITY % fontstyle "tt | i | b | big | small ">
+
+<!ENTITY % phrase "em | strong | dfn | code | q |
+ samp | kbd | var | cite | abbr | acronym | sub | sup ">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc.inline "ins | del | script">
+
+<!-- these can only occur at block level -->
+<!ENTITY % misc "noscript | %misc.inline;">
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl">
+<!ENTITY % blocktext "pre | hr | blockquote | address">
+
+<!ENTITY % block
+ "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
+
+<!ENTITY % Block "(%block; | form | %misc;)*">
+
+<!-- %Flow; mixes block and inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+ "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
+
+<!-- pre uses %Inline excluding big, small, sup or sup -->
+
+<!ENTITY % pre.content
+ "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline;
+ | %inline.forms;)*">
+
+<!-- form uses %Block; excluding form -->
+
+<!ENTITY % form.content "(%block; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form and form controls -->
+
+<!ENTITY % button.content
+ "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+ table | %special; | %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html
+ %i18n;
+ id ID #IMPLIED
+ xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml'
+ >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object)*">
+
+<!-- content model is %head.misc; combined with a single
+ title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+ ((title, %head.misc;, (base, %head.misc;)?) |
+ (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+ %i18n;
+ id ID #IMPLIED
+ profile %URI; #IMPLIED
+ >
+
+<!-- The title element is not considered part of the flow of text.
+ It should be displayed, for example as the page header or
+ window title. Exactly one title is required per document.
+ -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title
+ %i18n;
+ id ID #IMPLIED
+ >
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+ href %URI; #REQUIRED
+ id ID #IMPLIED
+ >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+ %i18n;
+ id ID #IMPLIED
+ http-equiv CDATA #IMPLIED
+ name CDATA #IMPLIED
+ content CDATA #REQUIRED
+ scheme CDATA #IMPLIED
+ >
+
+<!--
+ Relationship values can be used in principle:
+
+ a) for document specific toolbars/menus when used
+ with the link element in document head e.g.
+ start, contents, previous, next, index, end, help
+ b) to link to a separate style sheet (rel="stylesheet")
+ c) to make a link to a script (rel="script")
+ d) by stylesheets to control how collections of
+ html nodes are rendered into printed documents
+ e) to make a link to a printable version of this document
+ e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+ %attrs;
+ charset %Charset; #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ type %ContentType; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ media %MediaDesc; #IMPLIED
+ >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+ %i18n;
+ id ID #IMPLIED
+ type %ContentType; #REQUIRED
+ media %MediaDesc; #IMPLIED
+ title %Text; #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+ id ID #IMPLIED
+ charset %Charset; #IMPLIED
+ type %ContentType; #REQUIRED
+ src %URI; #IMPLIED
+ defer (defer) #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Block;>
+<!ATTLIST noscript
+ %attrs;
+ >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Block;>
+<!ATTLIST body
+ %attrs;
+ onload %Script; #IMPLIED
+ onunload %Script; #IMPLIED
+ >
+
+<!ELEMENT div %Flow;> <!-- generic language/style container -->
+<!ATTLIST div
+ %attrs;
+ >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+ %attrs;
+ >
+
+<!--=================== Headings =========================================-->
+
+<!--
+ There are six levels of headings from h1 (the most important)
+ to h6 (the least important).
+-->
+
+<!ELEMENT h1 %Inline;>
+<!ATTLIST h1
+ %attrs;
+ >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+ %attrs;
+ >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+ %attrs;
+ >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+ %attrs;
+ >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+ %attrs;
+ >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+ %attrs;
+ >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+ %attrs;
+ >
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+ %attrs;
+ >
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+ %attrs;
+ >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+ %attrs;
+ >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+ %attrs;
+ >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+ %attrs;
+ >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address %Inline;>
+<!ATTLIST address
+ %attrs;
+ >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+ %attrs;
+ >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+ %attrs;
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Block;>
+<!ATTLIST blockquote
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+<!--
+ ins/del are allowed in block and inline content, but its
+ inappropriate to include block content within an ins element
+ occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+ %attrs;
+ %focus;
+ charset %Charset; #IMPLIED
+ type %ContentType; #IMPLIED
+ name NMTOKEN #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+ %attrs;
+ >
+
+<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+ %coreattrs;
+ %events;
+ lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #REQUIRED
+ >
+
+<!ELEMENT br EMPTY> <!-- forced line break -->
+<!ATTLIST br
+ %coreattrs;
+ >
+
+<!ELEMENT em %Inline;> <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;> <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;> <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;> <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;> <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;> <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;> <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;> <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;> <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;> <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;> <!-- inlined quote -->
+<!ATTLIST q
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;> <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;> <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;> <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;> <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;> <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!--==================== Object ======================================-->
+<!--
+ object is used to embed objects as part of HTML pages.
+ param elements should precede other content. Parameters
+ can also be expressed as attribute/value pairs on the
+ object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST object
+ %attrs;
+ declare (declare) #IMPLIED
+ classid %URI; #IMPLIED
+ codebase %URI; #IMPLIED
+ data %URI; #IMPLIED
+ type %ContentType; #IMPLIED
+ codetype %ContentType; #IMPLIED
+ archive %UriList; #IMPLIED
+ standby %Text; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ name NMTOKEN #IMPLIED
+ tabindex %Number; #IMPLIED
+ >
+
+<!--
+ param is used to supply a named property value.
+ In XML it would seem natural to follow RDF and support an
+ abbreviated syntax where the param elements are replaced
+ by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ id ID #IMPLIED
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ valuetype (data|ref|object) "data"
+ type %ContentType; #IMPLIED
+ >
+
+<!--=================== Images ===========================================-->
+
+<!--
+ To avoid accessibility problems for people who aren't
+ able to see the image, you should provide a text
+ description using the alt and longdesc attributes.
+ In addition, avoid the use of server-side image maps.
+ Note that in this DTD there is no name attribute. That
+ is only available in the transitional and frameset DTD.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+ %attrs;
+ src %URI; #REQUIRED
+ alt %Text; #REQUIRED
+ longdesc %URI; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ ismap (ismap) #IMPLIED
+ >
+
+<!-- usemap points to a map element which may be in this document
+ or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+ separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+ %i18n;
+ %events;
+ id ID #REQUIRED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED
+ name NMTOKEN #IMPLIED
+ >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+ %attrs;
+ %focus;
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ href %URI; #IMPLIED
+ nohref (nohref) #IMPLIED
+ alt %Text; #REQUIRED
+ >
+
+<!--================ Forms ===============================================-->
+<!ELEMENT form %form.content;> <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+ %attrs;
+ action %URI; #REQUIRED
+ method (get|post) "get"
+ enctype %ContentType; "application/x-www-form-urlencoded"
+ onsubmit %Script; #IMPLIED
+ onreset %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ accept-charset %Charsets; #IMPLIED
+ >
+
+<!--
+ Each label must not contain more than ONE field
+ Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+ %attrs;
+ for IDREF #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ >
+
+<!ENTITY % InputType
+ "(text | password | checkbox |
+ radio | submit | reset |
+ file | hidden | image | button)"
+ >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY> <!-- form control -->
+<!ATTLIST input
+ %attrs;
+ %focus;
+ type %InputType; "text"
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ checked (checked) #IMPLIED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ size CDATA #IMPLIED
+ maxlength %Number; #IMPLIED
+ src %URI; #IMPLIED
+ alt CDATA #IMPLIED
+ usemap %URI; #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ >
+
+<!ELEMENT select (optgroup|option)+> <!-- option selector -->
+<!ATTLIST select
+ %attrs;
+ name CDATA #IMPLIED
+ size %Number; #IMPLIED
+ multiple (multiple) #IMPLIED
+ disabled (disabled) #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!ELEMENT optgroup (option)+> <!-- option group -->
+<!ATTLIST optgroup
+ %attrs;
+ disabled (disabled) #IMPLIED
+ label %Text; #REQUIRED
+ >
+
+<!ELEMENT option (#PCDATA)> <!-- selectable choice -->
+<!ATTLIST option
+ %attrs;
+ selected (selected) #IMPLIED
+ disabled (disabled) #IMPLIED
+ label %Text; #IMPLIED
+ value CDATA #IMPLIED
+ >
+
+<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field -->
+<!ATTLIST textarea
+ %attrs;
+ %focus;
+ name CDATA #IMPLIED
+ rows %Number; #REQUIRED
+ cols %Number; #REQUIRED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!--
+ The fieldset element is used to group form fields.
+ Only one legend element should occur in the content
+ and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+ %attrs;
+ >
+
+<!ELEMENT legend %Inline;> <!-- fieldset label -->
+<!ATTLIST legend
+ %attrs;
+ accesskey %Character; #IMPLIED
+ >
+
+<!--
+ Content is %Flow; excluding a, form and form controls
+-->
+<!ELEMENT button %button.content;> <!-- push button -->
+<!ATTLIST button
+ %attrs;
+ %focus;
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ type (button|submit|reset) "submit"
+ disabled (disabled) #IMPLIED
+ >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+ "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+
+<!-- horizontal alignment attributes for cell contents
+
+ char alignment char, e.g. char=':'
+ charoff offset for alignment char
+-->
+<!ENTITY % cellhalign
+ "align (left|center|right|justify|char) #IMPLIED
+ char %Character; #IMPLIED
+ charoff %Length; #IMPLIED"
+ >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+ "valign (top|middle|bottom|baseline) #IMPLIED"
+ >
+
+<!ELEMENT table
+ (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption %Inline;>
+<!ELEMENT thead (tr)+>
+<!ELEMENT tfoot (tr)+>
+<!ELEMENT tbody (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col EMPTY>
+<!ELEMENT tr (th|td)+>
+<!ELEMENT th %Flow;>
+<!ELEMENT td %Flow;>
+
+<!ATTLIST table
+ %attrs;
+ summary %Text; #IMPLIED
+ width %Length; #IMPLIED
+ border %Pixels; #IMPLIED
+ frame %TFrame; #IMPLIED
+ rules %TRules; #IMPLIED
+ cellspacing %Length; #IMPLIED
+ cellpadding %Length; #IMPLIED
+ >
+
+<!ATTLIST caption
+ %attrs;
+ >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+ width=64 width in screen pixels
+ width=0.5* relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ Use thead to duplicate headers when breaking table
+ across page boundaries, or for static headers when
+ tbody sections are rendered in scrolling panel.
+
+ Use tfoot to duplicate footers when breaking table
+ across page boundaries, or for static footers when
+ tbody sections are rendered in scrolling panel.
+
+ Use multiple tbody sections when rules are needed
+ between groups of table rows.
+-->
+<!ATTLIST thead
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tfoot
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tbody
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tr
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST td
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ >
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index e8d4de9f0..120e4c74e 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2062,6 +2062,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml" /> <!--test data-->
<exclude name="apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-*.txt" /> <!--template file-->
<exclude name="apisupport.installer/src/org/netbeans/modules/apisupport/installer/resources/licenses/**" /> <!--three license files-->
+ <exclude name="apisupport.project/src/org/netbeans/modules/apisupport/project/ui/resources/layer_template.xml" /> <!--template file-->
<exclude name="autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/**" /> <!-- test data -->
<exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template -->
@@ -2070,6 +2071,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data -->
<exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data-->
<exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data-->
+ <exclude name="db.sql.editor/src/org/netbeans/modules/db/sql/editor/resources/SQLExample" /> <!-- file is used as sample for syntax highlighting in GUI -->
+ <exclude name="dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/resources/templates/*" /> <!-- template files -->
<exclude name="editor/demosrc/base/org/netbeans/editor/example/res/template.html_" /> <!-- template file -->
<exclude name="editor/demosrc/base/org/netbeans/editor/example/res/template.java_" /> <!-- template file -->
<exclude name="editor/demosrc/properties-addon/org/netbeans/editor/example/res/template.properties" /> <!-- template file -->
@@ -2120,7 +2123,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="nbbuild/tagref" /> <!--no degree of creativity-->
<exclude name="nbbuild/notice-stub.txt" /> <!--Apache notice file-->
<exclude name="nbbuild/standard-nbm-license.txt" /> <!--license file-->
- <exclude name="nbbuild/testuserdir/**" />
+ <exclude name="nbbuild/testuserdir/**" /> <!-- directory for netbeans testruns, not part of distribution and repository -->
+ <exclude name="nbbuild/user.build.properties" /> <!-- user configuration file, not part of distribution and repository -->
<exclude name="nbi/engine/nbproject/profiler-build-impl.xml" /> <!--generated, no degree of creativity -->
<exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template -->
<exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template -->
@@ -2155,6 +2159,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template" /> <!--template files-->
<exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data-->
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template" /> <!--template files-->
+ <exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b -->
+ <exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/*" /> <!-- generated code -->
+ <exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/*" /> <!-- generated code -->
+ <exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/*" /> <!-- generated code -->
<exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl" /> <!--test data-->
<exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml" /> <!--test data-->
<exclude name="welcome/src/org/netbeans/modules/welcome/resources/rss-0_91.dtd" /> <!-- specifies a standard -->
@@ -2202,10 +2210,15 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
conforming SGML systems and applications as defined in
ISO 8879, provided this notice is included in all copies.
</rat:fullTextMatcher>
+ <rat:fullTextMatcher licenseFamilyCategory="AL" licenseFamilyName="Apache License 2.0 Short header">
+ Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements; and to You under the Apache License, Version 2.0.
+ </rat:fullTextMatcher>
<rat:approvedLicense familyName="W3C Software and Document Notice and License"/>
<rat:approvedLicense familyName="OASIS"/>
<rat:approvedLicense familyName="WSDL Schema Files" />
<rat:approvedLicense familyName="International Organization for Standardization for SGML"/>
+ <rat:approvedLicense familyName="Apache License 2.0 Short header"/>
<fileset dir="${nb_all}">
<patternset refid="non.rat" />
</fileset>
@@ -2222,9 +2235,21 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
All Rights Reserved
License for WSDL Schema Files
</rat:fullTextMatcher>
+ <rat:fullTextMatcher licenseFamilyCategory="ISO-SGML" licenseFamilyName="International Organization for Standardization for SGML">
+ International Organization for Standardization 1986
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+ </rat:fullTextMatcher>
+ <rat:fullTextMatcher licenseFamilyCategory="AL" licenseFamilyName="Apache License 2.0 Short header">
+ Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements; and to You under the Apache License, Version 2.0.
+ </rat:fullTextMatcher>
<rat:approvedLicense familyName="W3C Software and Document Notice and License"/>
<rat:approvedLicense familyName="OASIS"/>
<rat:approvedLicense familyName="WSDL Schema Files" />
+ <rat:approvedLicense familyName="International Organization for Standardization for SGML"/>
+ <rat:approvedLicense familyName="Apache License 2.0 Short header"/>
<fileset dir="${nb_all}">
<patternset refid="non.rat" />
</fileset>
diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
index 435c1cd11..b6035a599 100644
--- a/nbbuild/external/binaries-list
+++ b/nbbuild/external/binaries-list
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
-88CADDFC6785B6B7B7E65C9DC80C03958EBAEE73 nbbuild-xhtml1-dtds-resources.zip
16398550402B27F81CD0D508CEF54B3E47A4A6DA org.apache.rat:apache-rat:0.12
diff --git a/nbbuild/external/nbbuild-xhtml1-dtds-resources-license.txt b/nbbuild/external/nbbuild-xhtml1-dtds-resources-license.txt
deleted file mode 100644
index 77023f095..000000000
--- a/nbbuild/external/nbbuild-xhtml1-dtds-resources-license.txt
+++ /dev/null
@@ -1,280 +0,0 @@
-Name: XHTML
-Version: 1.0
-License: W3C
-Comment: not used during build, just here for DTD validation; see nbbuild/javadoctools/apichanges.dtd and nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd
-Type: compile-time
-
-W3C (R) Intellectual Rights Notice and Legal Disclaimers
-
-This page includes notices and disclaimers related to:
-
- 1. Copyright 2. Notices 3. Trademarks 4. Disclaimers and Liabilities
-
-
-Copyright (C) 1994-2002 W3C (R) (Massachusetts Institute of Technology,
-Institut National de Recherche en Informatique et en Automatique, Keio
-University), All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-World Wide Web Consortium (W3C (R)) web site pages may contain other
-proprietary notices and copyright information, the terms of which must
-be observed and followed. Specific notices do exist for W3C documents
-and software. Also, there are specific usage policies associated with
-some of the W3C Icons. Please see our Intellectual Rights FAQ for common
-questions about using materials from our site.
-
-Notice and Disclaimers
-
-1. Unless otherwise noted, all materials contained in this Site are
-copyrighted and may not be used except as provided in these terms
-and conditions or in the copyright notice (documents and software) or
-other proprietary notice provided with the relevant materials.
-2. The materials contained in the Site may be downloaded or copied
-provided that ALL copies retain the copyright and any other proprietary
-notices contained on the materials. No material may be modified, edited
-or taken out of context such that its use creates a false or misleading
-statement or impression as to the positions, statements or actions of W3C.
-3. The name and trademarks of copyright holders may NOT be
-used in advertising or publicity pertaining to the Web site, its
-content, specifications, or software without specific, written prior
-permission. Title to copyright in Web site documents will at all times
-remain with copyright holders. Use of W3C trademarks and service marks
-is covered by the W3C Trademark and Servicemark License.
-4. Caches of W3C materials should comply with the "maximum time to live"
-information provided with the materials. After such materials have
-expired they should not be served from caches without first validating
-the contents of the W3C Site. Organizations that want to mirror W3C
-content must abide by the W3C Mirroring Policy.
-
-W3C (R)Trademarks and Generic Terms
-
-
-Trademarks owned by W3C host institutions on behalf of W3C and generic
-terms used by the W3C
-
-5. The trademarks, logos, and service marks (collectively the
-"Trademarks") displayed on the Site are registered and unregistered
-Trademarks of the Massachusetts Institute of Technology (MIT), Institut
-National de Recherche en Informatique et en Automatique (INRIA), or Keio
-University (Keio). All use of the W3C Trademarks is governed by the W3C
-Trademark and Servicemark License. No additional rights are granted by
-implication, estoppel, or otherwise. Terms which claimed as generic are
-not governed by any W3C license and are used as common descriptors by
-the W3C. The following is a list of W3C terms claimed as a trademark
-or generic term by MIT, INRIA, and/or Keio on behalf of the W3C:
-
- W3C (R), World Wide Web Consortium (registered in numerous countries)
- AmayaTM, a Web Browser CSSTM, Cascading Style Sheets Specification
- DOMTM, Document Object Model HTML (generic), HyperText Markup
- Language HTTP (generic), Hypertext Transfer Protocol MathMLTM,
- Mathematical Markup Language Metadata (generic) P3PTM, Platform for
- Privacy Preferences Project PICSTM, Platform for Internet Content
- Selection RDF (generic), Resource Description Framework SMILTM,
- Synchronized Multimedia Integration Language SVGTM, Scalable Vector
- Graphics WAITM, Web Accessibility Initiative XENC (generic), XML
- Encryption XHTMLTM, The Extensible HyperText Markup Language XML
- (generic), Extensible Markup Language XSLTM, Extensible Stylesheet
- Language
-
- ACSSTM, Aural Cascading Style Sheets DSigTM, Digital Signature
- Initiative JEPITM, Joint Electronic Payment Initiative JigsawTM
- PICSRulesTM WebFontsTM
-
-The absence of a product or service name or logo from this list does
-not constitute a waiver of MIT's, INRIA's, or Keio's trademark or
-other intellectual rights concerning that name or logo. Any questions
-concerning the use, status, or standing of W3C trademarks should be
-directed to: site-policy@w3.org or to W3C (c/o Joseph Reagle), Laboratory
-for Computer Science NE43-358, Massachusetts Institute of Technology,
-200 Technology Square, Cambridge, MA 02139.
-
-Non-W3C Trademarks; Member Trademarks
-
-The trademarks, logos, and service marks not owned on behalf of the W3C
-and that are displayed on the Site are the registered and unregistered
-marks of their respective owners. No rights are granted by the W3C
-to use such marks, whether by implication, estoppel, or otherwise.
-"METADATA" is a trademark of the Metadata Company. W3C uses the term
-"metadata" in a descriptive sense, meaning "data about data". W3C is
-not in any way affiliated with the Metadata Company.
-
-Legal Disclaimers
-
-6. W3C has not reviewed any or all of the web sites linked to this Site
-and is not responsible for the content of any off-site pages or any other
-web sites linked to this Site. Please understand that any non-W3C web
-site is independent from W3C, and W3C has no control over the content on
-that web site. In addition, a link to a non-W3C web site does not mean
-that W3C endorses or accepts any responsibility for the content, or the
-use, of such site. It is the user's responsibility to take precautions to
-ensure that whatever is selected is free of such items as viruses, worms,
-Trojan horses and other items of a destructive nature.
-7. Information W3C publishes on its Site may contain references or cross
-references to W3C specifications, projects, programs and services that are
-not announced or available in your country. Such references do not imply
-that W3C intends to announce such specifications, projects, programs
-or services in your country.
-8. Information on this Site may contain technical inaccuracies or
-typographical errors. Information may be changed or updated without
-notice. W3C may make improvements and/or changes in the materials
-contained in or described on this site at any time without notice. W3C
-may also make changes in these Terms and Conditions without notice. User
-is bound by such revisions and should therefore periodically visit this
-page to review the then current Terms and Conditions.
-
-9. Limitation on Warranties.
-
-ALL MATERIALS ON THE W3C SITE ARE PROVIDED "AS IS." W3C, MIT, INRIA,
-AND KEIO MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT. AS TO DOCUMENTS
-AND GRAPHICS PUBLISHED ON THIS SITE, W3C, MIT, INRIA, AND KEIO MAKE NO
-REPRESENTATION OR WARRANTY THAT THE CONTENTS OF SUCH DOCUMENT OR GRAPHICS
-ARE FREE FROM ERROR OR SUITABLE FOR ANY PURPOSE; NOR THAT IMPLEMENTATION
-OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-TRADEMARKS OR OTHER RIGHTS. Please note that some jurisdictions may
-not allow the exclusion of implied warranties, so some of the above
-exclusions may not apply to you.
-
-10. Limitation on Liability.
-
-IN NO EVENT WILL W3C, MIT, INRIA, AND KEIO BE LIABLE TO ANY PARTY FOR
-ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES FOR ANY USE OF
-THIS SITE, OR ON ANY OTHER HYPERLINKED WEB SITE, INCLUDING, WITHOUT
-LIMITATION, ANY LOST PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS
-OR OTHER DATA ON YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN
-IF W3C, MIT, INRIA, OR KEIO IS EXPRESSLY ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES. ______________ Please see our Intellectual Rights FAQ
-for common questions about using materials from our site. Questions
-about this notice can be directed to site- policy@w3.org . Created by
-reagle last updated by reagle on $ Date: 1999/07/28 13:54:29 $ Copyright
-(C) 1998-2002 W3C (R) (MIT, INRIA, Keio), All Rights Reserved. W3C
-liability, trademark, document use and software licensing rules apply.
--------------------------------------------------------------------------------
-
-
-W3C (R) DOCUMENT NOTICE AND LICENSE
-
-
-Copyright (C) 1994-2002 World Wide Web Consortium, (Massachusetts
-Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-Public documents on the W3C site are provided by the copyright holders
-under the following license. The software or Document Type Definitions
-(DTDs) associated with W3C specifications are governed by the Software
-Notice. By using and/or copying this document, or the W3C document from
-which this statement is linked, you (the licensee) agree that you have
-read, understood, and will comply with the following terms and conditions:
-Permission to use, copy, and distribute the contents of this document,
-or the W3C document from which this statement is linked, in any medium
-for any purpose and without fee or royalty is hereby granted, provided
-that you include the following on ALL copies of the document, or portions
-thereof, that you use:
-
- 1. A link or URL to the original W3C document. 2. The pre-existing
- copyright notice of the original author, or if it doesn't
- exist, a notice of the form: "Copyright (C) [$date-of-document]
- World Wide Web Consortium, (Massachusetts Institute
- of Technology, Institut National de Recherche en
- Informatique et en Automatique, Keio University). All Rights
- Reserved. http://www.w3.org/Consortium/Legal/" (Hypertext is
- preferred, but a textual representation is permitted.)
- 3. If it exists, the STATUS of the W3C document.
-
-When space permits, inclusion of the full text of this NOTICE should
-be provided. We request that authorship attribution be provided in
-any software, documents, or other items or products that you create
-pursuant to the implementation of the contents of this document, or any
-portion thereof. No right to create modifications or derivatives of W3C
-documents is granted pursuant to this license. However, if additional
-requirements (documented in the Copyright FAQ) are satisfied, the right
-to create modifications or derivatives is sometimes granted by the
-W3C to individuals complying with those requirements. THIS DOCUMENT
-IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
-OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON- INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
-SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS
-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 DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS
-THEREOF. The name and trademarks of copyright holders may NOT be
-used in advertising or publicity pertaining to this document or its
-contents without specific, written prior permission. Title to copyright
-in this document will at all times remain with copyright holders.
-----------------------------------------------------------------------------
-This formulation of W3C's notice and license became active on
-April 05 1999 so as to account for the treatment of DTDs, schema's
-and bindings. See the older formulation for the policy prior to
-this date. Please see our Copyright FAQ for common questions
-about using materials from our site, including specific terms
-and conditions for packages like libwww, Amaya, and Jigsaw. Other
-questions about this notice can be directed to site-policy@w3.org.
--------------------------------------------------------------------------------
-
-
-W3C(R) SOFTWARE NOTICE AND LICENSE
-
-
-Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts
-Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related items) is
-being provided by the copyright holders under the following license. By
-obtaining, using 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 use, copy, modify, and distribute this
-software and its documentation, 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 software and documentation
-or portions thereof, including modifications, that you make:
-
- 1. The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
- 2. Any pre-existing intellectual property disclaimers, notices, or
- terms and conditions. If none exist, a short notice of the
- following form (hypertext is preferred, text is permitted) should
- be used within the body of any redistributed or derivative code:
- "Copyright (c) [$date-of-software] World Wide Web Consortium,
- (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved. http://www.w3.org/Consortium/Legal/"
- 3. Notice of any changes or modifications to the W3C files, including
- the date changes were made. (We recommend you provide URIs to the
- location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION 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 DOCUMENTATION
-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 DOCUMENTATION. The name and trademarks of copyright holders
-may NOT be used in advertising or publicity pertaining to the software
-without specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain with
-copyright holders. ____________________________________ This formulation
-of W3C's notice and license became active on August 14 1998 so as to
-improve compatibility with GPL. This version ensures that W3C software
-licensing terms are no more restrictive than GPL and consequently W3C
-software may be distributed in GPL packages. See the older formulation
-for the policy prior to this date. Please see our Copyright FAQ for
-common questions about using materials from our site, including specific
-terms and conditions for packages like libwww, Amaya, and Jigsaw. Other
-questions about this notice can be directed to site-policy@w3.org.
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index ef60182e2..3590ddb36 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -331,8 +331,17 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
</target>
<target name="-verify-apichanges" if="javadoc.apichanges" depends="basic-init">
- <xmlvalidate file="${javadoc.apichanges}" failonerror="true"/>
+ <xmlcatalog id="xhtmlcatalog" classpath="${nbantext.jar}">
+ <dtd publicId="-//W3C//DTD XHTML 1.0 Strict//EN" location="org/netbeans/nbbuild/xhtml1-strict.dtd" />
+ <dtd publicId="-//W3C//ENTITIES Latin 1 for XHTML//EN" location="org/netbeans/nbbuild/xhtml-lat1.ent" />
+ <dtd publicId="-//W3C//ENTITIES Symbols for XHTML//EN" location="org/netbeans/nbbuild/xhtml-symbol.ent" />
+ <dtd publicId="-//W3C//ENTITIES Special for XHTML//EN" location="org/netbeans/nbbuild/xhtml-special.ent" />
+ </xmlcatalog>
+ <xmlvalidate file="${javadoc.apichanges}" failonerror="true">
+ <xmlcatalog refid="xhtmlcatalog" />
+ </xmlvalidate>
<xslt in="${javadoc.apichanges}" out="${build.dir}/apichanges.html" style="${nb_all}/nbbuild/javadoctools/apichanges.xsl">
+ <xmlcatalog refid="xhtmlcatalog" />
<param name="javadoc-url-base" expression="."/>
</xslt>
<!-- XXX could perhaps validate arch.xml too, if it exists -->
diff --git a/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch b/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch
index 20f283751..ebf75e47c 100644
--- a/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch
+++ b/o.apache.xml.resolver/external/README-xml-resolver-1.2-netbeans.patch
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
The "xml-resolver-1.2-netbeans.patch" was created in 2017 for the donation of NetBeans to the Apache Foundation.
The patch is licensed under the Apache 2.0 License. See [1] for license information.
diff --git a/o.apache.xml.resolver/external/readme.txt b/o.apache.xml.resolver/external/readme.txt
deleted file mode 100644
index 3f716711c..000000000
--- a/o.apache.xml.resolver/external/readme.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Created by: Samaresh Panda
-Last updated: 08-22-2007
-Current Version being used: xml-commons-resolver-1.2
-
-resolver.jar is a third party library being used in Netbeans.
-This came from http://xml.apache.org/commons/ with Apache license 2.0.
-
-Earlier, it was patched on xml-commons-resolver-1.1 to cater to our needs.
-See resolver.patch file for the patches applied xml-commons-resolver-1.1.
-The patch on org.apache.xml.resolver.tools.CatalogResolver.java fixes
-these two issues:
-
-http://www.netbeans.org/issues/show_bug.cgi?id=98212
-http://www.netbeans.org/issues/show_bug.cgi?id=112679
-
-Hence we have applied the following patches on xml-commons-resolver-1.2:
-
-1. Add a new API to org.apache.xml.resolver.Catalog.java:
-
- /**
- * Return all registered public IDs.
- */
- public Iterator getPublicIDs() {
- Vector v = new Vector();
- Enumeration enumeration = catalogEntries.elements();
-
- while (enumeration.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enumeration.nextElement();
- if (e.getEntryType() == PUBLIC) {
- v.add(e.getEntryArg(0));
- }
- }
- return v.iterator();
- }
-
-2. Handle null in org.apache.xml.resolver.CatalogManager.java::readProperties()
- + if (propertyFile == null) return;
-
-Note: 29 Jan 2009 Marek Slama
-
-As we cannot put forked resolver package into debian repository we had to use following workaround.
-
-1. We added new method into org.apache.xml.resolver.Catalog.java as described above. It is compatible
-change.
-
-2. We added 2 new classes org.apache.xml.resolver.NbCatalogManager.java and org.apache.xml.resolver.tools.NbCatalogResolver.java
-into resolver with necessary incompatible changes and all usages of CatalogManager and CatalogResolver in NB codebase
-are replaced by NbCatalogManager and NbCatalogResolver.
diff --git a/o.apache.xml.resolver/external/resolver.patch b/o.apache.xml.resolver/external/resolver.patch
deleted file mode 100644
index f6b2c0d40..000000000
--- a/o.apache.xml.resolver/external/resolver.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: resolver.xml
-===================================================================
-RCS file: /home/cvspublic/xml-commons/java/resolver.xml,v
-retrieving revision 1.12
-diff -u -b -r1.12 resolver.xml
---- resolver.xml 5 Nov 2003 03:02:10 -0000 1.12
-+++ resolver.xml 25 Feb 2005 13:42:14 -0000
-@@ -83,7 +83,7 @@
-
- <echo message="Compiling..." />
-
-- <javac srcdir="${src.dir}" destdir="${build.classes.dir}">
-+ <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" debug="on">
- <!-- <classpath> not needed since Ant already supplies these Sep-03 -sc -->
- <include name="${resolver.subdir}/*.java"/>
- <include name="${resolver.subdir}/helpers/*.java"/>
-Index: src/org/apache/xml/resolver/Catalog.java
-===================================================================
-RCS file: /home/cvspublic/xml-commons/java/src/org/apache/xml/resolver/Catalog.java,v
-retrieving revision 1.7
-diff -u -b -r1.7 Catalog.java
---- src/org/apache/xml/resolver/Catalog.java 2 Sep 2003 07:05:07 -0000 1.7
-+++ src/org/apache/xml/resolver/Catalog.java 25 Feb 2005 13:42:18 -0000
-@@ -64,6 +64,7 @@
- import java.util.Enumeration;
- import java.util.Hashtable;
- import java.util.Vector;
-+import java.util.Iterator;
- import java.net.URL;
- import java.net.MalformedURLException;
- import org.apache.xml.resolver.CatalogManager;
-@@ -1166,6 +1167,23 @@
-
-
- /**
-+ * Return all registered public IDs.
-+ */
-+ public Iterator getPublicIDs() {
-+ Vector v = new Vector();
-+ Enumeration enum = catalogEntries.elements();
-+
-+ while (enum.hasMoreElements()) {
-+ CatalogEntry e = (CatalogEntry) enum.nextElement();
-+ if (e.getEntryType() == PUBLIC) {
-+ v.add(e.getEntryArg(0));
-+ }
-+ }
-+ return v.iterator();
-+ }
-+
-+
-+ /**
- * Return the applicable DOCTYPE system identifier.
- *
- * @param entityName The name of the entity (element) for which
-Index: src/org/apache/xml/resolver/CatalogManager.java
-===================================================================
-RCS file: /home/cvspublic/xml-commons/java/src/org/apache/xml/resolver/CatalogManager.java,v
-retrieving revision 1.6
-diff -u -b -r1.6 CatalogManager.java
---- src/org/apache/xml/resolver/CatalogManager.java 2 Sep 2003 07:05:07 -0000 1.6
-+++ src/org/apache/xml/resolver/CatalogManager.java 25 Feb 2005 13:42:20 -0000
-@@ -249,7 +249,11 @@
- // to avoid it.
- }
-
-- /** Constructor that specifies an explicit property file. */
-+ /**
-+ * Constructor that specifies an explicit property file.
-+ * @param propertyFile path to poperty file (e.g. com/resources/CatalogManager).
-+ * <code>null</code> means that no property file is consulted at all.
-+ */
- public CatalogManager(String propertyFile) {
- this.propertyFile = propertyFile;
-
-@@ -276,13 +280,14 @@
- * resources from it.
- */
- private synchronized void readProperties() {
-+ if (propertyFile == null) return;
- try {
- propertyFileURI = CatalogManager.class.getResource("/"+propertyFile);
- InputStream in =
- CatalogManager.class.getResourceAsStream("/"+propertyFile);
- if (in==null) {
- if (!ignoreMissingProperties) {
-- System.err.println("Cannot find "+propertyFile);
-+ debug.message(2, "Cannot find "+propertyFile);
- // there's no reason to give this warning more than once
- ignoreMissingProperties = true;
- }
-Index: src/org/apache/xml/resolver/tools/CatalogResolver.java
-===================================================================
-RCS file: /home/cvspublic/xml-commons/java/src/org/apache/xml/resolver/tools/CatalogResolver.java,v
-retrieving revision 1.5
-diff -u -b -r1.5 CatalogResolver.java
---- src/org/apache/xml/resolver/tools/CatalogResolver.java 2 Sep 2003 07:05:08 -0000 1.5
-+++ src/org/apache/xml/resolver/tools/CatalogResolver.java 25 Feb 2005 13:42:20 -0000
-@@ -223,30 +223,9 @@
- String resolved = getResolvedEntity(publicId, systemId);
-
- if (resolved != null) {
-- try {
- InputSource iSource = new InputSource(resolved);
- iSource.setPublicId(publicId);
--
-- // Ideally this method would not attempt to open the
-- // InputStream, but there is a bug (in Xerces, at least)
-- // that causes the parser to mistakenly open the wrong
-- // system identifier if the returned InputSource does
-- // not have a byteStream.
-- //
-- // It could be argued that we still shouldn't do this here,
-- // but since the purpose of calling the entityResolver is
-- // almost certainly to open the input stream, it seems to
-- // do little harm.
-- //
-- URL url = new URL(resolved);
-- InputStream iStream = url.openStream();
-- iSource.setByteStream(iStream);
--
- return iSource;
-- } catch (Exception e) {
-- catalogManager.debug.message(1, "Failed to create InputSource", resolved);
-- return null;
-- }
- }
-
- return null;
diff --git a/openide.util.lookup/build.xml b/openide.util.lookup/build.xml
index edf70e273..656a3ae2f 100644
--- a/openide.util.lookup/build.xml
+++ b/openide.util.lookup/build.xml
@@ -22,7 +22,4 @@
<project basedir="." default="netbeans" name="openide.util.lookup">
<description>Builds, tests, and runs the project org.openide.util.lookup</description>
<import file="../nbbuild/templates/projectized.xml"/>
- <target name="build-init" depends="projectized.build-init">
- <unzip src="../nbbuild/external/nbbuild-xhtml1-dtds-resources.zip" dest="../nbbuild/external/xhtml1-dtds"/>
- </target>
</project>
diff --git a/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/jbiasa/.ignore b/performance/enterprise/test/qa-functional/data/TravelReservationService/TravelReservationServiceApplication/src/jbiasa/.ignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/project.libraries/devel/design/uispec.txt b/project.libraries/devel/design/uispec.txt
index 0e7592798..6b4fcd5ea 100644
--- a/project.libraries/devel/design/uispec.txt
+++ b/project.libraries/devel/design/uispec.txt
@@ -1,3 +1,7 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
+
Project Libraries UI Specification
Abstract
@@ -259,4 +263,4 @@ it's also the usage itself (the XML entity).
----------------------------------------------------
-Petr Kuzel on 20th Jun 2003
\ No newline at end of file
+Petr Kuzel on 20th Jun 2003
diff --git a/projectui/src/org/netbeans/modules/project/ui/resources/explorer-override.wsmode b/projectui/src/org/netbeans/modules/project/ui/resources/explorer-override.wsmode
index 2b09dec23..8a5d52268 100644
--- a/projectui/src/org/netbeans/modules/project/ui/resources/explorer-override.wsmode
+++ b/projectui/src/org/netbeans/modules/project/ui/resources/explorer-override.wsmode
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!DOCTYPE mode PUBLIC
"-//NetBeans//DTD Mode Properties 2.0//EN"
diff --git a/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh b/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh
deleted file mode 100644
index 6aa724677..000000000
--- a/schema2beans/src/org/netbeans/modules/schema2beansdev/metadd/gen.ksh
+++ /dev/null
@@ -1 +0,0 @@
-ant genmetadd
diff --git a/web.common/src/org/netbeans/modules/web/common/api/WebServer.java b/web.common/src/org/netbeans/modules/web/common/api/WebServer.java
index f610a157b..7d9a17d49 100644
--- a/web.common/src/org/netbeans/modules/web/common/api/WebServer.java
+++ b/web.common/src/org/netbeans/modules/web/common/api/WebServer.java
@@ -365,7 +365,11 @@ private void readMimeTypes() {
assert is != null;
Scanner line = new Scanner(is).useDelimiter("\n");
while (line.hasNext()) {
- Scanner elements = new Scanner(line.next()).useDelimiter(p);
+ String lineString = line.next();
+ if(lineString.trim().startsWith("#") || lineString.trim().isEmpty()) {
+ continue;
+ }
+ Scanner elements = new Scanner(lineString).useDelimiter(p);
String mimeType = null;
while (elements.hasNext()) {
String s = elements.next();
diff --git a/web.common/src/org/netbeans/modules/web/common/api/mime.types b/web.common/src/org/netbeans/modules/web/common/api/mime.types
index d56cd4378..652e99fe9 100644
--- a/web.common/src/org/netbeans/modules/web/common/api/mime.types
+++ b/web.common/src/org/netbeans/modules/web/common/api/mime.types
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
application/andrew-inset ez
application/applixware aw
application/atom+xml atom
diff --git a/web.common/test/unit/src/org/netbeans/modules/web/common/api/WebServerTest.java b/web.common/test/unit/src/org/netbeans/modules/web/common/api/WebServerTest.java
index b6f047403..c34fa5b24 100644
--- a/web.common/test/unit/src/org/netbeans/modules/web/common/api/WebServerTest.java
+++ b/web.common/test/unit/src/org/netbeans/modules/web/common/api/WebServerTest.java
@@ -23,6 +23,7 @@
import java.io.OutputStream;
import java.net.URI;
import java.net.URL;
+import java.net.URLConnection;
import static org.junit.Assert.*;
import org.netbeans.api.project.Project;
import org.netbeans.junit.NbTestCase;
@@ -126,6 +127,7 @@ public void testWebServer2() throws Exception {
ws.start(testProject1, siteRoot1, "/app1");
assertURLContent("http://localhost:8383/app1/foo.html", "I'm foo_l");
+ assertMimetype("http://localhost:8383/app1/foo.html", "text/html");
ws.start(testProject2, siteRoot2, "/app2");
assertURLContent("http://localhost:8383/app2/foo.html", "I'm fool number Dva");
@@ -159,6 +161,13 @@ private void assertURLContent(String url, String content) throws Exception {
is.close();
assertEquals(content, new String(b).trim());
}
+
+ private void assertMimetype(String url, String mimetype) throws Exception {
+ URLConnection is = new URL(url).openConnection();
+ is.getInputStream().close();
+ String resultMimeType = is.getHeaderField("Content-Type");
+ assertEquals(mimetype, resultMimeType);
+ }
private void assertURLDoesNotExist(String url) throws Exception {
boolean ok = false;
diff --git a/web.common/web.common.webloc b/web.common/web.common.webloc
deleted file mode 100644
index b135f7640..000000000
--- a/web.common/web.common.webloc
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>URL</key>
- <string>http://web.common</string>
-</dict>
-</plist>
diff --git a/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/CSS.java b/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/CSS.java
index 42a280b4e..9ad89c87d 100644
--- a/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/CSS.java
+++ b/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/CSS.java
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.StringTokenizer;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -251,15 +252,12 @@ public void setStyleSheetText(String styleSheetId, String styleSheetText) {
// Chrome 35 replaces CSS.getSupportedCSSProperties by a hardcoded list,
// see https://chromium.googlesource.com/chromium/blink/+/master/Source/core/css/CSSShorthands.in
private Map<String,PropertyInfo> loadSupportedProperties() {
- Map<String,PropertyInfo> map = new HashMap<String,PropertyInfo>();
- InputStream stream = getClass().getResourceAsStream("Longhands.txt"); // NOI18N
- BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
- try {
- String s;
- while ((s = reader.readLine()) != null) {
- int index = s.indexOf('=');
- String name = s.substring(0,index);
- StringTokenizer tokenizer = new StringTokenizer(s.substring(index+1), ","); // NOI18N
+ Map<String,PropertyInfo> map = new HashMap<>();
+ try (InputStream stream = getClass().getResourceAsStream("Longhands.properties"); ) { // NOI18N
+ Properties properties = new Properties();
+ properties.load(stream);
+ for(String name: properties.stringPropertyNames()) {
+ StringTokenizer tokenizer = new StringTokenizer(properties.getProperty(name), ","); // NOI18N
JSONArray longhands = new JSONArray();
while (tokenizer.hasMoreTokens()) {
String longhand = tokenizer.nextToken();
@@ -272,10 +270,6 @@ public void setStyleSheetText(String styleSheetId, String styleSheetText) {
}
} catch (IOException ioex) {
Logger.getLogger(CSS.class.getName()).log(Level.INFO, null, ioex);
- } finally {
- try {
- reader.close();
- } catch (IOException ex) {}
}
return map;
}
diff --git a/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/Longhands.txt b/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/Longhands.properties
similarity index 84%
rename from web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/Longhands.txt
rename to web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/Longhands.properties
index 13e4ebbb6..d5b018e2c 100644
--- a/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/Longhands.txt
+++ b/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/css/Longhands.properties
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
animation=animation-name,animation-duration,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,animation-fill-mode,animation-play-state
background=background-image,background-position-x,background-position-y,background-size,background-repeat-x,background-repeat-y,background-attachment,background-origin,background-clip,background-color
background-position=background-position-x,background-position-y
diff --git a/web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/css/CSSTest.java b/web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/css/CSSTest.java
new file mode 100644
index 000000000..1845ac6b5
--- /dev/null
+++ b/web.webkit.debugging/test/unit/src/org/netbeans/modules/web/webkit/debugging/api/css/CSSTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.web.webkit.debugging.api.css;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+import org.json.simple.JSONObject;
+import org.junit.Test;
+import org.junit.Assert;
+import org.netbeans.modules.web.webkit.debugging.TransportHelper;
+import org.netbeans.modules.web.webkit.debugging.api.TransportStateException;
+import org.netbeans.modules.web.webkit.debugging.spi.Command;
+import org.netbeans.modules.web.webkit.debugging.spi.Response;
+import org.netbeans.modules.web.webkit.debugging.spi.ResponseCallback;
+import org.netbeans.modules.web.webkit.debugging.spi.TransportImplementation;
+
+
+public class CSSTest {
+
+ @Test
+ public void testGetSupportedCSSProperties () {
+ TransportHelper th = new TransportHelper(new TransportImplementation() {
+ private ResponseCallback rc;
+
+ @Override
+ public boolean attach() {
+ return true;
+ }
+
+ @Override
+ public boolean detach() {
+ return true;
+ }
+
+ @Override
+ public void sendCommand(Command command) throws TransportStateException {
+ JSONObject result = new JSONObject();
+ result.put(Command.COMMAND_ID, command.getID());
+ result.put(Command.COMMAND_METHOD, command.getCommand().get(Command.COMMAND_METHOD));
+ result.put(Command.COMMAND_PARAMS, command.getCommand().get(Command.COMMAND_PARAMS));
+ result.put(Command.COMMAND_RESULT, null);
+ Response resp = new Response(result);
+ rc.handleResponse(resp);
+ }
+
+ @Override
+ public void registerResponseCallback(ResponseCallback callback) {
+ this.rc = callback;
+ }
+
+ @Override
+ public String getConnectionName() {
+ return "Dummy";
+ }
+
+ @Override
+ public URL getConnectionURL() {
+ try {
+ return new URL("socket://demo");
+ } catch (MalformedURLException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ @Override
+ public String getVersion() {
+ return "1.0";
+ }
+ });
+ CSS css = new CSS(th);
+ Map<String,PropertyInfo> result = css.getSupportedCSSProperties();
+ // At least one property is expected
+ Assert.assertFalse(result.isEmpty());
+ // That at least one is border-radius
+ Assert.assertTrue(result.containsKey("border-radius"));
+ }
+
+}
diff --git a/websvc.saas.api/build.xml b/websvc.saas.api/build.xml
index a1a46860b..04fc02949 100644
--- a/websvc.saas.api/build.xml
+++ b/websvc.saas.api/build.xml
@@ -32,10 +32,6 @@
<property name="oauth.xsd" value="src/org/netbeans/modules/websvc/saas/model/oauth-metadata.xsd"/>
<property name="oauth.model" value="src/org/netbeans/modules/websvc/saas/model/oauth"/>
- <target name="build-init" depends="projectized.build-init">
- <unzip src="external/websvc-saas-api-external-resources-8.2.zip" dest="src/org/netbeans/modules/websvc/saas/model"/>
- </target>
-
<target name="xjc-init" depends="build-init">
<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
<classpath>
diff --git a/websvc.saas.api/external/binaries-list b/websvc.saas.api/external/binaries-list
deleted file mode 100644
index 86ca2803b..000000000
--- a/websvc.saas.api/external/binaries-list
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-BD6DF9AB773B5974734F9B2CA78EEBDBB826AF02 websvc-saas-api-external-resources-8.2.zip
diff --git a/websvc.saas.api/external/websvc-saas-api-external-resources-8.2-license.txt b/websvc.saas.api/external/websvc-saas-api-external-resources-8.2-license.txt
deleted file mode 100644
index 5d076cdb6..000000000
--- a/websvc.saas.api/external/websvc-saas-api-external-resources-8.2-license.txt
+++ /dev/null
@@ -1,406 +0,0 @@
-Name: websvc.saas.api XSDs
-Description: XSDs for the websvc.saas.api from the original NetBeans repositories
-Version: 8.2
-License: CDDL-1.0
-Source: https://netbeans.org/
-Origin: NetBeans
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. "Contributor" means each individual or entity that
-creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the
-Original Software, prior Modifications used by a
-Contributor (if any), and the Modifications made by that
-particular Contributor.
-
-1.3. "Covered Software" means (a) the Original Software, or
-(b) Modifications, or (c) the combination of files
-containing Original Software with files containing
-Modifications, in each case including portions thereof.
-
-1.4. "Executable" means the Covered Software in any form
-other than Source Code.
-
-1.5. "Initial Developer" means the individual or entity
-that first makes Original Software available under this
-License.
-
-1.6. "Larger Work" means a work which combines Covered
-Software or portions thereof with code not governed by the
-terms of this License.
-
-1.7. "License" means this document.
-
-1.8. "Licensable" means having the right to grant, to the
-maximum extent possible, whether at the time of the initial
-grant or subsequently acquired, any and all of the rights
-conveyed herein.
-
-1.9. "Modifications" means the Source Code and Executable
-form of any of the following:
-
-A. Any file that results from an addition to,
-deletion from or modification of the contents of a
-file containing Original Software or previous
-Modifications;
-
-B. Any new file that contains any part of the
-Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made
-available under the terms of this License.
-
-1.10. "Original Software" means the Source Code and
-Executable form of computer software code that is
-originally released under this License.
-
-1.11. "Patent Claims" means any patent claim(s), now owned
-or hereafter acquired, including without limitation,
-method, process, and apparatus claims, in any patent
-Licensable by grantor.
-
-1.12. "Source Code" means (a) the common form of computer
-software code in which modifications are made and (b)
-associated documentation included in or with such code.
-
-1.13. "You" (or "Your") means an individual or a legal
-entity exercising rights under, and complying with all of
-the terms of, this License. For legal entities, "You"
-includes any entity which controls, is controlled by, or is
-under common control with You. For purposes of this
-definition, "control" means (a) the power, direct or
-indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (b) ownership
-of more than fifty percent (50%) of the outstanding shares
-or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and
-subject to third party intellectual property claims, the
-Initial Developer hereby grants You a world-wide,
-royalty-free, non-exclusive license:
-
-(a) under intellectual property rights (other than
-patent or trademark) Licensable by Initial Developer,
-to use, reproduce, modify, display, perform,
-sublicense and distribute the Original Software (or
-portions thereof), with or without Modifications,
-and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making,
-using or selling of Original Software, to make, have
-made, use, practice, sell, and offer for sale, and/or
-otherwise dispose of the Original Software (or
-portions thereof).
-
-(c) The licenses granted in Sections 2.1(a) and (b)
-are effective on the date Initial Developer first
-distributes or otherwise makes the Original Software
-available to a third party under the terms of this
-License.
-
-(d) Notwithstanding Section 2.1(b) above, no patent
-license is granted: (1) for code that You delete from
-the Original Software, or (2) for infringements
-caused by: (i) the modification of the Original
-Software, or (ii) the combination of the Original
-Software with other software or devices.
-
-2.2. Contributor Grant.
-
-Conditioned upon Your compliance with Section 3.1 below and
-subject to third party intellectual property claims, each
-Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than
-patent or trademark) Licensable by Contributor to
-use, reproduce, modify, display, perform, sublicense
-and distribute the Modifications created by such
-Contributor (or portions thereof), either on an
-unmodified basis, with other Modifications, as
-Covered Software and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making,
-using, or selling of Modifications made by that
-Contributor either alone and/or in combination with
-its Contributor Version (or portions of such
-combination), to make, use, sell, offer for sale,
-have made, and/or otherwise dispose of: (1)
-Modifications made by that Contributor (or portions
-thereof); and (2) the combination of Modifications
-made by that Contributor with its Contributor Version
-(or portions of such combination).
-
-(c) The licenses granted in Sections 2.2(a) and
-2.2(b) are effective on the date Contributor first
-distributes or otherwise makes the Modifications
-available to a third party.
-
-(d) Notwithstanding Section 2.2(b) above, no patent
-license is granted: (1) for any code that Contributor
-has deleted from the Contributor Version; (2) for
-infringements caused by: (i) third party
-modifications of Contributor Version, or (ii) the
-combination of Modifications made by that Contributor
-with other software (except as part of the
-Contributor Version) or other devices; or (3) under
-Patent Claims infringed by Covered Software in the
-absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make
-available in Executable form must also be made available in
-Source Code form and that Source Code form must be
-distributed only under the terms of this License. You must
-include a copy of this License with every copy of the
-Source Code form of the Covered Software You distribute or
-otherwise make available. You must inform recipients of any
-such Covered Software in Executable form as to how they can
-obtain such Covered Software in Source Code form in a
-reasonable manner on or through a medium customarily used
-for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You
-contribute are governed by the terms of this License. You
-represent that You believe Your Modifications are Your
-original creation(s) and/or You have sufficient rights to
-grant the rights conveyed by this License.
-
-3.3. Required Notices.
-
-You must include a notice in each of Your Modifications
-that identifies You as the Contributor of the Modification.
-You may not remove or alter any copyright, patent or
-trademark notices contained within the Covered Software, or
-any notices of licensing or any descriptive text giving
-attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-
-You may not offer or impose any terms on any Covered
-Software in Source Code form that alters or restricts the
-applicable version of this License or the recipients'
-rights hereunder. You may choose to offer, and to charge a
-fee for, warranty, support, indemnity or liability
-obligations to one or more recipients of Covered Software.
-However, you may do so only on Your own behalf, and not on
-behalf of the Initial Developer or any Contributor. You
-must make it absolutely clear that any such warranty,
-support, indemnity or liability obligation is offered by
-You alone, and You hereby agree to indemnify the Initial
-Developer and every Contributor for any liability incurred
-by the Initial Developer or such Contributor as a result of
-warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-
-You may distribute the Executable form of the Covered
-Software under the terms of this License or under the terms
-of a license of Your choice, which may contain terms
-different from this License, provided that You are in
-compliance with the terms of this License and that the
-license for the Executable form does not attempt to limit
-or alter the recipient's rights in the Source Code form
-from the rights set forth in this License. If You
-distribute the Covered Software in Executable form under a
-different license, You must make it absolutely clear that
-any terms which differ from this License are offered by You
-alone, not by the Initial Developer or Contributor. You
-hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial
-Developer or such Contributor as a result of any such terms
-You offer.
-
-3.6. Larger Works.
-
-You may create a Larger Work by combining Covered Software
-with other code not governed by the terms of this License
-and distribute the Larger Work as a single product. In such
-a case, You must make sure the requirements of this License
-are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-
-Sun Microsystems, Inc. is the initial license steward and
-may publish revised and/or new versions of this License
-from time to time. Each version will be given a
-distinguishing version number. Except as provided in
-Section 4.3, no one other than the license steward has the
-right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise
-make the Covered Software available under the terms of the
-version of the License under which You originally received
-the Covered Software. If the Initial Developer includes a
-notice in the Original Software prohibiting it from being
-distributed or otherwise made available under any
-subsequent version of the License, You must distribute and
-make the Covered Software available under the terms of the
-version of the License under which You originally received
-the Covered Software. Otherwise, You may also choose to
-use, distribute or otherwise make the Covered Software
-available under the terms of any subsequent version of the
-License published by the license steward.
-
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a
-new license for Your Original Software, You may create and
-use a modified version of this License if You: (a) rename
-the license and remove any references to the name of the
-license steward (except to note that the license differs
-from this License); and (b) otherwise make it clear that
-the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will
-terminate automatically if You fail to comply with terms
-herein and fail to cure such breach within 30 days of
-becoming aware of the breach. Provisions which, by their
-nature, must remain in effect beyond the termination of
-this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding
-declaratory judgment actions) against Initial Developer or
-a Contributor (the Initial Developer or Contributor against
-whom You assert such claim is referred to as "Participant")
-alleging that the Participant Software (meaning the
-Contributor Version where the Participant is a Contributor
-or the Original Software where the Participant is the
-Initial Developer) directly or indirectly infringes any
-patent, then any and all rights granted directly or
-indirectly to You by such Participant, the Initial
-Developer (if the Initial Developer is not the Participant)
-and all Contributors under Sections 2.1 and/or 2.2 of this
-License shall, upon 60 days notice from Participant
-terminate prospectively and automatically at the expiration
-of such 60 day notice period, unless if within such 60 day
-period You withdraw Your claim with respect to the
-Participant Software against such Participant either
-unilaterally or pursuant to a written agreement with
-Participant.
-
-6.3. If You assert a patent infringement claim against
-Participant alleging that the Participant Software directly
-or indirectly infringes any patent where such claim is
-resolved (such as by license or settlement) prior to the
-initiation of patent infringement litigation, then the
-reasonable value of the licenses granted by such Participant
-under Sections 2.1 or 2.2 shall be taken into account in
-determining the amount or value of any payment or license.
-
-6.4. In the event of termination under Sections 6.1 or 6.2
-above, all end user licenses that have been validly granted
-by You or any distributor hereunder prior to termination
-(excluding licenses granted to You by any distributor)
-shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a "commercial item," as that term is
-defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-computer software" (as that term is defined at 48 C.F.R.
-? 252.227-7014(a)(1)) and "commercial computer software
-documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-through 227.7202-4 (June 1995), all U.S. Government End Users
-acquire Covered Software with only those rights set forth herein.
-This U.S. Government Rights clause is in lieu of, and supersedes,
-any other FAR, DFAR, or other clause or provision that addresses
-Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the
-extent necessary to make it enforceable. This License shall be
-governed by the law of the jurisdiction specified in a notice
-contained within the Original Software (except to the extent
-applicable law, if any, provides otherwise), excluding such
-jurisdiction's conflict-of-law provisions. Any litigation
-relating to this License shall be subject to the jurisdiction of
-the courts located in the jurisdiction and venue specified in a
-notice contained within the Original Software, with the losing
-party responsible for costs, including, without limitation, court
-costs and reasonable attorneys' fees and expenses. The
-application of the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded. Any law or
-regulation which provides that the language of a contract shall
-be construed against the drafter shall not apply to this License.
-You agree that You alone are responsible for compliance with the
-United States export administration regulations (and the export
-control laws and regulation of any other countries) when You use,
-distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is
-responsible for claims and damages arising, directly or
-indirectly, out of its utilization of rights under this License
-and You agree to work with Initial Developer and Contributors to
-distribute such responsibility on an equitable basis. Nothing
-herein is intended or shall be deemed to constitute any admission
-of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws
-of the State of California (excluding conflict-of-law provisions).
-Any litigation relating to this License shall be subject to the
-jurisdiction of the Federal Courts of the Northern District of
-California and the state courts of the State of California, with
-venue lying in Santa Clara County, California.
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd b/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
new file mode 100644
index 000000000..810dbba72
--- /dev/null
+++ b/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html
+ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ nbbuild/licenses/CDDL-GPL-2-CP. 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. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 2] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 2 code and therefore, elected the GPL
+ Version 2 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+
+ Apache NetBeans (incubating) elects to include this software in this distribution
+ under the CDDL license.
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://research.sun.com/wadl/2006/10" xmlns:tns="http://research.sun.com/wadl/2006/10" xmlns:xml="http://www.w3.org/XML/1998/namespace" elementFormDefault="qualified">
+
+ <!-- xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+
+ <xs:element name="application">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:grammars" minOccurs="0"/>
+ <xs:element ref="tns:resources" minOccurs="0"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:resource_type"/>
+ <xs:element ref="tns:method"/>
+ <xs:element ref="tns:representation"/>
+ <xs:element ref="tns:fault"/>
+ </xs:choice>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="doc">
+ <xs:complexType mixed="true">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="title" type="xs:string"/>
+ <!-- xs:attribute ref="xml:lang"/ -->
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="grammars">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:include"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="resources">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:resource" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="base" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="resource">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:method"/>
+ <xs:element ref="tns:resource"/>
+ </xs:choice>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="type" type="tns:resource_type_list"/>
+ <xs:attribute name="queryType" type="xs:string" default="application/x-www-form-urlencoded"/>
+ <xs:attribute name="path" type="xs:string"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="resource_type_list">
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:element name="resource_type">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:method" maxOccurs="unbounded"/>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="method">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:request" minOccurs="0"/>
+ <xs:element ref="tns:response" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="name" type="tns:Method"/>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="Method">
+ <xs:union memberTypes="tns:HTTPMethods xs:NMTOKEN"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="HTTPMethods">
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="GET"/>
+ <xs:enumeration value="POST"/>
+ <xs:enumeration value="PUT"/>
+ <xs:enumeration value="HEAD"/>
+ <xs:enumeration value="DELETE"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="include">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="request">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:representation" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="response">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:representation"/>
+ <xs:element ref="tns:fault"/>
+ </xs:choice>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="uriList">
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:complexType name="representation_type">
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="element" type="xs:QName"/>
+ <xs:attribute name="status" type="tns:statusCodeList"/>
+ <xs:attribute name="mediaType" type="xs:string"/>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:attribute name="profile" type="tns:uriList"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:simpleType name="statusCodeList">
+ <xs:list itemType="xs:unsignedInt"/>
+ </xs:simpleType>
+
+ <xs:element name="representation" type="tns:representation_type"/>
+
+ <xs:element name="fault" type="tns:representation_type"/>
+
+ <xs:simpleType name="ParamStyle">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="plain"/>
+ <xs:enumeration value="query"/>
+ <xs:enumeration value="matrix"/>
+ <xs:enumeration value="header"/>
+ <xs:enumeration value="template"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="param">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:link" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
+ <xs:attribute name="style" type="tns:ParamStyle" use="required"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="type" type="xs:QName" default="xs:string"/>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="required" type="xs:boolean" default="false"/>
+ <xs:attribute name="repeating" type="xs:boolean" default="false"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="path" type="xs:string"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="option">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="link">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="resource_type" type="xs:anyURI"/>
+ <xs:attribute name="rel" type="xs:token"/>
+ <xs:attribute name="rev" type="xs:token"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd b/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
new file mode 100644
index 000000000..f12858f9b
--- /dev/null
+++ b/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
+
+ The contents of this file are subject to the terms of either the GNU
+ General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with the
+ License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html
+ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ nbbuild/licenses/CDDL-GPL-2-CP. 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. If applicable, add the following below the
+ License Header, with the fields enclosed by brackets [] replaced by
+ your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL
+ or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this distribution
+ under the [CDDL or GPL Version 2] license." If you do not indicate a
+ single choice of license, a recipient has the option to distribute
+ your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above.
+ However, if you add GPL Version 2 code and therefore, elected the GPL
+ Version 2 license, then the option applies only if the new code is
+ made subject to such option by the copyright holder.
+
+
+ Apache NetBeans (incubating) elects to include this software in this distribution
+ under the CDDL license.
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://wadl.dev.java.net/2009/02"
+ xmlns:tns="http://wadl.dev.java.net/2009/02"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ elementFormDefault="qualified">
+
+ <!--xs:import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+
+ <xs:element name="application">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:grammars" minOccurs="0"/>
+ <xs:element ref="tns:resources" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:resource_type"/>
+ <xs:element ref="tns:method"/>
+ <xs:element ref="tns:representation"/>
+ <xs:element ref="tns:param"/>
+ </xs:choice>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="doc">
+ <xs:complexType mixed="true">
+ <xs:sequence>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="title" type="xs:string"/>
+ <!--xs:attribute ref="xml:lang"/-->
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="grammars">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:include"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="resources">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:resource" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="base" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="resource">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:method"/>
+ <xs:element ref="tns:resource"/>
+ </xs:choice>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"
+ processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="type" type="tns:resource_type_list"/>
+ <xs:attribute name="queryType" type="xs:string"
+ default="application/x-www-form-urlencoded"/>
+ <xs:attribute name="path" type="xs:string"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="resource_type_list">
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:element name="resource_type">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="tns:method"/>
+ <xs:element ref="tns:resource"/>
+ </xs:choice>
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"
+ processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="method">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:request" minOccurs="0"/>
+ <xs:element ref="tns:response" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="name" type="tns:Method"/>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="Method">
+ <xs:union memberTypes="tns:HTTPMethods xs:NMTOKEN"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="HTTPMethods">
+ <xs:restriction base="xs:NMTOKEN">
+ <xs:enumeration value="GET"/>
+ <xs:enumeration value="POST"/>
+ <xs:enumeration value="PUT"/>
+ <xs:enumeration value="HEAD"/>
+ <xs:enumeration value="DELETE"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="include">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="request">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:representation" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="response">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:representation" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="status" type="tns:statusCodeList"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="uriList">
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:element name="representation">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:param" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="element" type="xs:QName"/>
+ <xs:attribute name="mediaType" type="xs:string"/>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:attribute name="profile" type="tns:uriList"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="statusCodeList">
+ <xs:list itemType="xs:unsignedInt"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="ParamStyle">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="plain"/>
+ <xs:enumeration value="query"/>
+ <xs:enumeration value="matrix"/>
+ <xs:enumeration value="header"/>
+ <xs:enumeration value="template"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="param">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:link" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="href" type="xs:anyURI"/>
+ <xs:attribute name="name" type="xs:NMTOKEN"/>
+ <xs:attribute name="style" type="tns:ParamStyle"/>
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="type" type="xs:QName" default="xs:string"/>
+ <xs:attribute name="default" type="xs:string"/>
+ <xs:attribute name="required" type="xs:boolean" default="false"/>
+ <xs:attribute name="repeating" type="xs:boolean" default="false"/>
+ <xs:attribute name="fixed" type="xs:string"/>
+ <xs:attribute name="path" type="xs:string"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="option">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ <xs:attribute name="mediaType" type="xs:string"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="link">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:doc" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="resource_type" type="xs:anyURI"/>
+ <xs:attribute name="rel" type="xs:token"/>
+ <xs:attribute name="rev" type="xs:token"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/apikey.properties b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/apikey.properties
index 644c4640f..5407e2e2c 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/apikey.properties
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/apikey.properties
@@ -1,3 +1,23 @@
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
# To change this template, choose Tools | Templates
# and open the template in the editor.
api_key=
diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/httpbasic.properties b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/httpbasic.properties
index 888ad64ff..f6f0399e9 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/httpbasic.properties
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/httpbasic.properties
@@ -1,3 +1,23 @@
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
# To change this template, choose Tools | Templates
# and open the template in the editor.
username=
diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/sessionkey.properties b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/sessionkey.properties
index 84bc590b3..d6d5045e8 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/sessionkey.properties
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/sessionkey.properties
@@ -1,3 +1,23 @@
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
# To change this template, choose Tools | Templates
# and open the template in the editor.
api_key=
diff --git a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/signedurl.properties b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/signedurl.properties
index d236b1e98..86ce26dd5 100644
--- a/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/signedurl.properties
+++ b/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/resources/signedurl.properties
@@ -1,3 +1,23 @@
+<#-- FreeMarker template (see http://freemarker.org/)
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
# To change this template, choose Tools | Templates
# and open the template in the editor.
access_key=
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services