You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/22 19:11:14 UTC
[GitHub] geertjanw closed pull request #724: [NETBEANS-1074] Module Review
tomcat5
geertjanw closed pull request #724: [NETBEANS-1074] Module Review tomcat5
URL: https://github.com/apache/incubator-netbeans/pull/724
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/tomcat5/licenseinfo.xml b/tomcat5/licenseinfo.xml
new file mode 100644
index 0000000000..0a8034d043
--- /dev/null
+++ b/tomcat5/licenseinfo.xml
@@ -0,0 +1,33 @@
+<?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.
+
+-->
+
+<licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/modules/tomcat5/resources/error-glyph.gif</file>
+ <file>src/org/netbeans/modules/tomcat5/resources/tomcat.png</file>
+ <file>src/org/netbeans/modules/tomcat5/resources/tomcat5.gif</file>
+ <file>src/org/netbeans/modules/tomcat5/resources/wait.gif</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git a/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_context.dtd b/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_context.dtd
index 1bcc09ee6f..f5fb2f997a 100644
--- a/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_context.dtd
+++ b/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_context.dtd
@@ -1,3 +1,23 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!--
The DefaultContext element represents a subset of the configuration settings
for a Context, and can be nested inside an Engine or Host element
diff --git a/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_server.dtd b/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_server.dtd
index 1cebfbca45..1b3bc4672c 100644
--- a/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_server.dtd
+++ b/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomcat5_server.dtd
@@ -1,3 +1,23 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!--
A Server element represents the entire Catalina servlet container.
Therefore, it must be the single outermost element in the conf/server.xml configuration file.
@@ -291,4 +311,4 @@ Ejb element.
<!ATTLIST Ejb type CDATA #REQUIRED>
<!ATTLIST Ejb home CDATA #REQUIRED>
<!ATTLIST Ejb remote CDATA #REQUIRED>
-<!ATTLIST Ejb description CDATA #IMPLIED>
\ No newline at end of file
+<!ATTLIST Ejb description CDATA #IMPLIED>
diff --git a/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomee_resources.dtd b/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomee_resources.dtd
index 4a9ba5665e..1db3099b5c 100644
--- a/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomee_resources.dtd
+++ b/tomcat5/src/org/netbeans/modules/tomcat5/resources/tomee_resources.dtd
@@ -1,3 +1,23 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<!--
Just artifical DTD designed to the current knowledge of tomee resources.xml.
We didn't find a DTD or xml schema.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists