From: Olivier Lamy Date: Thu, 1 Mar 2012 23:02:05 +0000 (+0000) Subject: add jetty module with the webapp js X-Git-Tag: archiva-1.4-M3~1142 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c5d5849686181c4b4d5010749a117e12a6c2d364;p=archiva.git add jetty module with the webapp js git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295969 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml new file mode 100644 index 000000000..8d7fcbed1 --- /dev/null +++ b/archiva-jetty-js/pom.xml @@ -0,0 +1,269 @@ + + + + + 4.0.0 + + org.apache.archiva + archiva + 1.4-M3-SNAPSHOT + + archiva-jetty-js + pom + + Apache Archiva JS + + + org.eclipse.jetty + jetty-server + + + org.apache.archiva + archiva-webapp-js + war + + + org.apache.archiva + archiva-docs + zip + docs + + + + org.eclipse.jetty + jetty-jndi + ${jettyVersion} + runtime + + + + org.eclipse.jetty + jetty-start + ${jettyVersion} + runtime + + + org.eclipse.jetty + jetty-plus + runtime + + + org.eclipse.jetty + jetty-deploy + ${jettyVersion} + runtime + + + + org.apache.derby + derby + runtime + + + javax.mail + mail + runtime + + + ant + ant + 1.6.5 + runtime + + + commons-dbcp + commons-dbcp + 1.4 + runtime + + + commons-pool + commons-pool + 1.6 + runtime + + + + + + org.codehaus.mojo + appassembler-maven-plugin + 1.1.1 + + + + archiva + org.eclipse.jetty.start.Main + + conf/jetty.xml + + + jsw + + + + jsw + + + wrapper.console.loglevel + INFO + + + wrapper.java.additional.1.stripquotes + TRUE + + + set.default.REPO_DIR + lib + + + wrapper.logfile + %ARCHIVA_BASE%/logs/wrapper.YYYYMMDD.log + + + wrapper.logfile.rollmode + DATE + + + wrapper.app.parameter.2 + %ARCHIVA_BASE%/conf/jetty.xml + + + app.base.envvar + ARCHIVA_BASE + + + wrapper.on_exit.default + RESTART + + + wrapper.on_exit.0 + SHUTDOWN + + + wrapper.restart.delay + 30 + + + + linux-x86-32 + linux-x86-64 + macosx-x86-universal-32 + solaris-x86-32 + solaris-sparc-32 + solaris-sparc-64 + windows-x86-32 + + + + + + appserver.home=. + appserver.base=%ARCHIVA_BASE% + + jetty.logs=%ARCHIVA_BASE%/logs + java.io.tmpdir=%ARCHIVA_BASE%/temp + archiva.tmp.group.index.ttl=30 + + + -XX:MaxPermSize=128m + + 512 + 512 + + + + lib + flat + target/generated-resources/appassembler/jsw/archiva + + + + + generate-daemons + create-repository + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + + src/main/assembly/bin.xml + apache-archiva-js-${project.version} + + + + org.apache.maven.plugins + maven-antrun-plugin + + + config + process-resources + + + + + + + + + + + run + + + + + + maven-remote-resources-plugin + + + notice-supplements.xml + + + + + + + + org.apache.rat + apache-rat-plugin + + + src/main/conf/** + + + + + + + diff --git a/archiva-jetty-js/src/main/appended-resources/notice-supplements.xml b/archiva-jetty-js/src/main/appended-resources/notice-supplements.xml new file mode 100644 index 000000000..cf74ac4cf --- /dev/null +++ b/archiva-jetty-js/src/main/appended-resources/notice-supplements.xml @@ -0,0 +1,129 @@ + + + + ant + ant + Ant + http://ant.apache.org/ + + The Apache Software Foundation + http://www.apache.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + + org.eclipse.jdt.core.compiler + ecj + Eclipse ECJ + http://www.eclipse.org/jdt + + The Eclipse Foundation + http://www.eclipse.org + + + + Eclipse Public License v1.0 + http://www.eclipse.org/org/documents/epl-v10.php + + + + + + + org.eclipse.jdt + core + Eclipse JDT Core + http://www.eclipse.org/jdt + + The Eclipse Foundation + http://www.eclipse.org + + + + Eclipse Public License v1.0 + http://www.eclipse.org/org/documents/epl-v10.php + + + + + + + geronimo-spec + geronimo-spec-jta + Geronimo :: Java Transaction API Specification + http://geronimo.apache.org/ + + The Apache Software Foundation + http://www.apache.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + + javax.activation + activation + JavaBeans Activation Framework (JAF) + + Sun Microsystems + http://www.sun.com/ + + + + Common Development and Distribution License (CDDL) v1.0 + https://glassfish.dev.java.net/public/CDDLv1.0.html + + + + + + + javax.mail + mail + JavaMail API + + Sun Microsystems + http://www.sun.com/ + + + + Common Development and Distribution License (CDDL) v1.0 + https://glassfish.dev.java.net/public/CDDLv1.0.html + + + + + + + xerces + xercesImpl + Xerces + http://xerces.apache.org/ + + The Apache Software Foundation + http://www.apache.org/ + + + + The Apache Software License, Version 1.1 + http://www.apache.org/licenses/LICENSE + + + + + + \ No newline at end of file diff --git a/archiva-jetty-js/src/main/assembly/bin.xml b/archiva-jetty-js/src/main/assembly/bin.xml new file mode 100644 index 000000000..bc995cad4 --- /dev/null +++ b/archiva-jetty-js/src/main/assembly/bin.xml @@ -0,0 +1,123 @@ + + + + bin + + tar.gz + zip + + + + target/generated-resources/appassembler/jsw/archiva/apps + apps + + + target/generated-resources/appassembler/jsw/archiva/conf + conf + + + target/generated-resources/appassembler/jsw/archiva/lib + lib + + + archiva-* + maven-metadata-appassembler.xml + + 0755 + + + target/generated-resources/appassembler/jsw/archiva/logs + logs + + + target/generated-resources/appassembler/jsw/archiva/temp + temp + + + target/generated-resources/appassembler/jsw/archiva/bin + bin + + archiva + + 0755 + unix + + + target/generated-resources/appassembler/jsw/archiva/bin + bin + + wrapper-linux-x86-32 + wrapper-linux-x86-64 + wrapper-macosx-universal-32 + wrapper-solaris-x86-32 + wrapper-solaris-sparc-32 + wrapper-solaris-sparc-64 + + 0755 + + + target/generated-resources/appassembler/jsw/archiva/bin + bin + + archiva.bat + + 0755 + dos + + + target/generated-resources/appassembler/jsw/archiva/bin + bin + + wrapper-windows-x86-32.exe + + 0755 + + + target/maven-shared-archive-resources/META-INF/ + / + + NOTICE + + + + src/main/resources/ + / + + LICENSE + + + + + + true + apps/archiva + + org.apache.archiva:archiva-webapp-js + + + + true + + org.apache.archiva:archiva-docs:zip:docs + + + + + diff --git a/archiva-jetty-js/src/main/conf/archiva.xml b/archiva-jetty-js/src/main/conf/archiva.xml new file mode 100644 index 000000000..9afb83352 --- /dev/null +++ b/archiva-jetty-js/src/main/conf/archiva.xml @@ -0,0 +1 @@ + diff --git a/archiva-jetty-js/src/main/conf/jetty.xml b/archiva-jetty-js/src/main/conf/jetty.xml new file mode 100644 index 000000000..91d2c091e --- /dev/null +++ b/archiva-jetty-js/src/main/conf/jetty.xml @@ -0,0 +1,313 @@ + + + + + + + + + + + + + + + + + + + + + + 10 + 250 + + + + + + + + + + + + + + + + + + 30000 + 2 + false + 8443 + 5000 + 5000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /contexts + 1 + + + + + + + + + + + + + + + + + + + + + + /apps + false + true + false + + + + + + + + + + + + + + + /yyyy_mm_dd.request.log + yyyy_MM_dd + 90 + true + true + false + GMT + + + + + + + + true + true + true + 1000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.eclipse.jetty.webapp.configuration + + + org.eclipse.jetty.webapp.WebInfConfiguration + org.eclipse.jetty.webapp.WebXmlConfiguration + org.eclipse.jetty.webapp.MetaInfConfiguration + org.eclipse.jetty.webapp.FragmentConfiguration + org.eclipse.jetty.plus.webapp.EnvConfiguration + org.eclipse.jetty.plus.webapp.PlusConfiguration + org.eclipse.jetty.webapp.JettyWebXmlConfiguration + org.eclipse.jetty.webapp.TagLibConfiguration + + + + + + + + + + + org.eclipse.jetty.webapp.WebInfConfiguration + org.eclipse.jetty.plus.webapp.EnvConfiguration + org.eclipse.jetty.webapp.Configuration + org.eclipse.jetty.webapp.JettyWebXmlConfiguration + org.mortbay.jetty.webapp.TagLibConfiguration + + + + + + mail/Session + + + + + + + localhost + + + + + + + + + + jdbc/users + + + /data/databases/users + sa + create + + + + + + jdbc/usersShutdown + + + /data/databases/users + sa + shutdown + + + + diff --git a/archiva-jetty-js/src/main/conf/shared.xml b/archiva-jetty-js/src/main/conf/shared.xml new file mode 100644 index 000000000..9afb83352 --- /dev/null +++ b/archiva-jetty-js/src/main/conf/shared.xml @@ -0,0 +1 @@ + diff --git a/archiva-jetty-js/src/main/resources/LICENSE b/archiva-jetty-js/src/main/resources/LICENSE new file mode 100644 index 000000000..774a48b13 --- /dev/null +++ b/archiva-jetty-js/src/main/resources/LICENSE @@ -0,0 +1,261 @@ + + 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. + + + +For the Java Service Wrapper (v3.2.3): + +Copyright (c) 1999, 2006 Tanuki Software, Inc. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of the Java Service Wrapper and associated +documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sub-license, +and/or sell copies of the Software, and to permit persons to +whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +Portions of the Software have been derived from source code +developed by Silver Egg Technology under the following license: + +BEGIN Silver Egg Techology License ----------------------------------- + + Copyright (c) 2001 Silver Egg Technology + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sub-license, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +END Silver Egg Techology License ------------------------------------- + diff --git a/pom.xml b/pom.xml index e3a9e6b14..e1d10d75c 100644 --- a/pom.xml +++ b/pom.xml @@ -1835,6 +1835,7 @@ js archiva-modules/archiva-web/archiva-webapp-js + archiva-jetty-js