diff --git a/.classpath b/.classpath index 94a57b263c5..75df2ca9ac3 100644 --- a/.classpath +++ b/.classpath @@ -8,6 +8,7 @@ + diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 7ce3e97ad7c..7c0858b29b4 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -367,6 +367,7 @@ if(WITH_SERVER OR WITH_CA OR WITH_KRA OR WITH_OCSP OR WITH_TKS OR WITH_TPS OR WI add_subdirectory(${APP_SERVER}) add_subdirectory(server) + add_subdirectory(server-webapp) list(APPEND PKI_JAVADOC_SOURCEPATH ${CMAKE_SOURCE_DIR}/base/server/src/main/java) diff --git a/base/pom.xml b/base/pom.xml index 4cb47742e3f..a660a366ea6 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -20,6 +20,7 @@ tomcat tomcat-9.0 server + server-webapp ca kra ocsp diff --git a/base/server-webapp/CMakeLists.txt b/base/server-webapp/CMakeLists.txt new file mode 100644 index 00000000000..26e19620143 --- /dev/null +++ b/base/server-webapp/CMakeLists.txt @@ -0,0 +1,76 @@ +project(server-webapp) + +# build server-webapp classes +javac(pki-server-webapp-classes + DEPENDS + pki-server-jar + SOURCES + src/main/java/*.java + CLASSPATH + ${SERVLET_JAR} + ${JAXRS_API_JAR} + ${SLF4J_API_JAR} + ${JACKSON2_CORE_JAR} + ${PKI_COMMON_JAR} + ${PKI_SERVER_JAR} + OUTPUT_DIR + ${CMAKE_CURRENT_BINARY_DIR}/classes +) + +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources/META-INF/MANIFEST.MF + ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.MF +) + +# build pki-server-webapp.jar +jar(pki-server-webapp-jar + DEPENDS + pki-server-webapp-classes + CREATE + ${CMAKE_BINARY_DIR}/dist/pki-server-webapp.jar + OPTIONS + m + PARAMS + ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.MF + INPUT_DIR + ${CMAKE_CURRENT_BINARY_DIR}/classes + INPUT_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources +) + +set(PKI_SERVER_WEBAPP_JAR ${CMAKE_BINARY_DIR}/dist/pki-server-webapp.jar CACHE INTERNAL "pki-server-webapp jar file") + +# Create /usr/share/pki/server/webapps/pki/WEB-INF/lib. This can be customized for different platforms in RPM spec. + +add_custom_target(pki-server-webapp-lib ALL + COMMENT "Creating links for PKI server webapp library") + +add_custom_command( + TARGET pki-server-webapp-lib + COMMAND ${CMAKE_COMMAND} -E make_directory webapp/lib + COMMAND ln -sf ../../../../../../../..${SLF4J_API_JAR} webapp/lib/slf4j-api.jar + COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar + COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-server.jar + COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server-webapp.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-server-webapp.jar +) + +install( + DIRECTORY + webapps + DESTINATION + ${DATA_INSTALL_DIR}/server +) + +install( + FILES + ${CMAKE_BINARY_DIR}/dist/pki-server-webapp.jar + DESTINATION + ${JAVA_JAR_INSTALL_DIR}/pki +) + +install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/ + DESTINATION + ${DATA_INSTALL_DIR}/server/webapps/pki/WEB-INF/lib +) diff --git a/base/server-webapp/LICENSE b/base/server-webapp/LICENSE new file mode 100644 index 00000000000..e281f4362a3 --- /dev/null +++ b/base/server-webapp/LICENSE @@ -0,0 +1,291 @@ +This Program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation; version 2 of the License. + +This Program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this Program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. diff --git a/base/server-webapp/pom.xml b/base/server-webapp/pom.xml new file mode 100644 index 00000000000..4e54d516c38 --- /dev/null +++ b/base/server-webapp/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + + org.dogtagpki.pki + pki-base-parent + ${revision} + + + pki-server-webapp + jar + + + + + ${project.groupId} + pki-server + ${project.version} + + + + + + pki-server-webapp + + + diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/AppService.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/AppService.java similarity index 100% rename from base/server/src/main/java/org/dogtagpki/server/rest/AppService.java rename to base/server-webapp/src/main/java/org/dogtagpki/server/rest/AppService.java diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/InfoService.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/InfoService.java similarity index 100% rename from base/server/src/main/java/org/dogtagpki/server/rest/InfoService.java rename to base/server-webapp/src/main/java/org/dogtagpki/server/rest/InfoService.java diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/LoginService.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/LoginService.java similarity index 100% rename from base/server/src/main/java/org/dogtagpki/server/rest/LoginService.java rename to base/server-webapp/src/main/java/org/dogtagpki/server/rest/LoginService.java diff --git a/base/server/src/main/java/org/dogtagpki/server/rest/PKIApplication.java b/base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java similarity index 100% rename from base/server/src/main/java/org/dogtagpki/server/rest/PKIApplication.java rename to base/server-webapp/src/main/java/org/dogtagpki/server/rest/PKIApplication.java diff --git a/base/server-webapp/src/main/resources/META-INF/MANIFEST.MF b/base/server-webapp/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..fd8d80f2093 --- /dev/null +++ b/base/server-webapp/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Name: pki-server-webapp +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${IMPL_VERSION} diff --git a/base/server/share/webapps/ROOT/WEB-INF/web.xml b/base/server-webapp/webapps/ROOT/WEB-INF/web.xml similarity index 100% rename from base/server/share/webapps/ROOT/WEB-INF/web.xml rename to base/server-webapp/webapps/ROOT/WEB-INF/web.xml diff --git a/base/server/share/webapps/ROOT/index.jsp b/base/server-webapp/webapps/ROOT/index.jsp similarity index 100% rename from base/server/share/webapps/ROOT/index.jsp rename to base/server-webapp/webapps/ROOT/index.jsp diff --git a/base/server/share/webapps/pki/WEB-INF/classes/logging.properties b/base/server-webapp/webapps/pki/WEB-INF/classes/logging.properties similarity index 100% rename from base/server/share/webapps/pki/WEB-INF/classes/logging.properties rename to base/server-webapp/webapps/pki/WEB-INF/classes/logging.properties diff --git a/base/server/share/webapps/pki/WEB-INF/web.xml b/base/server-webapp/webapps/pki/WEB-INF/web.xml similarity index 100% rename from base/server/share/webapps/pki/WEB-INF/web.xml rename to base/server-webapp/webapps/pki/WEB-INF/web.xml diff --git a/base/server/share/webapps/pki/admin/console/config/adminauthenticatepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/adminauthenticatepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/adminauthenticatepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/adminauthenticatepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/adminpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/adminpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/adminpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/adminpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/agentauthenticatepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/agentauthenticatepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/agentauthenticatepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/agentauthenticatepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/authdbpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/authdbpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/authdbpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/authdbpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/backupkeycertpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/backupkeycertpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/backupkeycertpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/backupkeycertpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/cainfopanel.vm b/base/server-webapp/webapps/pki/admin/console/config/cainfopanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/cainfopanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/cainfopanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/certchainpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/certchainpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/certchainpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/certchainpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/certprettyprintpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/certprettyprintpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/certprettyprintpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/certprettyprintpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/certrequestpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/certrequestpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/certrequestpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/certrequestpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/config_addhsm.vm b/base/server-webapp/webapps/pki/admin/console/config/config_addhsm.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/config_addhsm.vm rename to base/server-webapp/webapps/pki/admin/console/config/config_addhsm.vm diff --git a/base/server/share/webapps/pki/admin/console/config/config_hsmloginpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/config_hsmloginpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/config_hsmloginpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/config_hsmloginpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/createsubsystempanel.vm b/base/server-webapp/webapps/pki/admin/console/config/createsubsystempanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/createsubsystempanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/createsubsystempanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/databasepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/databasepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/databasepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/databasepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/displaycertchainpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/displaycertchainpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/displaycertchainpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/displaycertchainpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/donepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/donepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/donepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/donepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/drminfopanel.vm b/base/server-webapp/webapps/pki/admin/console/config/drminfopanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/drminfopanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/drminfopanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/footer.vm b/base/server-webapp/webapps/pki/admin/console/config/footer.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/footer.vm rename to base/server-webapp/webapps/pki/admin/console/config/footer.vm diff --git a/base/server/share/webapps/pki/admin/console/config/header.vm b/base/server-webapp/webapps/pki/admin/console/config/header.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/header.vm rename to base/server-webapp/webapps/pki/admin/console/config/header.vm diff --git a/base/server/share/webapps/pki/admin/console/config/hierarchypanel.vm b/base/server-webapp/webapps/pki/admin/console/config/hierarchypanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/hierarchypanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/hierarchypanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/importadmincertpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/importadmincertpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/importadmincertpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/importadmincertpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/importcachainpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/importcachainpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/importcachainpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/importcachainpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/login.vm b/base/server-webapp/webapps/pki/admin/console/config/login.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/login.vm rename to base/server-webapp/webapps/pki/admin/console/config/login.vm diff --git a/base/server/share/webapps/pki/admin/console/config/modulepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/modulepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/modulepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/modulepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/namepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/namepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/namepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/namepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/restorekeycertpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/restorekeycertpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/restorekeycertpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/restorekeycertpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/savepkcs12panel.vm b/base/server-webapp/webapps/pki/admin/console/config/savepkcs12panel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/savepkcs12panel.vm rename to base/server-webapp/webapps/pki/admin/console/config/savepkcs12panel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/securitydomainloginpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/securitydomainloginpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/securitydomainloginpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/securitydomainpanel.vm b/base/server-webapp/webapps/pki/admin/console/config/securitydomainpanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/securitydomainpanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/securitydomainpanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/sidemenu.vm b/base/server-webapp/webapps/pki/admin/console/config/sidemenu.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/sidemenu.vm rename to base/server-webapp/webapps/pki/admin/console/config/sidemenu.vm diff --git a/base/server/share/webapps/pki/admin/console/config/sizepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/sizepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/sizepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/sizepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/tksinfopanel.vm b/base/server-webapp/webapps/pki/admin/console/config/tksinfopanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/tksinfopanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/tksinfopanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/topmenu.vm b/base/server-webapp/webapps/pki/admin/console/config/topmenu.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/topmenu.vm rename to base/server-webapp/webapps/pki/admin/console/config/topmenu.vm diff --git a/base/server/share/webapps/pki/admin/console/config/welcomepanel.vm b/base/server-webapp/webapps/pki/admin/console/config/welcomepanel.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/welcomepanel.vm rename to base/server-webapp/webapps/pki/admin/console/config/welcomepanel.vm diff --git a/base/server/share/webapps/pki/admin/console/config/wizard.vm b/base/server-webapp/webapps/pki/admin/console/config/wizard.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/wizard.vm rename to base/server-webapp/webapps/pki/admin/console/config/wizard.vm diff --git a/base/server/share/webapps/pki/admin/console/config/xml.vm b/base/server-webapp/webapps/pki/admin/console/config/xml.vm similarity index 100% rename from base/server/share/webapps/pki/admin/console/config/xml.vm rename to base/server-webapp/webapps/pki/admin/console/config/xml.vm diff --git a/base/server/share/webapps/pki/admin/console/js/misc.js b/base/server-webapp/webapps/pki/admin/console/js/misc.js similarity index 100% rename from base/server/share/webapps/pki/admin/console/js/misc.js rename to base/server-webapp/webapps/pki/admin/console/js/misc.js diff --git a/base/server/share/webapps/pki/index.jsp b/base/server-webapp/webapps/pki/index.jsp similarity index 100% rename from base/server/share/webapps/pki/index.jsp rename to base/server-webapp/webapps/pki/index.jsp diff --git a/base/server/share/webapps/pki/js/backbone.js b/base/server-webapp/webapps/pki/js/backbone.js similarity index 100% rename from base/server/share/webapps/pki/js/backbone.js rename to base/server-webapp/webapps/pki/js/backbone.js diff --git a/base/server/share/webapps/pki/js/bootstrap.js b/base/server-webapp/webapps/pki/js/bootstrap.js similarity index 100% rename from base/server/share/webapps/pki/js/bootstrap.js rename to base/server-webapp/webapps/pki/js/bootstrap.js diff --git a/base/server/share/webapps/pki/js/jquery.i18n.properties.js b/base/server-webapp/webapps/pki/js/jquery.i18n.properties.js similarity index 100% rename from base/server/share/webapps/pki/js/jquery.i18n.properties.js rename to base/server-webapp/webapps/pki/js/jquery.i18n.properties.js diff --git a/base/server/share/webapps/pki/js/jquery.js b/base/server-webapp/webapps/pki/js/jquery.js similarity index 100% rename from base/server/share/webapps/pki/js/jquery.js rename to base/server-webapp/webapps/pki/js/jquery.js diff --git a/base/server/share/webapps/pki/js/patternfly.js b/base/server-webapp/webapps/pki/js/patternfly.js similarity index 100% rename from base/server/share/webapps/pki/js/patternfly.js rename to base/server-webapp/webapps/pki/js/patternfly.js diff --git a/base/server/share/webapps/pki/js/pki-account.js b/base/server-webapp/webapps/pki/js/pki-account.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-account.js rename to base/server-webapp/webapps/pki/js/pki-account.js diff --git a/base/server/share/webapps/pki/js/pki-app.js b/base/server-webapp/webapps/pki/js/pki-app.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-app.js rename to base/server-webapp/webapps/pki/js/pki-app.js diff --git a/base/server/share/webapps/pki/js/pki-audit.js b/base/server-webapp/webapps/pki/js/pki-audit.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-audit.js rename to base/server-webapp/webapps/pki/js/pki-audit.js diff --git a/base/server/share/webapps/pki/js/pki-banner.js b/base/server-webapp/webapps/pki/js/pki-banner.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-banner.js rename to base/server-webapp/webapps/pki/js/pki-banner.js diff --git a/base/server/share/webapps/pki/js/pki-group.js b/base/server-webapp/webapps/pki/js/pki-group.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-group.js rename to base/server-webapp/webapps/pki/js/pki-group.js diff --git a/base/server/share/webapps/pki/js/pki-ui.js b/base/server-webapp/webapps/pki/js/pki-ui.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-ui.js rename to base/server-webapp/webapps/pki/js/pki-ui.js diff --git a/base/server/share/webapps/pki/js/pki-user.js b/base/server-webapp/webapps/pki/js/pki-user.js similarity index 100% rename from base/server/share/webapps/pki/js/pki-user.js rename to base/server-webapp/webapps/pki/js/pki-user.js diff --git a/base/server/share/webapps/pki/js/pki.js b/base/server-webapp/webapps/pki/js/pki.js similarity index 100% rename from base/server/share/webapps/pki/js/pki.js rename to base/server-webapp/webapps/pki/js/pki.js diff --git a/base/server/share/webapps/pki/js/underscore.js b/base/server-webapp/webapps/pki/js/underscore.js similarity index 100% rename from base/server/share/webapps/pki/js/underscore.js rename to base/server-webapp/webapps/pki/js/underscore.js diff --git a/base/server/share/webapps/pki/ui/audit.html b/base/server-webapp/webapps/pki/ui/audit.html similarity index 100% rename from base/server/share/webapps/pki/ui/audit.html rename to base/server-webapp/webapps/pki/ui/audit.html diff --git a/base/server/share/webapps/pki/ui/group.html b/base/server-webapp/webapps/pki/ui/group.html similarity index 100% rename from base/server/share/webapps/pki/ui/group.html rename to base/server-webapp/webapps/pki/ui/group.html diff --git a/base/server/share/webapps/pki/ui/groups.html b/base/server-webapp/webapps/pki/ui/groups.html similarity index 100% rename from base/server/share/webapps/pki/ui/groups.html rename to base/server-webapp/webapps/pki/ui/groups.html diff --git a/base/server/share/webapps/pki/ui/index.jsp b/base/server-webapp/webapps/pki/ui/index.jsp similarity index 100% rename from base/server/share/webapps/pki/ui/index.jsp rename to base/server-webapp/webapps/pki/ui/index.jsp diff --git a/base/server/share/webapps/pki/ui/user-certs.html b/base/server-webapp/webapps/pki/ui/user-certs.html similarity index 100% rename from base/server/share/webapps/pki/ui/user-certs.html rename to base/server-webapp/webapps/pki/ui/user-certs.html diff --git a/base/server/share/webapps/pki/ui/user-roles.html b/base/server-webapp/webapps/pki/ui/user-roles.html similarity index 100% rename from base/server/share/webapps/pki/ui/user-roles.html rename to base/server-webapp/webapps/pki/ui/user-roles.html diff --git a/base/server/share/webapps/pki/ui/user.html b/base/server-webapp/webapps/pki/ui/user.html similarity index 100% rename from base/server/share/webapps/pki/ui/user.html rename to base/server-webapp/webapps/pki/ui/user.html diff --git a/base/server/share/webapps/pki/ui/users.html b/base/server-webapp/webapps/pki/ui/users.html similarity index 100% rename from base/server/share/webapps/pki/ui/users.html rename to base/server-webapp/webapps/pki/ui/users.html diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt index 089bca78175..f7f6984e3ca 100644 --- a/base/server/CMakeLists.txt +++ b/base/server/CMakeLists.txt @@ -150,19 +150,6 @@ add_custom_command( COMMAND ln -sf ../../../../../..${TOMCATJSS_JAR} common/lib/tomcatjss.jar ) -# Create /usr/share/pki/server/webapps/pki/WEB-INF/lib. This can be customized for different platforms in RPM spec. - -add_custom_target(pki-server-webapp-lib ALL - COMMENT "Creating links for PKI webapp library") - -add_custom_command( - TARGET pki-server-webapp-lib - COMMAND ${CMAKE_COMMAND} -E make_directory webapp/lib - COMMAND ln -sf ../../../../../../../..${SLF4J_API_JAR} webapp/lib/slf4j-api.jar - COMMAND ln -sf ../../../../../../../..${SLF4J_JDK14_JAR} webapp/lib/slf4j-jdk14.jar - COMMAND ln -sf ../../../../../../../..${JAVA_JAR_INSTALL_DIR}/pki/pki-server.jar ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/pki-server.jar -) - add_custom_target(pki-server-man ALL COMMENT "Creating PKI server manuals") @@ -266,13 +253,6 @@ install( ${DATA_INSTALL_DIR}/server/common/lib ) -install( - DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/webapp/lib/ - DESTINATION - ${DATA_INSTALL_DIR}/server/webapps/pki/WEB-INF/lib -) - install( DIRECTORY ../../docs/ diff --git a/pki.spec b/pki.spec index a6573e20d21..991988adc83 100644 --- a/pki.spec +++ b/pki.spec @@ -1111,6 +1111,7 @@ fi %attr(644,-,-) %{_unitdir}/pki-tomcatd-nuxwdog@.service %attr(644,-,-) %{_unitdir}/pki-tomcatd-nuxwdog.target %{_javadir}/pki/pki-server.jar +%{_javadir}/pki/pki-server-webapp.jar %{_javadir}/pki/pki-tomcat.jar %dir %{_sharedstatedir}/pki %{_mandir}/man1/pkidaemon.1.gz