init
This commit is contained in:
1057
res/INSTALLLICENSE
Normal file
1057
res/INSTALLLICENSE
Normal file
File diff suppressed because it is too large
Load Diff
11
res/META-INF/annotations-api.jar.manifest
Normal file
11
res/META-INF/annotations-api.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-version: 1.0
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
|
||||
Name: javax/annotation/
|
||||
Implementation-Title: javax.annotation
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
Implementation-Version: 1.2.@annotation.revision@
|
||||
Specification-Title: Common Annotations
|
||||
Specification-Vendor: Oracle Corporation
|
||||
Specification-Version: 1.2
|
||||
11
res/META-INF/bootstrap.jar.manifest
Normal file
11
res/META-INF/bootstrap.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-Version: 1.0
|
||||
Main-Class: org.apache.catalina.startup.Bootstrap
|
||||
Class-Path: commons-daemon.jar
|
||||
Specification-Title: Apache Tomcat Bootstrap
|
||||
Specification-Version: @VERSION_MAJOR_MINOR@
|
||||
Specification-Vendor: Apache Software Foundation
|
||||
Implementation-Title: Apache Tomcat Bootstrap
|
||||
Implementation-Version: @VERSION@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
202
res/META-INF/default.license
Normal file
202
res/META-INF/default.license
Normal file
@@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
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.
|
||||
9
res/META-INF/default.manifest
Normal file
9
res/META-INF/default.manifest
Normal file
@@ -0,0 +1,9 @@
|
||||
Manifest-Version: 1.0
|
||||
Specification-Title: Apache Tomcat
|
||||
Specification-Version: @VERSION_MAJOR_MINOR@
|
||||
Specification-Vendor: Apache Software Foundation
|
||||
Implementation-Title: Apache Tomcat
|
||||
Implementation-Version: @VERSION@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
5
res/META-INF/default.notice
Normal file
5
res/META-INF/default.notice
Normal file
@@ -0,0 +1,5 @@
|
||||
Apache Tomcat
|
||||
Copyright 1999-@YEAR@ The Apache Software Foundation
|
||||
|
||||
This product includes software developed at
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
||||
24
res/META-INF/default/.gitignore
vendored
Normal file
24
res/META-INF/default/.gitignore
vendored
Normal file
@@ -0,0 +1,24 @@
|
||||
# -----------------------------------------------------------------------------
|
||||
# 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.
|
||||
# -----------------------------------------------------------------------------
|
||||
# Git ignores empty directories and the unit tests require this directory to
|
||||
# be present for the welcome file tests to pass. The presence of this file
|
||||
# doesn't break the unit tests.
|
||||
#
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
11
res/META-INF/el-api.jar.manifest
Normal file
11
res/META-INF/el-api.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-version: 1.0
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
|
||||
Name: javax/el/
|
||||
Specification-Title: Expression Language
|
||||
Specification-Version: 3.0
|
||||
Specification-Vendor: Sun Microsystems, Inc.
|
||||
Implementation-Title: javax.el
|
||||
Implementation-Version: 3.0.@el.revision@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
@@ -0,0 +1,16 @@
|
||||
# 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.apache.el.ExpressionFactoryImpl
|
||||
26
res/META-INF/jasper-el.jar/web-fragment.xml
Normal file
26
res/META-INF/jasper-el.jar/web-fragment.xml
Normal file
@@ -0,0 +1,26 @@
|
||||
<?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.
|
||||
-->
|
||||
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
|
||||
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
|
||||
version="4.0"
|
||||
metadata-complete="true">
|
||||
<name>org_apache_jasper_el</name>
|
||||
<distributable/>
|
||||
</web-fragment>
|
||||
@@ -0,0 +1,16 @@
|
||||
# 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.apache.jasper.servlet.JasperInitializer
|
||||
26
res/META-INF/jasper.jar/web-fragment.xml
Normal file
26
res/META-INF/jasper.jar/web-fragment.xml
Normal file
@@ -0,0 +1,26 @@
|
||||
<?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.
|
||||
-->
|
||||
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
|
||||
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
|
||||
version="3.1"
|
||||
metadata-complete="true">
|
||||
<name>org_apache_jasper</name>
|
||||
<distributable/>
|
||||
</web-fragment>
|
||||
11
res/META-INF/jaspic-api.jar.manifest
Normal file
11
res/META-INF/jaspic-api.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-version: 1.0
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
|
||||
Name: javax/security/auth/message
|
||||
Specification-Title: Java Authentication SPI for Containers
|
||||
Specification-Version: 1.1
|
||||
Specification-Vendor: Sun Microsystems, Inc.
|
||||
Implementation-Title: javax.security.auth.message
|
||||
Implementation-Version: 1.1.@jaspic.revision@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
11
res/META-INF/jsp-api.jar.manifest
Normal file
11
res/META-INF/jsp-api.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-version: 1.0
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
|
||||
Name: javax/servlet/jsp/
|
||||
Specification-Title: Java API for JavaServer Pages
|
||||
Specification-Version: 2.3
|
||||
Specification-Vendor: Sun Microsystems, Inc.
|
||||
Implementation-Title: javax.servlet.jsp
|
||||
Implementation-Version: 2.3.@jsp.revision@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
560
res/META-INF/servlet-api.jar.license
Normal file
560
res/META-INF/servlet-api.jar.license
Normal file
File diff suppressed because it is too large
Load Diff
11
res/META-INF/servlet-api.jar.manifest
Normal file
11
res/META-INF/servlet-api.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-version: 1.0
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
|
||||
Name: javax/servlet/
|
||||
Specification-Title: Java API for Servlets
|
||||
Specification-Version: 3.1
|
||||
Specification-Vendor: Sun Microsystems, Inc.
|
||||
Implementation-Title: javax.servlet
|
||||
Implementation-Version: 3.1.@servlet.revision@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
27
res/META-INF/servlet-api.jar.notice
Normal file
27
res/META-INF/servlet-api.jar.notice
Normal file
@@ -0,0 +1,27 @@
|
||||
Apache Tomcat
|
||||
Copyright 1999-@YEAR@ The Apache Software Foundation
|
||||
|
||||
This product includes software developed at
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
||||
|
||||
The original XML Schemas for Java EE Deployment Descriptors:
|
||||
- javaee_5.xsd
|
||||
- javaee_web_services_1_2.xsd
|
||||
- javaee_web_services_client_1_2.xsd
|
||||
- javaee_6.xsd
|
||||
- javaee_web_services_1_3.xsd
|
||||
- javaee_web_services_client_1_3.xsd
|
||||
- jsp_2_2.xsd
|
||||
- web-app_3_0.xsd
|
||||
- web-common_3_0.xsd
|
||||
- web-fragment_3_0.xsd
|
||||
- javaee_7.xsd
|
||||
- javaee_web_services_1_4.xsd
|
||||
- javaee_web_services_client_1_4.xsd
|
||||
- jsp_2_3.xsd
|
||||
- web-app_3_1.xsd
|
||||
- web-common_3_1.xsd
|
||||
- web-fragment_3_1.xsd
|
||||
|
||||
may be obtained from:
|
||||
http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
|
||||
@@ -0,0 +1,16 @@
|
||||
# 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.apache.tomcat.websocket.server.WsSci
|
||||
@@ -0,0 +1,16 @@
|
||||
# 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.apache.tomcat.websocket.WsContainerProvider
|
||||
@@ -0,0 +1,16 @@
|
||||
# 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.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator
|
||||
26
res/META-INF/tomcat-websocket.jar/web-fragment.xml
Normal file
26
res/META-INF/tomcat-websocket.jar/web-fragment.xml
Normal file
@@ -0,0 +1,26 @@
|
||||
<?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.
|
||||
-->
|
||||
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
|
||||
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
|
||||
version="3.1"
|
||||
metadata-complete="true">
|
||||
<name>org_apache_tomcat_websocket</name>
|
||||
<distributable/>
|
||||
</web-fragment>
|
||||
11
res/META-INF/websocket-api.jar.manifest
Normal file
11
res/META-INF/websocket-api.jar.manifest
Normal file
@@ -0,0 +1,11 @@
|
||||
Manifest-version: 1.0
|
||||
X-Compile-Source-JDK: @source.jdk@
|
||||
X-Compile-Target-JDK: @target.jdk@
|
||||
|
||||
Name: javax/websocket/
|
||||
Specification-Title: WebSocket
|
||||
Specification-Version: 1.1
|
||||
Specification-Vendor: Oracle, Inc.
|
||||
Implementation-Title: javax.websocket
|
||||
Implementation-Version: 1.1.@websocket.revision@
|
||||
Implementation-Vendor: Apache Software Foundation
|
||||
94
res/checkstyle/checkstyle.xml
Normal file
94
res/checkstyle/checkstyle.xml
Normal file
@@ -0,0 +1,94 @@
|
||||
<?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 module PUBLIC
|
||||
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
|
||||
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
|
||||
<module name="Checker">
|
||||
<!-- When adding checks, keep to the order checks are listed under -->
|
||||
<!-- 'Standard Checks' in the Checkstyle documentation: -->
|
||||
<!-- http://checkstyle.sourceforge.net/config_coding.html -->
|
||||
|
||||
<!-- Cache what has passed checkstyle -->
|
||||
<property name="cacheFile"
|
||||
value="${tomcat.output}/res/checkstyle/cachefile-checkstyle.xml"/>
|
||||
|
||||
<!-- Headers -->
|
||||
<module name="RegexpHeader">
|
||||
<property name="headerFile" value="${basedir}/res/checkstyle/header-al2.txt"/>
|
||||
<property name="multiLines" value="1, 2, 3, 4"/>
|
||||
<property name="fileExtensions" value="java,xml,jsp,txt,sh,bat,properties"/>
|
||||
</module>
|
||||
|
||||
<!-- Whitespace -->
|
||||
<module name="FileTabCharacter"/>
|
||||
<module name="RegexpSingleline">
|
||||
<!-- No trailing whitespace -->
|
||||
<property name="format" value="\s+$"/>
|
||||
</module>
|
||||
|
||||
<module name="TreeWalker">
|
||||
|
||||
<!-- Annotations -->
|
||||
<module name="AnnotationLocation"/>
|
||||
<module name="AnnotationUseStyle"/>
|
||||
<module name="MissingOverride"/>
|
||||
<module name="PackageAnnotation"/>
|
||||
|
||||
<!-- Block Checks -->
|
||||
<module name="AvoidNestedBlocks">
|
||||
<property name="allowInSwitchCase" value="true"/>
|
||||
</module>
|
||||
|
||||
<!-- Coding -->
|
||||
<module name="IllegalInstantiation"/>
|
||||
|
||||
<!-- Imports -->
|
||||
<module name="AvoidStarImport"/>
|
||||
<module name="AvoidStaticImport">
|
||||
<property name="excludes"
|
||||
value="org.apache.catalina.startup.SimpleHttpClient.CRLF"/>
|
||||
</module>
|
||||
<module name="IllegalImport">
|
||||
<property name="illegalPkgs" value="sun,junit.framework"/>
|
||||
</module>
|
||||
<module name="ImportOrder">
|
||||
<property name="groups" value="java,javax,org.hamcrest,org.junit,org,async,jsp2,util"/>
|
||||
<property name="ordered" value="true"/>
|
||||
<property name="separated" value="true"/>
|
||||
<property name="option" value="above"/>
|
||||
</module>
|
||||
<module name="RedundantImport"/>
|
||||
<module name="UnusedImports"/>
|
||||
|
||||
<!-- Modifiers -->
|
||||
<module name="ModifierOrder"/>
|
||||
<!-- ~1750 errors
|
||||
<module name="RedundantModifier"/>
|
||||
-->
|
||||
|
||||
<!-- Whitespace -->
|
||||
<module name="GenericWhitespace"/>
|
||||
<module name="EmptyForInitializerPad"/>
|
||||
<module name="EmptyForIteratorPad"/>
|
||||
<!-- ~ 1200 errors
|
||||
<module name="OperatorWrap">
|
||||
<property name="option" value="eol"/>
|
||||
</module>
|
||||
-->
|
||||
</module>
|
||||
</module>
|
||||
19
res/checkstyle/header-al2.txt
Normal file
19
res/checkstyle/header-al2.txt
Normal file
@@ -0,0 +1,19 @@
|
||||
^<\?xml.*>$
|
||||
^@echo off$
|
||||
^#!
|
||||
^\W*$
|
||||
^(rem)?\W*Licensed to the Apache Software Foundation \(ASF\) under one or more$
|
||||
^(rem)?\W*contributor license agreements\. See the NOTICE file distributed with$
|
||||
^(rem)?\W*this work for additional information regarding copyright ownership\.$
|
||||
^(rem)?\W*The ASF licenses this file to You under the Apache License, Version 2\.0$
|
||||
^(rem)?\W*\(the "License"\); you may not use this file except in compliance with$
|
||||
^(rem)?\W*the License\. You may obtain a copy of the License at$
|
||||
^(rem)?\W*$
|
||||
^(rem)?\W*http://www.apache.org/licenses/LICENSE-2\.0$
|
||||
^(rem)?\W*$
|
||||
^(rem)?\W*Unless required by applicable law or agreed to in writing, software$
|
||||
^(rem)?\W*distributed under the License is distributed on an "AS IS" BASIS,$
|
||||
^(rem)?\W*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$
|
||||
^(rem)?\W*See the License for the specific language governing permissions and$
|
||||
^(rem)?\W*limitations under the License\.$
|
||||
^(rem)?\W*$
|
||||
37
res/checkstyle/javax-checkstyle.xml
Normal file
37
res/checkstyle/javax-checkstyle.xml
Normal file
@@ -0,0 +1,37 @@
|
||||
<?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 module PUBLIC
|
||||
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
|
||||
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
|
||||
<module name="Checker">
|
||||
<!-- When adding checks, keep to the order checks are listed under -->
|
||||
<!-- 'Standard Checks' in the Checkstyle documentation: -->
|
||||
<!-- http://checkstyle.sourceforge.net/config_coding.html -->
|
||||
|
||||
<!-- Cache what has passed checkstyle -->
|
||||
<property name="cacheFile"
|
||||
value="${tomcat.output}/res/checkstyle/cachefile-javax-checkstyle.xml"/>
|
||||
|
||||
<!-- Specific checks for javax.* packages -->
|
||||
|
||||
<module name="TreeWalker">
|
||||
<module name="ImportControl">
|
||||
<property name="file" value="${basedir}/res/checkstyle/javax-import-control.xml"/>
|
||||
</module>
|
||||
</module>
|
||||
</module>
|
||||
74
res/checkstyle/javax-import-control.xml
Normal file
74
res/checkstyle/javax-import-control.xml
Normal file
@@ -0,0 +1,74 @@
|
||||
<?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 import-control PUBLIC
|
||||
"-//Puppy Crawl//DTD Import Control 1.1//EN"
|
||||
"http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
|
||||
|
||||
<import-control pkg="javax">
|
||||
<allow pkg="java"/>
|
||||
<subpackage name="annotation">
|
||||
<allow pkg="javax.annotation"/>
|
||||
</subpackage>
|
||||
<subpackage name="ejb">
|
||||
<allow pkg="javax.ejb"/>
|
||||
</subpackage>
|
||||
<subpackage name="el">
|
||||
<allow pkg="javax.el"/>
|
||||
</subpackage>
|
||||
<subpackage name="mail">
|
||||
<allow pkg="javax.mail"/>
|
||||
</subpackage>
|
||||
<subpackage name="persistence">
|
||||
<allow pkg="javax.persistence"/>
|
||||
</subpackage>
|
||||
<subpackage name="security">
|
||||
<subpackage name="auth">
|
||||
<subpackage name="message">
|
||||
<allow pkg="javax.crypto" />
|
||||
<allow class="javax.security.auth.Subject"/>
|
||||
<allow pkg="javax.security.auth.callback"/>
|
||||
<allow pkg="javax.security.auth.login"/>
|
||||
<allow pkg="javax.security.auth.x500"/>
|
||||
<disallow pkg="javax.security.auth.message.callback" local-only="true"/>
|
||||
<disallow pkg="javax.security.auth.message.config" local-only="true"/>
|
||||
<disallow pkg="javax.security.auth.message.module" local-only="true"/>
|
||||
<subpackage name="config">
|
||||
<allow class="javax.security.auth.AuthPermission"/>
|
||||
<allow pkg="javax.security.auth.message"/>
|
||||
</subpackage>
|
||||
<subpackage name="module">
|
||||
<allow pkg="javax.security.auth.message"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="servlet">
|
||||
<allow pkg="javax.servlet"/>
|
||||
<disallow pkg="javax.servlet.jsp" local-only="true"/>
|
||||
<subpackage name="jsp">
|
||||
<allow pkg="javax.el"/>
|
||||
<allow pkg="javax.servlet.jsp"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="websocket">
|
||||
<allow pkg="javax.websocket"/>
|
||||
</subpackage>
|
||||
<subpackage name="xml.ws">
|
||||
<allow pkg="javax.xwl.ws"/>
|
||||
</subpackage>
|
||||
</import-control>
|
||||
37
res/checkstyle/org-checkstyle.xml
Normal file
37
res/checkstyle/org-checkstyle.xml
Normal file
@@ -0,0 +1,37 @@
|
||||
<?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 module PUBLIC
|
||||
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
|
||||
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
|
||||
<module name="Checker">
|
||||
<!-- When adding checks, keep to the order checks are listed under -->
|
||||
<!-- 'Standard Checks' in the Checkstyle documentation: -->
|
||||
<!-- http://checkstyle.sourceforge.net/config_coding.html -->
|
||||
|
||||
<!-- Cache what has passed checkstyle -->
|
||||
<property name="cacheFile"
|
||||
value="${tomcat.output}/res/checkstyle/cachefile-org-checkstyle.xml"/>
|
||||
|
||||
<!-- Specific checks for org.* packages -->
|
||||
|
||||
<module name="TreeWalker">
|
||||
<module name="ImportControl">
|
||||
<property name="file" value="${basedir}/res/checkstyle/org-import-control.xml"/>
|
||||
</module>
|
||||
</module>
|
||||
</module>
|
||||
180
res/checkstyle/org-import-control.xml
Normal file
180
res/checkstyle/org-import-control.xml
Normal file
@@ -0,0 +1,180 @@
|
||||
<?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 import-control PUBLIC
|
||||
"-//Puppy Crawl//DTD Import Control 1.1//EN"
|
||||
"http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
|
||||
|
||||
<import-control pkg="org.apache">
|
||||
<!-- Anything in J2SE is OK but need to list javax by package as not
|
||||
all javax packages are in J2SE -->
|
||||
<allow pkg="java"/>
|
||||
<allow pkg="javax.crypto"/>
|
||||
<allow class="javax.imageio.ImageIO"/>
|
||||
<allow pkg="javax.management"/>
|
||||
<allow pkg="javax.naming"/>
|
||||
<allow pkg="javax.net"/>
|
||||
<allow pkg="javax.rmi"/>
|
||||
<allow pkg="javax.security"/>
|
||||
<allow pkg="javax.sql"/>
|
||||
<allow pkg="javax.xml"/>
|
||||
<allow pkg="org.w3c.dom"/>
|
||||
<allow pkg="org.xml.sax"/>
|
||||
<allow pkg="org.ietf.jgss"/>
|
||||
<subpackage name="catalina">
|
||||
<allow pkg="javax.annotation"/>
|
||||
<allow pkg="javax.ejb"/>
|
||||
<allow pkg="javax.persistence"/>
|
||||
<allow pkg="javax.servlet"/>
|
||||
<allow pkg="org.apache.catalina"/>
|
||||
<disallow pkg="org.apache.catalina.ha"/>
|
||||
<disallow pkg="org.apache.catalina.tribes"/>
|
||||
<allow pkg="org.apache.coyote"/>
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<allow pkg="org.apache.naming"/>
|
||||
<allow pkg="org.apache.tomcat"/>
|
||||
<subpackage name="ant">
|
||||
<allow pkg="org.apache.tools.ant"/>
|
||||
<allow class="org.apache.tomcat.util.Base64"/>
|
||||
<disallow pkg="javax.annotation"/>
|
||||
<disallow pkg="javax.ejb"/>
|
||||
<disallow pkg="javax.persistence"/>
|
||||
<disallow pkg="javax.servlet"/>
|
||||
<disallow pkg="org.apache.coyote"/>
|
||||
<disallow pkg="org.apache.juli"/>
|
||||
<disallow pkg="org.apache.naming"/>
|
||||
</subpackage>
|
||||
<subpackage name="ha">
|
||||
<disallow pkg="javax.annotation"/>
|
||||
<disallow pkg="javax.ejb"/>
|
||||
<disallow pkg="javax.persistence"/>
|
||||
<disallow pkg="org.apache.coyote"/>
|
||||
<disallow pkg="org.apache.naming"/>
|
||||
<allow pkg="org.apache.catalina.ha"/>
|
||||
<allow pkg="org.apache.catalina.tribes"/>
|
||||
</subpackage>
|
||||
<subpackage name="storeconfig">
|
||||
<allow pkg="org.apache.catalina.ha"/>
|
||||
<allow pkg="org.apache.catalina.tribes"/>
|
||||
</subpackage>
|
||||
<subpackage name="tribes">
|
||||
<disallow pkg="javax.annotation"/>
|
||||
<disallow pkg="javax.ejb"/>
|
||||
<disallow pkg="javax.persistence"/>
|
||||
<disallow pkg="javax.servlet"/>
|
||||
<disallow pkg="org\.apache\.catalina(?!\.tribes).*" regex="true"/>
|
||||
<disallow pkg="org.apache.coyote"/>
|
||||
<disallow pkg="org.apache.naming"/>
|
||||
<disallow pkg="org.apache.tomcat"/>
|
||||
<allow pkg="org.apache.catalina.tribes"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="coyote">
|
||||
<allow pkg="javax.servlet"/>
|
||||
<allow pkg="org.apache.coyote"/>
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<allow pkg="org.apache.tomcat"/>
|
||||
<allow pkg="org.apache.tomcat.jni"/>
|
||||
<allow pkg="org.apache.tomcat.util"/>
|
||||
</subpackage>
|
||||
<subpackage name="el">
|
||||
<allow pkg="javax.el"/>
|
||||
<allow pkg="org.apache.el"/>
|
||||
</subpackage>
|
||||
<subpackage name="jasper">
|
||||
<allow pkg="javax.el"/>
|
||||
<allow pkg="javax.servlet"/>
|
||||
<allow pkg="org.apache.el"/>
|
||||
<allow pkg="org.apache.jasper"/>
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<allow pkg="org.apache.tomcat" exact-match="true"/>
|
||||
<allow pkg="org.apache.tomcat.util.descriptor"/>
|
||||
<allow pkg="org.apache.tomcat.util.scan"/>
|
||||
<allow pkg="org.apache.tomcat.util.security"/>
|
||||
<allow pkg="org.apache.tools.ant"/>
|
||||
<allow pkg="org.eclipse.jdt"/>
|
||||
</subpackage>
|
||||
<subpackage name="juli">
|
||||
<allow pkg="org.apache.juli"/>
|
||||
</subpackage>
|
||||
<subpackage name="naming">
|
||||
<allow pkg="javax.mail"/>
|
||||
<allow pkg="javax.wsdl"/>
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<allow pkg="org.apache.naming"/>
|
||||
<allow class="org.apache.tomcat.util.buf.UDecoder"/>
|
||||
<allow class="org.apache.tomcat.util.buf.UEncoder"/>
|
||||
<allow class="org.apache.tomcat.util.http.FastHttpDateFormat"/>
|
||||
<allow class="org.apache.tomcat.util.http.RequestUtil"/>
|
||||
<subpackage name="factory.webservices">
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="tomcat">
|
||||
<allow pkg="javax.servlet"/>
|
||||
<subpackage name="buildutil">
|
||||
<allow pkg="org.apache.tools.ant"/>
|
||||
<allow pkg="org.apache.tomcat.util"/>
|
||||
</subpackage>
|
||||
<subpackage name="dbcp">
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<subpackage name="dbcp2">
|
||||
<allow pkg="org.apache.tomcat.dbcp.dbcp2"/>
|
||||
<allow pkg="org.apache.tomcat.dbcp.pool2"/>
|
||||
</subpackage>
|
||||
<subpackage name="pool2">
|
||||
<subpackage name="impl">
|
||||
<allow pkg="org.apache.tomcat.dbcp.pool2"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="jni">
|
||||
<subpackage name="socket">
|
||||
<allow pkg="org.apache.tomcat.jni"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="util">
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<allow pkg="org.apache.tomcat.jni"/>
|
||||
<allow pkg="org.apache.tomcat.util"/>
|
||||
<disallow pkg="org.apache.tomcat.util.scan"/>
|
||||
<subpackage name="descriptor">
|
||||
<allow pkg="org.apache.tomcat.util.scan"/>
|
||||
<allow pkg="org.apache.tomcat" exact-match="true"/>
|
||||
</subpackage>
|
||||
<subpackage name="scan">
|
||||
<allow pkg="org.apache.tomcat" exact-match="true"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
<subpackage name="websocket">
|
||||
<allow pkg="javax.websocket"/>
|
||||
<allow pkg="org.apache.juli"/>
|
||||
<allow pkg="org.apache.tomcat"/>
|
||||
<allow pkg="org.apache.tomcat.util"/>
|
||||
<!-- Ideally want to remove this -->
|
||||
<allow pkg="org.apache.tomcat.websocket.pojo"/>
|
||||
<disallow pkg="javax.servlet"/>
|
||||
<subpackage name="pojo">
|
||||
<allow pkg="org.apache.tomcat.websocket"/>
|
||||
</subpackage>
|
||||
<subpackage name="server">
|
||||
<allow pkg="javax.servlet"/>
|
||||
<allow pkg="org.apache.coyote.http11.upgrade"/>
|
||||
<allow pkg="org.apache.tomcat.websocket"/>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
</subpackage>
|
||||
</import-control>
|
||||
31
res/cobertura/logback.xml
Normal file
31
res/cobertura/logback.xml
Normal file
@@ -0,0 +1,31 @@
|
||||
<?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.
|
||||
-->
|
||||
<configuration>
|
||||
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<!-- encoders are assigned the type
|
||||
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
|
||||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
</configuration>
|
||||
20
res/confinstall/tomcat-users_1.xml
Normal file
20
res/confinstall/tomcat-users_1.xml
Normal file
@@ -0,0 +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.
|
||||
-->
|
||||
<tomcat-users xmlns="http://tomcat.apache.org/xml"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
|
||||
version="1.0">
|
||||
23
res/confinstall/tomcat-users_2.xml
Normal file
23
res/confinstall/tomcat-users_2.xml
Normal file
@@ -0,0 +1,23 @@
|
||||
<!--
|
||||
NOTE: By default, no user is included in the "manager-gui" role required
|
||||
to operate the "/manager/html" web application. If you wish to use this app,
|
||||
you must define such a user - the username and password are arbitrary. It is
|
||||
strongly recommended that you do NOT use one of the users in the commented out
|
||||
section below since they are intended for use with the examples web
|
||||
application.
|
||||
-->
|
||||
<!--
|
||||
NOTE: The sample user and role entries below are intended for use with the
|
||||
examples web application. They are wrapped in a comment and thus are ignored
|
||||
when reading this file. If you wish to configure these users for use with the
|
||||
examples web application, do not forget to remove the <!.. ..> that surrounds
|
||||
them. You will also need to set the passwords to something appropriate.
|
||||
-->
|
||||
<!--
|
||||
<role rolename="tomcat"/>
|
||||
<role rolename="role1"/>
|
||||
<user username="tomcat" password="<must-be-changed>" roles="tomcat"/>
|
||||
<user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
|
||||
<user username="role1" password="<must-be-changed>" roles="role1"/>
|
||||
-->
|
||||
</tomcat-users>
|
||||
118
res/deployer/build.xml
Normal file
118
res/deployer/build.xml
Normal file
@@ -0,0 +1,118 @@
|
||||
<?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.
|
||||
-->
|
||||
<project name="Deployer" default="compile" basedir=".">
|
||||
|
||||
<property file="deployer.properties"/>
|
||||
|
||||
<!-- Configure the directory into which the web application is built -->
|
||||
<property name="build" value="${basedir}/build"/>
|
||||
|
||||
<!-- Configure the folder and context path for this application -->
|
||||
<property name="webapp" value="myapp"/>
|
||||
<property name="path" value="/myapp"/>
|
||||
|
||||
<!-- Configure properties to access the Manager application -->
|
||||
<property name="url" value="http://localhost:8080/manager/text"/>
|
||||
<property name="username" value="tomcat"/>
|
||||
<property name="password" value="tomcat"/>
|
||||
|
||||
<property name="webapp.path" value="${build}/webapp${path}"/>
|
||||
|
||||
<path id="deployer.classpath">
|
||||
<fileset dir="${basedir}/lib">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</path>
|
||||
|
||||
<!-- Configure the custom Ant tasks for the Manager application -->
|
||||
<taskdef resource="org/apache/catalina/ant/catalina.tasks"
|
||||
classpathref="deployer.classpath"/>
|
||||
|
||||
<!-- Executable Targets -->
|
||||
<target name="clean" description="Removes build directory">
|
||||
<delete dir="${build}" />
|
||||
</target>
|
||||
|
||||
<target name="compile" description="Compile web application"
|
||||
depends="clean">
|
||||
|
||||
<copy todir="${webapp.path}">
|
||||
<fileset dir="${webapp}" />
|
||||
</copy>
|
||||
|
||||
<jasper validateXml="false"
|
||||
uriroot="${webapp.path}"
|
||||
webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
|
||||
addWebXmlMappings="true"
|
||||
outputDir="${webapp.path}/WEB-INF/classes" />
|
||||
|
||||
<validator path="${webapp.path}" />
|
||||
|
||||
<mkdir dir="${webapp.path}/WEB-INF/classes"/>
|
||||
<mkdir dir="${webapp.path}/WEB-INF/lib"/>
|
||||
|
||||
<javac destdir="${webapp.path}/WEB-INF/classes"
|
||||
optimize="off"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
failonerror="false"
|
||||
srcdir="${webapp.path}/WEB-INF/classes"
|
||||
encoding="UTF-8"
|
||||
excludes="**/*.smap">
|
||||
<classpath>
|
||||
<fileset dir="${webapp.path}/WEB-INF/lib">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<fileset dir="${basedir}/lib">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
</classpath>
|
||||
<include name="**" />
|
||||
<exclude name="tags/**" />
|
||||
</javac>
|
||||
|
||||
<jar destfile="${webapp.path}.war"
|
||||
basedir="${webapp.path}" />
|
||||
|
||||
</target>
|
||||
|
||||
<target name="deploy" description="Deploy web application">
|
||||
<deploy url="${url}" username="${username}" password="${password}"
|
||||
path="${path}" war="${webapp.path}.war" update="true" />
|
||||
</target>
|
||||
|
||||
<target name="undeploy" description="Undeploy web application">
|
||||
<undeploy url="${url}" username="${username}" password="${password}"
|
||||
path="${path}"/>
|
||||
</target>
|
||||
|
||||
<!-- Webapp lifecycle control -->
|
||||
<target name="start" description="Start web application">
|
||||
<start url="${url}" username="${username}" password="${password}"
|
||||
path="${path}"/>
|
||||
</target>
|
||||
<target name="reload" description="Reload web application">
|
||||
<reload url="${url}" username="${username}" password="${password}"
|
||||
path="${path}"/>
|
||||
</target>
|
||||
<target name="stop" description="Stop web application">
|
||||
<stop url="${url}" username="${username}" password="${password}"
|
||||
path="${path}"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
2103
res/findbugs/filter-false-positives.xml
Normal file
2103
res/findbugs/filter-false-positives.xml
Normal file
File diff suppressed because it is too large
Load Diff
BIN
res/header.bmp
Normal file
BIN
res/header.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
30
res/ide-support/coding-style.txt
Normal file
30
res/ide-support/coding-style.txt
Normal file
@@ -0,0 +1,30 @@
|
||||
================================================================================
|
||||
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.
|
||||
================================================================================
|
||||
|
||||
Best practice, fit in with the style that is already there. However, things have
|
||||
evolved over time so there are some variations across the project; use your
|
||||
judgement.
|
||||
|
||||
There is a validate build target that performs checks using tools like checkstyle.
|
||||
This is off by default but can be enabled by setting "execute.validate=true" in
|
||||
your build.properties file.
|
||||
|
||||
This directory contains support files for various IDEs that can help configure
|
||||
your development environment.
|
||||
|
||||
Some guidelines:
|
||||
* Do not rely on Java's autoboxing - perform conversions explicitly
|
||||
33
res/ide-support/eclipse/eclipse.classpath
Normal file
33
res/ide-support/eclipse/eclipse.classpath
Normal file
@@ -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.
|
||||
-->
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="java"/>
|
||||
<classpathentry excluding="deployment/|tld/|webapp*/|webresources/" kind="src" path="test"/>
|
||||
<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
||||
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/wsdl4j-1.6.3/wsdl4j-1.6.3.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.6.3/ecj-4.6.3.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/hamcrest-1.3/hamcrest-core-1.3.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/cglib-2.2.2/cglib-nodep-2.2.2.jar"/>
|
||||
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/objenesis-1.2/objenesis-1.2.jar"/>
|
||||
<classpathentry kind="output" path=".settings/output"/>
|
||||
</classpath>
|
||||
33
res/ide-support/eclipse/eclipse.project
Normal file
33
res/ide-support/eclipse/eclipse.project
Normal file
@@ -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.
|
||||
-->
|
||||
<projectDescription>
|
||||
<name>tomcat-8.5.x</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
130
res/ide-support/eclipse/java-compiler-errors-warnings.txt
Normal file
130
res/ide-support/eclipse/java-compiler-errors-warnings.txt
Normal file
@@ -0,0 +1,130 @@
|
||||
================================================================================
|
||||
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.
|
||||
================================================================================
|
||||
|
||||
# Java -> Compiler -> Errors/Warnings
|
||||
=======================================
|
||||
|
||||
The following settings are for Oxygen (Eclipse 4.13)
|
||||
W = Warning
|
||||
I = Ignore
|
||||
E = Error
|
||||
|
||||
Code style
|
||||
- Non-static access to static member - W
|
||||
- Indirect access to static member - I
|
||||
- Unqualified access to instance field - I
|
||||
- Access to a non-accessible member... - I
|
||||
- Parameter assignment - I
|
||||
- Non-externalized strings - I
|
||||
- Undocumented empty block - I
|
||||
- Resource not managed via try-with-resource (1.7 or higher) - I
|
||||
- Method with a constructor name - W
|
||||
- Method can be static - I
|
||||
- Method can potentially be static - I
|
||||
|
||||
Potential programming problems
|
||||
- All - W
|
||||
except the following:
|
||||
|
||||
- Incomplete 'switch' cases on enum - W
|
||||
[ ] Signal even if 'default' case exists
|
||||
- 'switch' is missing 'default' case - I
|
||||
- Potential resource leak - I
|
||||
|
||||
Name shadowing and conflicts
|
||||
- Field declaration hides another... - I
|
||||
- Local variable declaration hides.. - I
|
||||
- Type parameter hides another type - W
|
||||
- Method does not override... - W
|
||||
- Interface method conflicts... - W
|
||||
|
||||
Deprecated and restricted API
|
||||
- Deprecated API - W
|
||||
([ ] on all additional check boxes)
|
||||
- Deprecated API marked for removal - W
|
||||
- Forbidden references - E
|
||||
- Discouraged reference - W
|
||||
|
||||
Modules
|
||||
- All - W
|
||||
|
||||
Unnecessary code
|
||||
- All - W
|
||||
([x] on all additional check boxes)
|
||||
except the following:
|
||||
|
||||
- Value of exception parameter is... - I
|
||||
- Unnecessary else - I
|
||||
|
||||
Generic types
|
||||
- All - W
|
||||
[ ] Ignore unavoidable generic type problems
|
||||
|
||||
Annotations
|
||||
- All - W
|
||||
([x] on all additional check boxes)
|
||||
|
||||
Null analysis
|
||||
- Null pointer access - W
|
||||
- Potential null pointer access - W
|
||||
- Redundant null check - W
|
||||
[ ] Include 'assert' in null analysis
|
||||
[ ] Enable annotation-based null analysis
|
||||
|
||||
Note: The list of codes supported in @SuppressWarnings annotation in
|
||||
Eclipse IDE is documented here:
|
||||
|
||||
3.6: http://help.eclipse.org/helios/topic/org.eclipse.jdt.doc.isv/guide/jdt_api_compile.htm
|
||||
3.7: http://help.eclipse.org/indigo/topic/org.eclipse.jdt.doc.user/tasks/task-suppress_warnings.htm
|
||||
4.2: http://help.eclipse.org/juno/topic/org.eclipse.jdt.doc.user/tasks/task-suppress_warnings.htm
|
||||
|
||||
|
||||
# Java -> Compiler -> Javadoc
|
||||
=============================
|
||||
|
||||
Enable 'Process Javadoc comments'
|
||||
- Malformed Javadoc comments - W
|
||||
- Only consider members visible as - Public
|
||||
[X] Validate tag arguments
|
||||
[ ] Report non-visible references
|
||||
[X] Report deprecated references
|
||||
- Missing tag descriptions - Validate all standard tags
|
||||
- Missing Javadoc tags - W
|
||||
- Only consider members visible as - Public
|
||||
[X] - Ignore in overriding and implementing methods
|
||||
[ ] - Ignore method type parameters
|
||||
- Missing Javadoc comments - I
|
||||
|
||||
|
||||
# Java -> Code Style -> Organize Imports
|
||||
==========================================
|
||||
|
||||
The following configuration of "Organize Imports" setting can be
|
||||
recommended for a quick setup. The order is enforced by checkstyle, so for
|
||||
the authoritative definition look at <module name="ImportOrder"> in
|
||||
res/checkstyle/checkstyle.xml
|
||||
|
||||
- java
|
||||
- javax
|
||||
- async
|
||||
- jsp2
|
||||
- [static] org.junit
|
||||
- org.junit
|
||||
- [static] org
|
||||
- org
|
||||
- com
|
||||
- util
|
||||
@@ -0,0 +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.
|
||||
# -----------------------------------------------------------------------------
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
29
res/ide-support/eclipse/start-tomcat.launch
Normal file
29
res/ide-support/eclipse/start-tomcat.launch
Normal file
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||
<listEntry value="/tomcat-8.5.x/java/org/apache/catalina/startup/Bootstrap.java"/>
|
||||
</listAttribute>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||
<listEntry value="1"/>
|
||||
</listAttribute>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.catalina.startup.Bootstrap"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="start"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tomcat-8.5.x"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcatalina.home=${project_loc:/tomcat-8.5.x/java/org/apache/catalina/startup/Bootstrap.java}/output/build"/>
|
||||
</launchConfiguration>
|
||||
29
res/ide-support/eclipse/stop-tomcat.launch
Normal file
29
res/ide-support/eclipse/stop-tomcat.launch
Normal file
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||
<listEntry value="/tomcat-8.5.x/java/org/apache/catalina/startup/Bootstrap.java"/>
|
||||
</listAttribute>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||
<listEntry value="1"/>
|
||||
</listAttribute>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.catalina.startup.Bootstrap"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="stop"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tomcat-8.5.x"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcatalina.home=${project_loc:/tomcat-8.5.x/java/org/apache/catalina/startup/Bootstrap.java}/output/build"/>
|
||||
</launchConfiguration>
|
||||
22
res/ide-support/idea/misc.xml
Normal file
22
res/ide-support/idea/misc.xml
Normal file
@@ -0,0 +1,22 @@
|
||||
<?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.
|
||||
-->
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/.idea/output" />
|
||||
</component>
|
||||
</project>
|
||||
24
res/ide-support/idea/modules.xml
Normal file
24
res/ide-support/idea/modules.xml
Normal file
@@ -0,0 +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.
|
||||
-->
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/tomcat.iml" filepath="$PROJECT_DIR$/.idea/tomcat.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
143
res/ide-support/netbeans/README.txt
Normal file
143
res/ide-support/netbeans/README.txt
Normal file
@@ -0,0 +1,143 @@
|
||||
================================================================================
|
||||
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.
|
||||
================================================================================
|
||||
|
||||
|
||||
Building and Debugging Apache Tomcat under NetBeans
|
||||
|
||||
|
||||
Unlike other IDE's, NetBeans is a pure java swing application. It uses
|
||||
Apache Ant to build its projects, and works directly with the class files
|
||||
and jars created by the standard Apache Ant build.xml files. This strength
|
||||
is also its weakness when working with complex projects such as Tomcat that
|
||||
already have their own build.xml files, but which do not use the NetBeans
|
||||
templates.
|
||||
|
||||
Any of complex Ant project can still be managed under NetBeans by
|
||||
defining it to be something called a Free-Form Project. However, because
|
||||
the build.xml does not conform to all the NetBeans naming and structural
|
||||
conventions, a certain amount of manual customisation is required to
|
||||
achieve a useful level of integration.
|
||||
|
||||
|
||||
1. NetBeans can open a Tomcat source tree as a Free-Form Project, which
|
||||
will allow you to edit, build, and debug Tomcat and its unit tests
|
||||
within the workbench. Even with NetBeans 7.1, integration of a project
|
||||
as complex as Tomcat requires significant configuration. The
|
||||
configuration involves dealing with several quirky aspects of the way
|
||||
NetBeans manages this kind of project. Before you try to open Tomcat
|
||||
as a NetBeans project, you are strongly recommended to successfully
|
||||
build and run the tests using Apache Ant from a command prompt!
|
||||
(see BUILDING.txt in the Tomcat source root directory).
|
||||
|
||||
2. Once Tomcat has been built, you can install the default NetBeans
|
||||
project configuration by running the following build target:
|
||||
|
||||
ant ide-netbeans
|
||||
|
||||
This uses the Tomcat build.xml to create a new directory called
|
||||
nbproject (this name is reserved by NetBeans). The nbproject directory
|
||||
will then be primed with a self-consistent set of default definitions
|
||||
sufficient to open Tomcat as a Free-Form Project under NetBeans.
|
||||
|
||||
Note: if you ever open the Project Properties from the NetBeans context
|
||||
menu, even without making any changes, there is a significant risk
|
||||
that NetBeans will modify one or more of these files. You can
|
||||
restore the Tomcat default files at any time by running this target:
|
||||
|
||||
ant ide-netbeans-replace
|
||||
|
||||
Only the default files will be overwritten, so any other content
|
||||
such as your own local files, and the NetBeans private directory,
|
||||
will not be affected.
|
||||
|
||||
3. NetBeans needs to know where to find the directory where you keep the
|
||||
Tomcat dependencies jars. If you have successfully built Tomcat from
|
||||
a command prompt, you will probably have assigned the base.path
|
||||
property in your build.properties file.
|
||||
|
||||
Warning: The support for Tomcat in NetBeans will detect and use this
|
||||
property. However, if you have left it to default, you MUST
|
||||
still define this path in the nb-tomcat-project.properties file!
|
||||
|
||||
Note: The current support for Tomcat in NetBeans does not include the
|
||||
components in the modules directory (e.g. tomcat-lite).
|
||||
|
||||
4. Start NetBeans... once it has initialised and scanned your other open
|
||||
projects, just open an existing project and select the location of
|
||||
Tomcat. NetBeans will recognise it as a Free-Form project, then read and
|
||||
validate the nbproject/project.xml file. This file defines how to relate
|
||||
targets in build.xml to NetBeans project-related actions. It also tells
|
||||
NetBeans what classpaths to use for validation and code completion of
|
||||
the various source directories.
|
||||
|
||||
Warning: do not be tempted to casually click the properties menu item
|
||||
for the Tomcat project. NetBeans might change the contents
|
||||
of these files. (The NetBeans New Project wizard also
|
||||
automatically creates a Free-Form project.xml which carries
|
||||
this same warning).
|
||||
|
||||
Note: the Tomcat project should open successfully and, after the source
|
||||
packages have been scanned, they should not be flagged with any
|
||||
syntax errors (except in some of the jsp bug unit tests).
|
||||
|
||||
5. Verify your work by running the NetBeans project Clean action. It
|
||||
should complete successfully. Next, run the Build action (which calls
|
||||
the Tomcat deploy build target) and confirm that it successfully
|
||||
compiles the Tomcat source files and creates the jars.
|
||||
|
||||
6. Next, navigate down to one of the test files and select the compile
|
||||
action. This will compile only your chosen file, although the compiler
|
||||
will find there is nothing to do unless you have deliberately changed it.
|
||||
|
||||
Note: if you have changed any of the Tomcat source files, they will be
|
||||
recompiled first. However, any changes to test files will not be compiled
|
||||
unless you select those file and explicitly compile them. If you have any
|
||||
doubts about dependencies between unit test classes, you can use the
|
||||
compileAllTests project action and any files that have been changed
|
||||
will be detected and compiled.
|
||||
|
||||
7. You can run an individual unit test class by selecting it and choosing
|
||||
the "run selected file" NetBeans action. As the test runs, NetBeans
|
||||
should open a unit test results pane that shows you the progress and
|
||||
final outcome of the test (Note: this feature does not currently work).
|
||||
|
||||
8. Next, open the source of the unit test that ran successfully in step 7.
|
||||
Set a breakpoint in one of the test cases, then request NetBeans to
|
||||
debug that class. The class will start running, and then will stop as
|
||||
it hits your breakpoint. You should be able to display variables, then
|
||||
navigate the call stack to open the source files of each method. You
|
||||
should also be able to step through the code. Use the continue icon
|
||||
to resume execution. When the test completes, you should see the same
|
||||
jUnit test result panel as in step 7 (Note: this feature does not
|
||||
currently work).
|
||||
|
||||
9. You can also use your Tomcat NetBeans Free-Form project to debug an
|
||||
external Tomcat instance that is executing on the same, or a different
|
||||
machine. (Obviously, the external instance must be running the same
|
||||
version of the source code!)
|
||||
|
||||
The external Tomcat instance must be started with its jvm enabled for
|
||||
debugging by adding extra arguments to JAVA_OPTS, e.g.
|
||||
-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
|
||||
|
||||
To debug the external Tomcat instance under NetBeans, select the
|
||||
"attach debugger" choice from the debug menu. Accept the default
|
||||
JPDA debugger with the SocketAttach connector and the dt_socket
|
||||
transport. Specify the hostname and port where the Tomcat jvm is
|
||||
listening. Your NetBeans workbench should then connect to the external
|
||||
Tomcat and display the running threads. You can now set breakpoints and
|
||||
begin debugging.
|
||||
50
res/ide-support/netbeans/nb-tomcat-build.properties
Normal file
50
res/ide-support/netbeans/nb-tomcat-build.properties
Normal file
@@ -0,0 +1,50 @@
|
||||
#================================================================================
|
||||
# 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.
|
||||
#================================================================================
|
||||
|
||||
# NetBeans will automatically set the project basedir "." correctly to
|
||||
# the parent directory of the nbproject subdirectory
|
||||
#
|
||||
# the Tomcat build.properties file defines the confusingly-named "base.path"
|
||||
# property, which is where the Tomcat dependencies are downloaded
|
||||
|
||||
|
||||
# the following properties will be generated by build.xml, but are also needed
|
||||
# by the NetBeans targets which do not have access to those properties
|
||||
# as-yet not created by the main Ant build.
|
||||
|
||||
tomcat.output=./output
|
||||
tomcat.classes=${tomcat.output}/classes
|
||||
tomcat.build=${tomcat.output}/build
|
||||
test.classes=${tomcat.output}/testclasses
|
||||
test.temp=${tomcat.output}/test-tmp
|
||||
|
||||
nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
|
||||
|
||||
# it is not possible to retrieve the classpaths from the build to
|
||||
# use in the NetBeans targets, so they must be explicitly declared
|
||||
|
||||
nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
|
||||
|
||||
# Extra properties used by the Tomcat project additional NetBeans targets.
|
||||
|
||||
# configure JUnit test results so that NetBeans can intercept and display them
|
||||
#
|
||||
nb-junit.formatter=-Dorg.apache.juli.formatter=java.util.logging.SimpleFormatter
|
||||
nb-junit.formatter.type=plain
|
||||
nb-junit.formatter.usefile=true
|
||||
nb-junit.formatter.extension=.txt
|
||||
|
||||
33
res/ide-support/netbeans/nb-tomcat-project.properties
Normal file
33
res/ide-support/netbeans/nb-tomcat-project.properties
Normal file
@@ -0,0 +1,33 @@
|
||||
#================================================================================
|
||||
# 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.
|
||||
#================================================================================
|
||||
|
||||
# NetBeans will automatically set the project basedir "." correctly to
|
||||
# the parent directory of the nbproject subdirectory
|
||||
#
|
||||
# The Tomcat build.properties file defines the confusingly-named "base.path"
|
||||
# property, which is where the Tomcat dependencies are downloaded.
|
||||
# If you have followed the Tomcat recommendation and explicitly coded
|
||||
# a path, it will be used by NetBeans. However, if you have left it to
|
||||
# default you MUST explicitly code it here, e.g.
|
||||
#base.path=/home/yourname/sandboxApache/tomcat8-dependencies
|
||||
|
||||
# NetBeans syntax checking and code completion of the main source files
|
||||
# needs all the Ant libraries to be on the classpath. This is achieved
|
||||
# by the standard build.xml, but needs to be duplicated for NetBeans.
|
||||
#
|
||||
ant.includes=${ant.home}/lib/ant.jar:${ant.home}/lib/ant-apache-bcel.jar:${ant.home}/lib/ant-launcher.jar:${ant.home}/lib/ant-apache-oro.jar:${ant.home}/lib/ant-apache-regexp.jar:${ant.home}/lib/ant-jmf.jar:${ant.home}/lib/ant-jsch.jar:${ant.home}/lib/ant-apache-bsf.jar:${ant.home}/lib/ant-apache-log4j.jar:${ant.home}/lib/ant-apache-resolver.jar:${ant.home}/lib/ant-apache-xalan2.jar:${ant.home}/lib/ant-commons-net.jar:${ant.home}/lib/ant-javamail.jar:${ant.home}/lib/ant-junit.jar:${ant.home}/lib/ant-swing.jar:${ant.home}/lib/ant-testutil.jar:${ant.home}/lib/junit.jar:${ant.home}/lib/ant-commons-logging.jar
|
||||
|
||||
148
res/ide-support/netbeans/nb-tomcat.xml
Normal file
148
res/ide-support/netbeans/nb-tomcat.xml
Normal file
@@ -0,0 +1,148 @@
|
||||
<?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.
|
||||
-->
|
||||
<!--
|
||||
Supplementary build targets for the Tomcat project under NetBeans.
|
||||
Use the project root as basedir to be consistent with standard build.
|
||||
-->
|
||||
<project basedir=".." name="Tomcat_8.0">
|
||||
|
||||
<!--
|
||||
load the standard and user Tomcat build properties now,
|
||||
so they can be used in the NetBeans-specific targets below.
|
||||
Note: inheritall==false will still pass all of these user
|
||||
properties to the Ant build targets of Tomcat.
|
||||
-->
|
||||
<property file="./build.properties"/>
|
||||
<property file="./build.properties.default"/>
|
||||
|
||||
<!-- load the extra NetBeans build properties for Tomcat, which can -->
|
||||
<!-- use the standard properties symbolic variables. -->
|
||||
<!-- Note: inheritall==false will still pass all of these user -->
|
||||
<!-- properties to the Ant build targets of Tomcat -->
|
||||
<property file="./nbproject/nb-tomcat-build.properties"/>
|
||||
|
||||
<target name="deploy">
|
||||
<ant target="deploy" inheritall="false"/>
|
||||
</target>
|
||||
|
||||
<target name="clean">
|
||||
<ant target="clean" inheritall="false"/>
|
||||
</target>
|
||||
|
||||
<target name="javadoc" depends="-package-project">
|
||||
<ant target="javadoc" inheritall="false"/>
|
||||
</target>
|
||||
|
||||
<target name="test" depends="-package-project">
|
||||
<ant target="test" inheritall="false"/>
|
||||
</target>
|
||||
|
||||
<target name="-package-project"
|
||||
description="ensure Tomcat is ready to use">
|
||||
<ant target="deploy" inheritall="false"/>
|
||||
</target>
|
||||
|
||||
<target name="-compile-all-tests"
|
||||
description="needed to prepare some dependencies">
|
||||
<ant target="test-compile" inheritall="false"/>
|
||||
</target>
|
||||
|
||||
<target name="compile-selected-files-in-test"
|
||||
depends="-package-project"
|
||||
description="compile one or more selected test (not main) classes">
|
||||
<fail unless="netbeans.home">This target can only run under NetBeans.</fail>
|
||||
<fail unless="files">Property 'files' must be set in project.xml.</fail>
|
||||
<echo level="verbose" message="compiling tests: ${files}"/>
|
||||
<echo level="verbose" message="compiling tests into: ${test.classes}"/>
|
||||
<mkdir dir="${test.classes}"/>
|
||||
<javac srcdir="test"
|
||||
destdir="${test.classes}"
|
||||
includes="${files}"
|
||||
debug="true"
|
||||
deprecation="${compile.deprecation}"
|
||||
source="${compile.source}"
|
||||
encoding="ISO-8859-1"
|
||||
includeantruntime="false">
|
||||
<classpath path="${nb-test.classpath}"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="test-selected-file"
|
||||
description="execute a single unit test class (-Dtest.entry=nnn)">
|
||||
<fail unless="test.entry"
|
||||
message="Property 'test.entry' must be set in project.xml."/>
|
||||
<!--
|
||||
the runtests macro runs a single test if test.entry is a class name
|
||||
Note: we must ONLY run one of the test targets, otherwise test-apr
|
||||
will run last and wipe out the test results!
|
||||
Note: the test targets all depend on deploy
|
||||
-->
|
||||
<ant target="test-nio" inheritall="false">
|
||||
<property name="junit.formatter.type" value="brief" />
|
||||
<property name="junit.formatter.usefile" value="false" />
|
||||
</ant>
|
||||
</target>
|
||||
|
||||
<target name="debug-selected-file-in-test"
|
||||
depends="-package-project"
|
||||
description="debug the single selected unit test class">
|
||||
<echo message="debugging test: ${test.entry}"/>
|
||||
<fail unless="netbeans.home">This target can only run under NetBeans.</fail>
|
||||
<fail unless="test.entry"
|
||||
message="Property 'test.entry' must be set in project.xml."/>
|
||||
<nbjpdastart name="${test.entry}"
|
||||
addressproperty="jpda.address"
|
||||
transport="dt_socket" >
|
||||
<classpath path="${nb-test.classpath}"/>
|
||||
<sourcepath>
|
||||
<path path="test"/>
|
||||
</sourcepath>
|
||||
</nbjpdastart>
|
||||
<junit printsummary="yes" fork="yes" dir="." showoutput="yes"
|
||||
errorproperty="test.result.error"
|
||||
failureproperty="test.result.failure"
|
||||
haltonfailure="${test.haltonfailure}" >
|
||||
|
||||
<jvmarg value="-Xdebug"/>
|
||||
<jvmarg value="-Xnoagent"/>
|
||||
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
|
||||
<jvmarg value="-Djava.compiler=none"/>
|
||||
|
||||
<jvmarg value="${test.jvmarg.egd}"/>
|
||||
<jvmarg value="-Djava.library.path=${test.apr.loc}"/>
|
||||
<jvmarg value="${nb-junit.formatter}"/>
|
||||
|
||||
<classpath path="${nb-test.classpath}" />
|
||||
|
||||
<sysproperty key="tomcat.test.temp" value="${test.temp}" />
|
||||
<sysproperty key="tomcat.test.tomcatbuild" value="${tomcat.build}" />
|
||||
<sysproperty key="tomcat.test.protocol" value="${nb-test.io-method}"/>
|
||||
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" />
|
||||
|
||||
<!-- define a non-file JUnit formatter for NetBeans to capture and display -->
|
||||
<formatter usefile="false" type="brief" />
|
||||
<!-- and also a file formatter for checking later -->
|
||||
<formatter type="${nb-junit.formatter.type}"
|
||||
usefile="${nb-junit.formatter.usefile}"
|
||||
extension="@NB-DBG${nb-junit.formatter.extension}"/>
|
||||
|
||||
<!-- run the chosen JUnit test class under the debugger -->
|
||||
<test todir="${tomcat.build}/logs" name="${test.entry}"/>
|
||||
</junit>
|
||||
</target>
|
||||
</project>
|
||||
197
res/ide-support/netbeans/project.xml
Normal file
197
res/ide-support/netbeans/project.xml
Normal file
@@ -0,0 +1,197 @@
|
||||
<?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.
|
||||
-->
|
||||
<!--
|
||||
Free-Form project definition for Tomcat under NetBeans.
|
||||
|
||||
Paths are all relative to the project root.
|
||||
|
||||
Warning: Do NOT use the NetBeans GUI Project Properties customizer
|
||||
for this project, otherwise you might trigger unwanted
|
||||
changes to this critical file, which must be maintained
|
||||
by the Tomcat developers!
|
||||
|
||||
Note: As specified in the BUILDING.txt file of Tomcat, the code completion
|
||||
classpaths below depend on the ANT_HOME environment
|
||||
variable being properly defined.
|
||||
-->
|
||||
<project xmlns="http://www.netbeans.org/ns/project/1">
|
||||
<type>org.netbeans.modules.ant.freeform</type>
|
||||
<configuration>
|
||||
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
|
||||
<!-- Do not use Project Properties customizer when editing this file manually. -->
|
||||
<name>Tomcat 8.0</name>
|
||||
<properties>
|
||||
<!-- load the local Tomcat build.properties, especially base.path. -->
|
||||
<property-file>./build.properties</property-file>
|
||||
<!-- prime some NetBeans build properties for Tomcat, which will -->
|
||||
<!-- also be defined in the standard properties. -->
|
||||
<property-file>./nbproject/nb-tomcat-project.properties</property-file>
|
||||
</properties>
|
||||
<folders>
|
||||
<source-folder>
|
||||
<label>java</label>
|
||||
<type>java</type>
|
||||
<location>java</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>webapps/docs/appdev/sample/src</label>
|
||||
<type>java</type>
|
||||
<location>webapps/docs/appdev/sample/src</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>modules/tomcat-lite/test</label>
|
||||
<type>java</type>
|
||||
<location>modules/tomcat-lite/test</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>test</label>
|
||||
<type>java</type>
|
||||
<location>test</location>
|
||||
</source-folder>
|
||||
</folders>
|
||||
<ide-actions>
|
||||
<!--
|
||||
Note: all NetBeans actions are delegated to an external
|
||||
script, so that Properties can be used consistently
|
||||
with the standard Tomcat build.
|
||||
-->
|
||||
<action name="build">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>deploy</target>
|
||||
</action>
|
||||
<action name="clean">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>clean</target>
|
||||
</action>
|
||||
<action name="javadoc">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>javadoc</target>
|
||||
</action>
|
||||
<action name="test">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>test</target>
|
||||
</action>
|
||||
<action name="rebuild">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>clean</target>
|
||||
<target>deploy</target>
|
||||
</action>
|
||||
<action name="compileAllTests">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>-compile-all-tests</target>
|
||||
</action>
|
||||
<action name="compile.single">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>compile-selected-files-in-test</target>
|
||||
<context>
|
||||
<property>files</property>
|
||||
<folder>test</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path</format>
|
||||
<arity>
|
||||
<separated-files>,</separated-files>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
<action name="run.single">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>test-selected-file</target>
|
||||
<context>
|
||||
<property>test.entry</property>
|
||||
<folder>test</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>java-name</format>
|
||||
<arity>
|
||||
<one-file-only/>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
<action name="debug.single">
|
||||
<script>nbproject/nb-tomcat.xml</script>
|
||||
<target>debug-selected-file-in-test</target>
|
||||
<context>
|
||||
<property>test.entry</property>
|
||||
<folder>test</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>java-name</format>
|
||||
<arity>
|
||||
<one-file-only/>
|
||||
</arity>
|
||||
</context>
|
||||
</action>
|
||||
</ide-actions>
|
||||
<view>
|
||||
<items>
|
||||
<source-folder style="packages">
|
||||
<label>java</label>
|
||||
<location>java</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>webapps/docs/appdev/sample/src</label>
|
||||
<location>webapps/docs/appdev/sample/src</location>
|
||||
</source-folder>
|
||||
<source-folder style="packages">
|
||||
<label>test</label>
|
||||
<location>test</location>
|
||||
</source-folder>
|
||||
<source-file>
|
||||
<location>build.xml</location>
|
||||
</source-file>
|
||||
</items>
|
||||
<context-menu>
|
||||
<ide-action name="build"/>
|
||||
<ide-action name="rebuild"/>
|
||||
<ide-action name="clean"/>
|
||||
<ide-action name="javadoc"/>
|
||||
<ide-action name="test"/>
|
||||
</context-menu>
|
||||
</view>
|
||||
<subprojects/>
|
||||
</general-data>
|
||||
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
|
||||
<!--
|
||||
Warning: the classpath elements used below CANNOT include any
|
||||
Properties because NetBeans will not expand them! Sadly,
|
||||
this means (with nb 7.2.1, at least) every path MUST be
|
||||
coded explicitly - with the potential for errors. These
|
||||
errors will be flagged in the project navigation and
|
||||
editors windows, although they will not affect the build
|
||||
or any special NetBeans targets, e.g. debugging.
|
||||
|
||||
Note: the classpath elements used below CAN include environment
|
||||
variables as Properties, e.g. ANT_HOME becomes ${ant.home}!
|
||||
-->
|
||||
<compilation-unit>
|
||||
<package-root>java</package-root>
|
||||
<classpath mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${ant.includes}/</classpath>
|
||||
<source-level>1.7</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>webapps/docs/appdev/sample/src</package-root>
|
||||
<classpath mode="compile">${base.path}/servletapi-2.3/servletapi-2.3.jar</classpath>
|
||||
<source-level>1.7</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>test</package-root>
|
||||
<unit-tests/>
|
||||
<classpath mode="compile">output/classes:output/testclasses:${base.path}/junit-4.12/junit-4.12.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar</classpath>
|
||||
<source-level>1.7</source-level>
|
||||
</compilation-unit>
|
||||
</java-data>
|
||||
</configuration>
|
||||
</project>
|
||||
37
res/maven/README.txt
Normal file
37
res/maven/README.txt
Normal file
@@ -0,0 +1,37 @@
|
||||
================================================================================
|
||||
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.
|
||||
================================================================================
|
||||
|
||||
General preparations before any publishing:
|
||||
1 - Generate a standard Tomcat release (ant release)
|
||||
2 - Copy mvn.properties.default to mvn.properties and adjust it as necessary.
|
||||
You will need to set asf.ldap.username and you'll probably need to set
|
||||
gpg.exec
|
||||
The other properties should be OK. Note: you will be prompted for your
|
||||
GPG pass-phrase and LDAP password when the script runs.
|
||||
|
||||
To publish a snapshot do the following:
|
||||
1 - ant -f mvn-pub.xml deploy-snapshot
|
||||
This populates
|
||||
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/
|
||||
|
||||
To release do the following:
|
||||
1 - ant -f mvn-pub.xml deploy-release
|
||||
that step creates a staging area in
|
||||
https://repository.apache.org/index.html#stagingRepositories
|
||||
2 - check the upload and then close the repository
|
||||
3 - include the repository in the VOTE thread
|
||||
4 - in https://repository.apache.org/index.html#stagingRepositories release it
|
||||
426
res/maven/mvn-pub.xml
Normal file
426
res/maven/mvn-pub.xml
Normal file
@@ -0,0 +1,426 @@
|
||||
<?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.
|
||||
-->
|
||||
<project name="Tomcat 8.5 Maven Deployment" default="" basedir="."
|
||||
xmlns:artifact="urn:maven-artifact-ant"
|
||||
xmlns:if="ant:if"
|
||||
xmlns:unless="ant:unless">
|
||||
<!--
|
||||
Built for using Maven Ant Tasks (version 2.1.0 is known to work)
|
||||
-->
|
||||
|
||||
<property file="${basedir}/mvn.properties"/>
|
||||
<property file="${basedir}/mvn.properties.default"/>
|
||||
<property name="local.repo" value="${user.home}/.m2/repository"/>
|
||||
|
||||
<target name="init-maven">
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="${maven-ant-tasks.loc}"/>
|
||||
<param name="destfile" value="${maven-ant-tasks.jar}"/>
|
||||
<param name="destdir" value="${maven-ant-tasks.home}"/>
|
||||
</antcall>
|
||||
|
||||
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
|
||||
uri="urn:maven-artifact-ant">
|
||||
<classpath>
|
||||
<pathelement location="${maven-ant-tasks.jar}" />
|
||||
</classpath>
|
||||
</typedef>
|
||||
</target>
|
||||
|
||||
<target name="maven-deploy" depends="init-maven">
|
||||
<!--cleanup-->
|
||||
<delete file="${pom}.tmp"/>
|
||||
<delete file="${pom}.asc"/>
|
||||
<delete file="${file}.asc"/>
|
||||
<delete file="${src}.asc"/>
|
||||
|
||||
<!--replace the version in the pom-->
|
||||
<copy file="${pom}" tofile="${pom}.tmp">
|
||||
<filterset>
|
||||
<filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
|
||||
<!--sign the jar, the source and the pom -->
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${file}" />
|
||||
<param name="file.out" value="${file}.asc" />
|
||||
</antcall>
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${src}" />
|
||||
<param name="file.out" value="${src}.asc" />
|
||||
</antcall>
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${pom}.tmp" />
|
||||
<param name="file.out" value="${pom}.asc" />
|
||||
</antcall>
|
||||
|
||||
<artifact:deploy file="${file}">
|
||||
<pom file="${pom}.tmp"/>
|
||||
<remoteRepository id="${maven.repo.repositoryId}" url="${maven.repo.url}">
|
||||
<authentication username="${asf.ldap.username}"
|
||||
password="${asf.ldap.password}"
|
||||
unless:set="maven.auth.useSettings" />
|
||||
</remoteRepository>
|
||||
<attach file="${file}.asc" type="jar.asc" if:set="gpg.passphrase"/>
|
||||
<attach file="${src}" classifier="sources" type="jar"/>
|
||||
<attach file="${src}.asc" classifier="sources" type="jar.asc" if:set="gpg.passphrase"/>
|
||||
<attach file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
|
||||
</artifact:deploy>
|
||||
|
||||
<delete file="${pom}.tmp"/>
|
||||
<delete file="${pom}.asc"/>
|
||||
<delete file="${file}.asc"/>
|
||||
<delete file="${src}.asc"/>
|
||||
</target>
|
||||
|
||||
<macrodef name="doMavenDeploy">
|
||||
<attribute name="artifactId"/>
|
||||
<attribute name="jarFileName" default="@{artifactId}.jar" />
|
||||
<attribute name="groupId" default="org.apache.tomcat" />
|
||||
<attribute name="file" default="${tomcat.lib.path}/@{jarFileName}" />
|
||||
<attribute name="pom" default="@{artifactId}.pom" />
|
||||
<attribute name="srcJarFileName" default="@{artifactId}-src.jar" />
|
||||
<attribute name="src" default="${tomcat.src.path}/@{srcJarFileName}" />
|
||||
<sequential>
|
||||
<antcall target="maven-deploy">
|
||||
<param name="file" value="@{file}"/>
|
||||
<param name="groupId" value="@{groupId}"/>
|
||||
<param name="artifactId" value="@{artifactId}"/>
|
||||
<param name="pom" value="${tomcat.pom.path}/@{pom}"/>
|
||||
<param name="src" value="@{src}"/>
|
||||
<param name="src.skip" value="@{src.skip}"/>
|
||||
</antcall>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="maven-deploy-nosrc" depends="init-maven">
|
||||
<!--cleanup-->
|
||||
<delete file="${pom}.tmp"/>
|
||||
<delete file="${pom}.asc"/>
|
||||
<delete file="${file}.asc"/>
|
||||
|
||||
<!--replace the version in the pom-->
|
||||
<copy file="${pom}" tofile="${pom}.tmp">
|
||||
<filterset>
|
||||
<filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
|
||||
<!--sign the file and pom -->
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${file}" />
|
||||
<param name="file.out" value="${file}.asc" />
|
||||
</antcall>
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${pom}.tmp" />
|
||||
<param name="file.out" value="${pom}.asc" />
|
||||
</antcall>
|
||||
|
||||
<artifact:deploy file="${file}">
|
||||
<pom file="${pom}.tmp"/>
|
||||
<remoteRepository id="${maven.repo.repositoryId}" url="${maven.repo.url}">
|
||||
<authentication username="${asf.ldap.username}"
|
||||
password="${asf.ldap.password}"
|
||||
unless:set="maven.auth.useSettings"/>
|
||||
</remoteRepository>
|
||||
<attach file="${file}.asc" type="jar.asc" if:set="gpg.passphrase"/>
|
||||
<attach file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
|
||||
</artifact:deploy>
|
||||
|
||||
<delete file="${pom}.tmp"/>
|
||||
<delete file="${pom}.asc"/>
|
||||
<delete file="${file}.asc"/>
|
||||
</target>
|
||||
|
||||
<macrodef name="doMavenDeployNoSrc">
|
||||
<attribute name="artifactId"/>
|
||||
<attribute name="jarFileName" default="@{artifactId}.jar" />
|
||||
<attribute name="groupId" default="org.apache.tomcat" />
|
||||
<attribute name="file" default="${tomcat.lib.path}/@{jarFileName}" />
|
||||
<attribute name="pom" default="@{artifactId}.pom" />
|
||||
<sequential>
|
||||
<antcall target="maven-deploy-nosrc">
|
||||
<param name="file" value="@{file}"/>
|
||||
<param name="groupId" value="@{groupId}"/>
|
||||
<param name="artifactId" value="@{artifactId}"/>
|
||||
<param name="pom" value="${tomcat.pom.path}/@{pom}"/>
|
||||
</antcall>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="maven-deploy-binaries" depends="init-maven">
|
||||
<!--cleanup-->
|
||||
<delete file="${pom}.tmp"/>
|
||||
<delete file="${pom}.asc"/>
|
||||
<delete file="${file}.zip.asc"/>
|
||||
<delete file="${file}.tar.gz.asc"/>
|
||||
|
||||
<!--replace the version in the pom-->
|
||||
<copy file="${pom}" tofile="${pom}.tmp">
|
||||
<filterset>
|
||||
<filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
|
||||
<!--sign the zip, the tar.gz and the pom -->
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${file}.zip" />
|
||||
<param name="file.out" value="${file}.zip.asc" />
|
||||
</antcall>
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${file}.tar.gz" />
|
||||
<param name="file.out" value="${file}.tar.gz.asc" />
|
||||
</antcall>
|
||||
<antcall target="-sign" >
|
||||
<param name="file.in" value="${pom}.tmp" />
|
||||
<param name="file.out" value="${pom}.asc" />
|
||||
</antcall>
|
||||
|
||||
<artifact:deploy file="${pom}">
|
||||
<pom file="${pom}.tmp"/>
|
||||
<remoteRepository id="${maven.repo.repositoryId}" url="${maven.repo.url}">
|
||||
<authentication username="${asf.ldap.username}"
|
||||
password="${asf.ldap.password}"
|
||||
unless:set="maven.auth.useSettings"/>
|
||||
</remoteRepository>
|
||||
<attach file="${file}.zip" type="zip"/>
|
||||
<attach file="${file}.zip.asc" type="zip.asc" if:set="gpg.passphrase"/>
|
||||
<attach file="${file}.tar.gz" type="tar.gz"/>
|
||||
<attach file="${file}.tar.gz.asc" type="tar.gz.asc" if:set="gpg.passphrase"/>
|
||||
<attach file="${pom}.asc" type="pom.asc" if:set="gpg.passphrase"/>
|
||||
</artifact:deploy>
|
||||
|
||||
<delete file="${pom}.tmp"/>
|
||||
<delete file="${pom}.asc"/>
|
||||
<delete file="${file}.zip.asc"/>
|
||||
<delete file="${file}.tar.gz.asc"/>
|
||||
</target>
|
||||
|
||||
<macrodef name="doMavenDeployBinaries">
|
||||
<attribute name="artifactId"/>
|
||||
<attribute name="groupId" default="org.apache.tomcat" />
|
||||
<attribute name="file" />
|
||||
<attribute name="pom" default="@{artifactId}.pom" />
|
||||
<sequential>
|
||||
<antcall target="maven-deploy-binaries">
|
||||
<param name="file" value="@{file}"/>
|
||||
<param name="groupId" value="@{groupId}"/>
|
||||
<param name="artifactId" value="@{artifactId}"/>
|
||||
<param name="pom" value="${tomcat.pom.path}/@{pom}"/>
|
||||
</antcall>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
||||
<target name="generic-deploy" depends="init-maven,init-gpg-1,init-gpg-2,init-ldap">
|
||||
<!-- Standard jars in bin directory -->
|
||||
<!-- Skip bootstrap.jar - it is just a subset of catalina.jar -->
|
||||
<doMavenDeploy artifactId="tomcat-juli"
|
||||
file="${tomcat.bin.path}/tomcat-juli.jar"/>
|
||||
|
||||
<!-- Standard jars in lib directory -->
|
||||
<doMavenDeploy artifactId="tomcat-annotations-api"
|
||||
jarFileName="annotations-api.jar"
|
||||
srcJarFileName="annotations-api-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-catalina"
|
||||
jarFileName="catalina.jar"
|
||||
srcJarFileName="catalina-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-catalina-ant"
|
||||
jarFileName="catalina-ant.jar"
|
||||
srcJarFileName="catalina-ant-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-catalina-ha"
|
||||
jarFileName="catalina-ha.jar"
|
||||
srcJarFileName="catalina-ha-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-tribes"
|
||||
jarFileName="catalina-tribes.jar"
|
||||
srcJarFileName="catalina-tribes-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-storeconfig"
|
||||
jarFileName="catalina-storeconfig.jar"
|
||||
srcJarFileName="catalina-storeconfig-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-jdbc"
|
||||
jarFileName="tomcat-jdbc.jar"
|
||||
srcJarFileName="tomcat-jdbc-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-el-api"
|
||||
jarFileName="el-api.jar"
|
||||
srcJarFileName="el-api-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-jasper"
|
||||
jarFileName="jasper.jar"
|
||||
srcJarFileName="jasper-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-jasper-el"
|
||||
jarFileName="jasper-el.jar"
|
||||
srcJarFileName="jasper-el-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-jsp-api"
|
||||
jarFileName="jsp-api.jar"
|
||||
srcJarFileName="jsp-api-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-servlet-api"
|
||||
jarFileName="servlet-api.jar"
|
||||
srcJarFileName="servlet-api-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-websocket-api"
|
||||
jarFileName="websocket-api.jar"
|
||||
srcJarFileName="websocket-api-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-jaspic-api"
|
||||
jarFileName="jaspic-api.jar"
|
||||
srcJarFileName="jaspic-api-src.jar"/>
|
||||
|
||||
<doMavenDeploy artifactId="tomcat-api"/>
|
||||
<doMavenDeploy artifactId="tomcat-jni"/>
|
||||
<doMavenDeploy artifactId="tomcat-util"/>
|
||||
<doMavenDeploy artifactId="tomcat-util-scan"/>
|
||||
<doMavenDeploy artifactId="tomcat-coyote"/>
|
||||
<doMavenDeploy artifactId="tomcat-dbcp"/>
|
||||
<doMavenDeploy artifactId="tomcat-websocket"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-de"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-es"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-fr"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-ja"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-ko"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-ru"/>
|
||||
<doMavenDeployNoSrc artifactId="tomcat-i18n-zh-CN"/>
|
||||
|
||||
<!-- Extras jars -->
|
||||
<doMavenDeploy artifactId="tomcat-catalina-jmx-remote"
|
||||
groupId="org.apache.tomcat.extras"
|
||||
file="${tomcat.extras.path}/catalina-jmx-remote.jar"
|
||||
src="${tomcat.extras.src.path}/catalina-jmx-remote-src.jar" />
|
||||
<doMavenDeploy artifactId="tomcat-catalina-ws"
|
||||
groupId="org.apache.tomcat.extras"
|
||||
file="${tomcat.extras.path}/catalina-ws.jar"
|
||||
src="${tomcat.extras.src.path}/catalina-ws-src.jar" />
|
||||
|
||||
<!-- Emedded jars -->
|
||||
<!-- Skip DBCP - optional and can use standard ones above -->
|
||||
<doMavenDeploy artifactId="tomcat-embed-core"
|
||||
groupId="org.apache.tomcat.embed"
|
||||
file="${tomcat.embed.path}/tomcat-embed-core.jar"
|
||||
pom="tomcat-embed-core.pom"
|
||||
src="${tomcat.embed.src.path}/tomcat-embed-core-src.jar"/>
|
||||
<doMavenDeploy artifactId="tomcat-embed-jasper"
|
||||
groupId="org.apache.tomcat.embed"
|
||||
file="${tomcat.embed.path}/tomcat-embed-jasper.jar"
|
||||
pom="tomcat-embed-jasper.pom"
|
||||
src="${tomcat.embed.src.path}/tomcat-embed-jasper-src.jar"/>
|
||||
<doMavenDeploy artifactId="tomcat-embed-el"
|
||||
groupId="org.apache.tomcat.embed"
|
||||
file="${tomcat.embed.path}/tomcat-embed-el.jar"
|
||||
pom="tomcat-embed-el.pom"
|
||||
src="${tomcat.embed.src.path}/tomcat-embed-el-src.jar"/>
|
||||
<doMavenDeploy artifactId="tomcat-embed-websocket"
|
||||
groupId="org.apache.tomcat.embed"
|
||||
file="${tomcat.embed.path}/tomcat-embed-websocket.jar"
|
||||
pom="tomcat-embed-websocket.pom"
|
||||
src="${tomcat.embed.src.path}/tomcat-embed-websocket-src.jar"/>
|
||||
|
||||
<!-- Binaries -->
|
||||
<doMavenDeployBinaries
|
||||
artifactId="tomcat"
|
||||
file="${tomcat.release.path}/v${maven.deploy.binary.version}/bin/apache-tomcat-${maven.deploy.binary.version}"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="deploy-snapshot">
|
||||
<antcall target="generic-deploy">
|
||||
<param name="maven.repo.repositoryId"
|
||||
value="${maven.snapshot.repo.repositoryId}"/>
|
||||
<param name="maven.repo.url" value="${maven.snapshot.repo.url}"/>
|
||||
<param name="maven.deploy.version" value="8.5-SNAPSHOT"/>
|
||||
<param name="maven.deploy.binary.version"
|
||||
value="${maven.asf.release.deploy.version}-dev"/>
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
<target name="deploy-release">
|
||||
<antcall target="generic-deploy">
|
||||
<param name="maven.repo.repositoryId"
|
||||
value="${maven.asf.release.repo.repositoryId}"/>
|
||||
<param name="maven.repo.url" value="${maven.asf.release.repo.url}"/>
|
||||
<param name="maven.deploy.version"
|
||||
value="${maven.asf.release.deploy.version}"/>
|
||||
<param name="maven.deploy.binary.version"
|
||||
value="${maven.asf.release.deploy.version}"/>
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
<target name="init-gpg-1">
|
||||
<available file="${gpg.exec}" property="gpg.exec.available"/>
|
||||
</target>
|
||||
|
||||
<target name="init-gpg-2" if="${gpg.exec.available}">
|
||||
<input message="Enter GPG pass-phrase" addproperty="gpg.passphrase" >
|
||||
<handler type="secure"/>
|
||||
</input>
|
||||
</target>
|
||||
|
||||
<target name="init-ldap" unless="maven.auth.useSettings">
|
||||
<input message="Enter ASF LDAP (same as svn) password"
|
||||
addproperty="asf.ldap.password" >
|
||||
<handler type="secure"/>
|
||||
</input>
|
||||
</target>
|
||||
|
||||
<target name="-sign" if="gpg.passphrase">
|
||||
<fail unless="file" />
|
||||
<exec executable="${gpg.exec}" failonerror="true"
|
||||
inputstring="${gpg.passphrase}">
|
||||
<arg value="--batch"/>
|
||||
<arg value="--passphrase-fd"/>
|
||||
<arg value="0"/>
|
||||
<arg value="-a"/>
|
||||
<arg value="-b"/>
|
||||
<arg value="-o"/>
|
||||
<arg value="${file.out}"/>
|
||||
<arg value="${file.in}"/>
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
<!-- =============== Utility Targets to support downloads ================ -->
|
||||
|
||||
<target name="setproxy" if="${proxy.use}">
|
||||
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
|
||||
proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
|
||||
<echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
|
||||
</target>
|
||||
|
||||
<target name="testexist">
|
||||
<echo message="Testing for ${destfile}"/>
|
||||
<available file="${destfile}" property="exist"/>
|
||||
</target>
|
||||
|
||||
<target name="downloadfile" unless="exist" depends="testexist,setproxy">
|
||||
<!-- Download the file -->
|
||||
<local name="temp.file"/>
|
||||
<mkdir dir="${base.path}"/>
|
||||
<tempfile property="temp.file" destdir="${base.path}" prefix="download-" suffix=".tmp"/>
|
||||
<get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
|
||||
<mkdir dir="${destdir}"/>
|
||||
<move file="${temp.file}" tofile="${destfile}"/>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user