]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Mon, 23 May 2016 09:59:19 +0000 (11:59 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 25 May 2016 17:43:51 +0000 (19:43 +0200)
- added Apache POI 3.4 for Excel export
- added missing i18n strings
- CSV support currently only use comma as "column" delimiter, better switch to Excel format
- these columns cannot have a double-dot on the end as the import may not work
- no need to have these JARs in WARs as you can place them on the server's proper lib path

Signed-off-by: Roland Häder <roland@mxchange.org>
lib/poi-3.14-20160307.jar [new file with mode: 0644]
lib/poi-3.14-all-LICENSE.txt [new file with mode: 0644]
lib/poi-ooxml-3.14-20160307.jar [new file with mode: 0644]
nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/project.properties
nbproject/project.xml
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/admin/contact/admin_contact_export.xhtml

diff --git a/lib/poi-3.14-20160307.jar b/lib/poi-3.14-20160307.jar
new file mode 100644 (file)
index 0000000..5df2110
Binary files /dev/null and b/lib/poi-3.14-20160307.jar differ
diff --git a/lib/poi-3.14-all-LICENSE.txt b/lib/poi-3.14-all-LICENSE.txt
new file mode 100644 (file)
index 0000000..9942ab1
--- /dev/null
@@ -0,0 +1,463 @@
+\r
+                                 Apache License\r
+                           Version 2.0, January 2004\r
+                        http://www.apache.org/licenses/\r
+\r
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\r
+\r
+   1. Definitions.\r
+\r
+      "License" shall mean the terms and conditions for use, reproduction,\r
+      and distribution as defined by Sections 1 through 9 of this document.\r
+\r
+      "Licensor" shall mean the copyright owner or entity authorized by\r
+      the copyright owner that is granting the License.\r
+\r
+      "Legal Entity" shall mean the union of the acting entity and all\r
+      other entities that control, are controlled by, or are under common\r
+      control with that entity. For the purposes of this definition,\r
+      "control" means (i) the power, direct or indirect, to cause the\r
+      direction or management of such entity, whether by contract or\r
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the\r
+      outstanding shares, or (iii) beneficial ownership of such entity.\r
+\r
+      "You" (or "Your") shall mean an individual or Legal Entity\r
+      exercising permissions granted by this License.\r
+\r
+      "Source" form shall mean the preferred form for making modifications,\r
+      including but not limited to software source code, documentation\r
+      source, and configuration files.\r
+\r
+      "Object" form shall mean any form resulting from mechanical\r
+      transformation or translation of a Source form, including but\r
+      not limited to compiled object code, generated documentation,\r
+      and conversions to other media types.\r
+\r
+      "Work" shall mean the work of authorship, whether in Source or\r
+      Object form, made available under the License, as indicated by a\r
+      copyright notice that is included in or attached to the work\r
+      (an example is provided in the Appendix below).\r
+\r
+      "Derivative Works" shall mean any work, whether in Source or Object\r
+      form, that is based on (or derived from) the Work and for which the\r
+      editorial revisions, annotations, elaborations, or other modifications\r
+      represent, as a whole, an original work of authorship. For the purposes\r
+      of this License, Derivative Works shall not include works that remain\r
+      separable from, or merely link (or bind by name) to the interfaces of,\r
+      the Work and Derivative Works thereof.\r
+\r
+      "Contribution" shall mean any work of authorship, including\r
+      the original version of the Work and any modifications or additions\r
+      to that Work or Derivative Works thereof, that is intentionally\r
+      submitted to Licensor for inclusion in the Work by the copyright owner\r
+      or by an individual or Legal Entity authorized to submit on behalf of\r
+      the copyright owner. For the purposes of this definition, "submitted"\r
+      means any form of electronic, verbal, or written communication sent\r
+      to the Licensor or its representatives, including but not limited to\r
+      communication on electronic mailing lists, source code control systems,\r
+      and issue tracking systems that are managed by, or on behalf of, the\r
+      Licensor for the purpose of discussing and improving the Work, but\r
+      excluding communication that is conspicuously marked or otherwise\r
+      designated in writing by the copyright owner as "Not a Contribution."\r
+\r
+      "Contributor" shall mean Licensor and any individual or Legal Entity\r
+      on behalf of whom a Contribution has been received by Licensor and\r
+      subsequently incorporated within the Work.\r
+\r
+   2. Grant of Copyright License. Subject to the terms and conditions of\r
+      this License, each Contributor hereby grants to You a perpetual,\r
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
+      copyright license to reproduce, prepare Derivative Works of,\r
+      publicly display, publicly perform, sublicense, and distribute the\r
+      Work and such Derivative Works in Source or Object form.\r
+\r
+   3. Grant of Patent License. Subject to the terms and conditions of\r
+      this License, each Contributor hereby grants to You a perpetual,\r
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
+      (except as stated in this section) patent license to make, have made,\r
+      use, offer to sell, sell, import, and otherwise transfer the Work,\r
+      where such license applies only to those patent claims licensable\r
+      by such Contributor that are necessarily infringed by their\r
+      Contribution(s) alone or by combination of their Contribution(s)\r
+      with the Work to which such Contribution(s) was submitted. If You\r
+      institute patent litigation against any entity (including a\r
+      cross-claim or counterclaim in a lawsuit) alleging that the Work\r
+      or a Contribution incorporated within the Work constitutes direct\r
+      or contributory patent infringement, then any patent licenses\r
+      granted to You under this License for that Work shall terminate\r
+      as of the date such litigation is filed.\r
+\r
+   4. Redistribution. You may reproduce and distribute copies of the\r
+      Work or Derivative Works thereof in any medium, with or without\r
+      modifications, and in Source or Object form, provided that You\r
+      meet the following conditions:\r
+\r
+      (a) You must give any other recipients of the Work or\r
+          Derivative Works a copy of this License; and\r
+\r
+      (b) You must cause any modified files to carry prominent notices\r
+          stating that You changed the files; and\r
+\r
+      (c) You must retain, in the Source form of any Derivative Works\r
+          that You distribute, all copyright, patent, trademark, and\r
+          attribution notices from the Source form of the Work,\r
+          excluding those notices that do not pertain to any part of\r
+          the Derivative Works; and\r
+\r
+      (d) If the Work includes a "NOTICE" text file as part of its\r
+          distribution, then any Derivative Works that You distribute must\r
+          include a readable copy of the attribution notices contained\r
+          within such NOTICE file, excluding those notices that do not\r
+          pertain to any part of the Derivative Works, in at least one\r
+          of the following places: within a NOTICE text file distributed\r
+          as part of the Derivative Works; within the Source form or\r
+          documentation, if provided along with the Derivative Works; or,\r
+          within a display generated by the Derivative Works, if and\r
+          wherever such third-party notices normally appear. The contents\r
+          of the NOTICE file are for informational purposes only and\r
+          do not modify the License. You may add Your own attribution\r
+          notices within Derivative Works that You distribute, alongside\r
+          or as an addendum to the NOTICE text from the Work, provided\r
+          that such additional attribution notices cannot be construed\r
+          as modifying the License.\r
+\r
+      You may add Your own copyright statement to Your modifications and\r
+      may provide additional or different license terms and conditions\r
+      for use, reproduction, or distribution of Your modifications, or\r
+      for any such Derivative Works as a whole, provided Your use,\r
+      reproduction, and distribution of the Work otherwise complies with\r
+      the conditions stated in this License.\r
+\r
+   5. Submission of Contributions. Unless You explicitly state otherwise,\r
+      any Contribution intentionally submitted for inclusion in the Work\r
+      by You to the Licensor shall be under the terms and conditions of\r
+      this License, without any additional terms or conditions.\r
+      Notwithstanding the above, nothing herein shall supersede or modify\r
+      the terms of any separate license agreement you may have executed\r
+      with Licensor regarding such Contributions.\r
+\r
+   6. Trademarks. This License does not grant permission to use the trade\r
+      names, trademarks, service marks, or product names of the Licensor,\r
+      except as required for reasonable and customary use in describing the\r
+      origin of the Work and reproducing the content of the NOTICE file.\r
+\r
+   7. Disclaimer of Warranty. Unless required by applicable law or\r
+      agreed to in writing, Licensor provides the Work (and each\r
+      Contributor provides its Contributions) on an "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+      implied, including, without limitation, any warranties or conditions\r
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\r
+      PARTICULAR PURPOSE. You are solely responsible for determining the\r
+      appropriateness of using or redistributing the Work and assume any\r
+      risks associated with Your exercise of permissions under this License.\r
+\r
+   8. Limitation of Liability. In no event and under no legal theory,\r
+      whether in tort (including negligence), contract, or otherwise,\r
+      unless required by applicable law (such as deliberate and grossly\r
+      negligent acts) or agreed to in writing, shall any Contributor be\r
+      liable to You for damages, including any direct, indirect, special,\r
+      incidental, or consequential damages of any character arising as a\r
+      result of this License or out of the use or inability to use the\r
+      Work (including but not limited to damages for loss of goodwill,\r
+      work stoppage, computer failure or malfunction, or any and all\r
+      other commercial damages or losses), even if such Contributor\r
+      has been advised of the possibility of such damages.\r
+\r
+   9. Accepting Warranty or Additional Liability. While redistributing\r
+      the Work or Derivative Works thereof, You may choose to offer,\r
+      and charge a fee for, acceptance of support, warranty, indemnity,\r
+      or other liability obligations and/or rights consistent with this\r
+      License. However, in accepting such obligations, You may act only\r
+      on Your own behalf and on Your sole responsibility, not on behalf\r
+      of any other Contributor, and only if You agree to indemnify,\r
+      defend, and hold each Contributor harmless for any liability\r
+      incurred by, or claims asserted against, such Contributor by reason\r
+      of your accepting any such warranty or additional liability.\r
+\r
+   END OF TERMS AND CONDITIONS\r
+\r
+   APPENDIX: How to apply the Apache License to your work.\r
+\r
+      To apply the Apache License to your work, attach the following\r
+      boilerplate notice, with the fields enclosed by brackets "[]"\r
+      replaced with your own identifying information. (Don't include\r
+      the brackets!)  The text should be enclosed in the appropriate\r
+      comment syntax for the file format. We also recommend that a\r
+      file or class name and description of purpose be included on the\r
+      same "printed page" as the copyright notice for easier\r
+      identification within third-party archives.\r
+\r
+   Copyright [yyyy] [name of copyright owner]\r
+\r
+   Licensed under the Apache License, Version 2.0 (the "License");\r
+   you may not use this file except in compliance with the License.\r
+   You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+\r
+\r
+APACHE POI SUBCOMPONENTS:\r
+\r
+Apache POI includes subcomponents with separate copyright notices and\r
+license terms. Your use of these subcomponents is subject to the terms\r
+and conditions of the following licenses:\r
+\r
+\r
+Office Open XML schemas (ooxml-schemas-1.1.jar)\r
+\r
+    The Office Open XML schema definitions used by Apache POI are\r
+    a part of the Office Open XML ECMA Specification (ECMA-376, [1]).\r
+    As defined in section 9.4 of the ECMA bylaws [2], this specification\r
+    is available to all interested parties without restriction:\r
+\r
+        9.4 All documents when approved shall be made available to\r
+            all interested parties without restriction.\r
+\r
+    Furthermore, both Microsoft and Adobe have granted patent licenses\r
+    to this work [3,4,5].\r
+\r
+    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm\r
+    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm\r
+    [3] http://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx\r
+    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/Patent%20statements%20ok/ECMA-376%20Edition%202%20Microsoft%20Patent%20Declaration.pdf\r
+    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/Patent%20statements%20ok/ECMA-376%20Adobe%20Patent%20Declaration.pdf\r
+\r
+\r
+JUnit test library (junit-4.11.jar)\r
+\r
+    Common Public License - v 1.0\r
+\r
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON\r
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION\r
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.\r
+\r
+    1. DEFINITIONS\r
+\r
+    "Contribution" means:\r
+\r
+    a) in the case of the initial Contributor, the initial code and\r
+       documentation distributed under this Agreement, and\r
+\r
+    b) in the case of each subsequent Contributor:\r
+\r
+       i)  changes to the Program, and\r
+\r
+       ii) additions to the Program;\r
+\r
+       where such changes and/or additions to the Program originate from\r
+       and are distributed by that particular Contributor. A Contribution\r
+       'originates' from a Contributor if it was added to the Program by\r
+       such Contributor itself or anyone acting on such Contributor's behalf.\r
+       Contributions do not include additions to the Program which: (i) are\r
+       separate modules of software distributed in conjunction with the\r
+       Program under their own license agreement, and (ii) are not derivative\r
+       works of the Program.\r
+\r
+    "Contributor" means any person or entity that distributes the Program.\r
+\r
+    "Licensed Patents " mean patent claims licensable by a Contributor which\r
+    are necessarily infringed by the use or sale of its Contribution alone\r
+    or when combined with the Program.\r
+\r
+    "Program" means the Contributions distributed in accordance with this\r
+    Agreement.\r
+\r
+    "Recipient" means anyone who receives the Program under this Agreement,\r
+    including all Contributors.\r
+\r
+    2. GRANT OF RIGHTS\r
+\r
+    a) Subject to the terms of this Agreement, each Contributor hereby grants\r
+       Recipient a non-exclusive, worldwide, royalty-free copyright license\r
+       to reproduce, prepare derivative works of, publicly display, publicly\r
+       perform, distribute and sublicense the Contribution of such\r
+       Contributor, if any, and such derivative works, in source code and\r
+       object code form.\r
+\r
+    b) Subject to the terms of this Agreement, each Contributor hereby grants\r
+       Recipient a non-exclusive, worldwide, royalty-free patent license under\r
+       Licensed Patents to make, use, sell, offer to sell, import and\r
+       otherwise transfer the Contribution of such Contributor, if any, in\r
+       source code and object code form. This patent license shall apply to\r
+       the combination of the Contribution and the Program if, at the time\r
+       the Contribution is added by the Contributor, such addition of the\r
+       Contribution causes such combination to be covered by the Licensed\r
+       Patents. The patent license shall not apply to any other combinations\r
+       which include the Contribution. No hardware per se is licensed\r
+       hereunder.\r
+\r
+    c) Recipient understands that although each Contributor grants the\r
+       licenses to its Contributions set forth herein, no assurances are\r
+       provided by any Contributor that the Program does not infringe the\r
+       patent or other intellectual property rights of any other entity.\r
+       Each Contributor disclaims any liability to Recipient for claims\r
+       brought by any other entity based on infringement of intellectual\r
+       property rights or otherwise. As a condition to exercising the rights\r
+       and licenses granted hereunder, each Recipient hereby assumes sole\r
+       responsibility to secure any other intellectual property rights\r
+       needed, if any. For example, if a third party patent license is\r
+       required to allow Recipient to distribute the Program, it is\r
+       Recipient's responsibility to acquire that license before\r
+       distributing the Program.\r
+\r
+    d) Each Contributor represents that to its knowledge it has sufficient\r
+       copyright rights in its Contribution, if any, to grant the copyright\r
+       license set forth in this Agreement.\r
+\r
+    3. REQUIREMENTS\r
+\r
+    A Contributor may choose to distribute the Program in object code form\r
+    under its own license agreement, provided that:\r
+\r
+    a) it complies with the terms and conditions of this Agreement; and\r
+\r
+    b) its license agreement:\r
+\r
+       i)   effectively disclaims on behalf of all Contributors all warranties\r
+            and conditions, express and implied, including warranties or\r
+            conditions of title and non-infringement, and implied warranties\r
+            or conditions of merchantability and fitness for a particular\r
+            purpose;\r
+\r
+       ii)  effectively excludes on behalf of all Contributors all liability\r
+            for damages, including direct, indirect, special, incidental and\r
+            consequential damages, such as lost profits;\r
+\r
+       iii) states that any provisions which differ from this Agreement are\r
+            offered by that Contributor alone and not by any other party; and\r
+\r
+       iv)  states that source code for the Program is available from such\r
+            Contributor, and informs licensees how to obtain it in a\r
+            reasonable manner on or through a medium customarily used for\r
+            software exchange.\r
+\r
+    When the Program is made available in source code form:\r
+\r
+    a) it must be made available under this Agreement; and\r
+\r
+    b) a copy of this Agreement must be included with each copy of\r
+       the Program.\r
+\r
+    Contributors may not remove or alter any copyright notices contained\r
+    within the Program.\r
+\r
+    Each Contributor must identify itself as the originator of its\r
+    Contribution, if any, in a manner that reasonably allows subsequent\r
+    Recipients to identify the originator of the Contribution.\r
+\r
+    4. COMMERCIAL DISTRIBUTION\r
+\r
+    Commercial distributors of software may accept certain responsibilities\r
+    with respect to end users, business partners and the like. While this\r
+    license is intended to facilitate the commercial use of the Program,\r
+    the Contributor who includes the Program in a commercial product offering\r
+    should do so in a manner which does not create potential liability for\r
+    other Contributors. Therefore, if a Contributor includes the Program\r
+    in a commercial product offering, such Contributor ("Commercial\r
+    Contributor") hereby agrees to defend and indemnify every other\r
+    Contributor ("Indemnified Contributor") against any losses, damages\r
+    and costs (collectively "Losses") arising from claims, lawsuits and\r
+    other legal actions brought by a third party against the Indemnified\r
+    Contributor to the extent caused by the acts or omissions of such\r
+    Commercial Contributor in connection with its distribution of the\r
+    Program in a commercial product offering. The obligations in this\r
+    section do not apply to any claims or Losses relating to any actual\r
+    or alleged intellectual property infringement. In order to qualify,\r
+    an Indemnified Contributor must: a) promptly notify the Commercial\r
+    Contributor in writing of such claim, and b) allow the Commercial\r
+    Contributor to control, and cooperate with the Commercial Contributor\r
+    in, the defense and any related settlement negotiations. The Indemnified\r
+    Contributor may participate in any such claim at its own expense.\r
+\r
+    For example, a Contributor might include the Program in a commercial\r
+    product offering, Product X. That Contributor is then a Commercial\r
+    Contributor. If that Commercial Contributor then makes performance\r
+    claims, or offers warranties related to Product X, those performance\r
+    claims and warranties are such Commercial Contributor's responsibility\r
+    alone. Under this section, the Commercial Contributor would have to\r
+    defend claims against the other Contributors related to those\r
+    performance claims and warranties, and if a court requires any other\r
+    Contributor to pay any damages as a result, the Commercial Contributor\r
+    must pay those damages.\r
+\r
+    5. NO WARRANTY\r
+\r
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED\r
+    ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER\r
+    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR\r
+    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR\r
+    A PARTICULAR PURPOSE. Each Recipient is solely responsible for\r
+    determining the appropriateness of using and distributing the Program\r
+    and assumes all risks associated with its exercise of rights under this\r
+    Agreement, including but not limited to the risks and costs of program\r
+    errors, compliance with applicable laws, damage to or loss of data,\r
+    programs or equipment, and unavailability or interruption of operations.\r
+\r
+    6. DISCLAIMER OF LIABILITY\r
+\r
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR\r
+    ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,\r
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING\r
+    WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF\r
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\r
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR\r
+    DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED\r
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\r
+\r
+    7. GENERAL\r
+\r
+    If any provision of this Agreement is invalid or unenforceable under\r
+    applicable law, it shall not affect the validity or enforceability of\r
+    the remainder of the terms of this Agreement, and without further\r
+    action by the parties hereto, such provision shall be reformed to the\r
+    minimum extent necessary to make such provision valid and enforceable.\r
+\r
+    If Recipient institutes patent litigation against a Contributor with\r
+    respect to a patent applicable to software (including a cross-claim or\r
+    counterclaim in a lawsuit), then any patent licenses granted by that\r
+    Contributor to such Recipient under this Agreement shall terminate as of\r
+    the date such litigation is filed. In addition, if Recipient institutes\r
+    patent litigation against any entity (including a cross-claim or\r
+    counterclaim in a lawsuit) alleging that the Program itself (excluding\r
+    combinations of the Program with other software or hardware) infringes\r
+    such Recipient's patent(s), then such Recipient's rights granted under\r
+    Section 2(b) shall terminate as of the date such litigation is filed.\r
+\r
+    All Recipient's rights under this Agreement shall terminate if it fails\r
+    to comply with any of the material terms or conditions of this Agreement\r
+    and does not cure such failure in a reasonable period of time after\r
+    becoming aware of such noncompliance. If all Recipient's rights under\r
+    this Agreement terminate, Recipient agrees to cease use and distribution\r
+    of the Program as soon as reasonably practicable. However, Recipient's\r
+    obligations under this Agreement and any licenses granted by Recipient\r
+    relating to the Program shall continue and survive.\r
+\r
+    Everyone is permitted to copy and distribute copies of this Agreement,\r
+    but in order to avoid inconsistency the Agreement is copyrighted and may\r
+    only be modified in the following manner. The Agreement Steward reserves\r
+    the right to publish new versions (including revisions) of this Agreement\r
+    from time to time. No one other than the Agreement Steward has the right\r
+    to modify this Agreement. IBM is the initial Agreement Steward. IBM may\r
+    assign the responsibility to serve as the Agreement Steward to a suitable\r
+    separate entity. Each new version of the Agreement will be given a\r
+    distinguishing version number. The Program (including Contributions) may\r
+    always be distributed subject to the version of the Agreement under which\r
+    it was received. In addition, after a new version of the Agreement is\r
+    published, Contributor may elect to distribute the Program (including\r
+    its Contributions) under the new version. Except as expressly stated in\r
+    Sections 2(a) and 2(b) above, Recipient receives no rights or licenses\r
+    to the intellectual property of any Contributor under this Agreement,\r
+    whether expressly, by implication, estoppel or otherwise. All rights in\r
+    the Program not expressly granted under this Agreement are reserved.\r
+\r
+    This Agreement is governed by the laws of the State of New York and the\r
+    intellectual property laws of the United States of America. No party to\r
+    this Agreement will bring a legal action under this Agreement more than\r
+    one year after the cause of action arose. Each party waives its rights\r
+    to a jury trial in any resulting litigation.\r
diff --git a/lib/poi-ooxml-3.14-20160307.jar b/lib/poi-ooxml-3.14-20160307.jar
new file mode 100644 (file)
index 0000000..56384e9
Binary files /dev/null and b/lib/poi-ooxml-3.14-20160307.jar differ
index ca0d2d23678bf0f9bcfda64dcd96ee3f672c1d65..7c397167f38b6ab6aac58e6fd947736e6d2ffadc 100644 (file)
@@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target name="-init-taskdefs">
         <fail unless="libs.CopyLibs.classpath">
 The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to 
 org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at 
 &lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
 Either open the project in the IDE and make sure CopyLibs library
 exists or setup the property manually. For example like this:
@@ -1036,36 +1036,12 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <copyfiles files="${file.reference.jcoreee.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcore-logger-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcountry-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcountry-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcontacts-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jphone-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jphone-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.juser-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.juser-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.pizzaservice-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-mailer.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${libs.primefaces.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.juser-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.primefaces.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
@@ -1378,7 +1354,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
     <!--
-
+                
                 TEST COMPILATION SECTION
             -->
     <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -1417,7 +1393,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
     <!--
-
+                
                 TEST EXECUTION SECTION
             -->
     <target depends="init" if="have.tests" name="-pre-test-run">
@@ -1453,7 +1429,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
-
+                
                 TEST DEBUGGING SECTION
             -->
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
@@ -1475,36 +1451,36 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
     <!--
-
-               CLEANUP SECTION
-       -->
-       <target depends="init" name="deps-clean" unless="no.deps">
-               <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="clean"/>
-               <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="clean"/>
-       </target>
-       <target depends="init" name="do-clean">
-               <condition property="build.dir.to.clean" value="${build.web.dir}">
-                       <isset property="dist.ear.dir"/>
-               </condition>
-               <property name="build.dir.to.clean" value="${build.web.dir}"/>
-               <delete includeEmptyDirs="true" quiet="true">
-                       <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
-               </delete>
-               <delete dir="${build.dir}"/>
-               <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
-               <delete dir="${dist.dir}"/>
-       </target>
-       <target depends="do-clean" if="status.clean-failed" name="check-clean">
-               <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
-               <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
-       </target>
-       <target depends="init" if="netbeans.home" name="undeploy-clean">
-               <nbundeploy failOnError="false" startServer="false"/>
-       </target>
-       <target name="-post-clean">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
-       <target depends="clean" description="Clean build products." name="clean-ear"/>
+                
+                CLEANUP SECTION
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="clean"/>
+        <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="clean"/>
+    </target>
+    <target depends="init" name="do-clean">
+        <condition property="build.dir.to.clean" value="${build.web.dir}">
+            <isset property="dist.ear.dir"/>
+        </condition>
+        <property name="build.dir.to.clean" value="${build.web.dir}"/>
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
+        </delete>
+        <delete dir="${build.dir}"/>
+        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target depends="do-clean" if="status.clean-failed" name="check-clean">
+        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
+        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
+    </target>
+    <target depends="init" if="netbeans.home" name="undeploy-clean">
+        <nbundeploy failOnError="false" startServer="false"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target depends="clean" description="Clean build products." name="clean-ear"/>
 </project>
index 4d4f443719eab3ce35b753c704a791512bf1ee7d..afb2df017182347015287172f2f236752eede5f9 100644 (file)
@@ -3,6 +3,6 @@ build.xml.script.CRC32=82213886
 build.xml.stylesheet.CRC32=651128d4@1.68.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=dbb6bed7
-nbproject/build-impl.xml.script.CRC32=2d856ddf
+nbproject/build-impl.xml.data.CRC32=392e9869
+nbproject/build-impl.xml.script.CRC32=f39e92a0
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1
index 8afb3ae44de298fd335e584a6ef0bfd5e772aec9..fe36e0f8c75856dc147c882201dd4a620dc1a933 100644 (file)
@@ -52,6 +52,8 @@ file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
 file.reference.juser-core.jar=lib/juser-core.jar
 file.reference.juser-lib.jar=lib/juser-lib.jar
 file.reference.pizzaservice-core.jar=lib/pizzaservice-core.jar
+file.reference.poi-3.14-20160307.jar=lib/poi-3.14-20160307.jar
+file.reference.poi-ooxml-3.14-20160307.jar=lib/poi-ooxml-3.14-20160307.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -85,6 +87,8 @@ javac.classpath=\
     ${reference.pizzaservice-mailer.jar}:\
     ${file.reference.cdi-api.jar}:\
     ${file.reference.gf-client.jar}:\
+    ${file.reference.poi-3.14-20160307.jar}:\
+    ${file.reference.poi-ooxml-3.14-20160307.jar}:\
     ${libs.primefaces.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -107,6 +111,8 @@ javadoc.nonavbar=false
 javadoc.notree=false
 javadoc.preview=true
 javadoc.private=true
+javadoc.reference.poi-3.14-20160307.jar=https://poi.apache.org/apidocs/
+javadoc.reference.poi-ooxml-3.14-20160307.jar=https://poi.apache.org/apidocs/
 javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=true
index d7735084fcd27b86b11abc72ce42ab5d2dd9c28b..c0788cd96c3807186e94a9c773a3f628699eee6d 100644 (file)
@@ -7,48 +7,49 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
                 <library dirs="200">
-                    <file>${file.reference.jcoreee.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jcore-logger-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcore-logger-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jcoreee.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.jcountry-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.jcountry-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jphone-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jphone-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jphone-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jcontacts-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jphone-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                    <file>${file.reference.jcontacts-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.juser-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.juser-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcustomer-core.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcustomer-lib.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-core.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-ee-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.pizzaservice-core.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
                     <file>${reference.pizzaservice-lib.jar}</file>
                 <library dirs="200">
                     <file>${file.reference.gf-client.jar}</file>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.poi-3.14-20160307.jar}</file>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.poi-ooxml-3.14-20160307.jar}</file>
+                </library>
                 <library dirs="200">
                     <file>${libs.primefaces.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
index 3a30f335954927c0664a79f05fef0d87a0b44c23..34af9a4ff2e5bdcff2bf1ff876f6806b4651f6e2 100644 (file)
@@ -521,8 +521,25 @@ CONTENT_TITLE_ADMIN_EXPORT_CONTACT=Kontaktdaten exportieren:
 ADMIN_EXPORT_CONTACTS_TITLE=Datenexport starten
 ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING=Bei sehr gro\u00dfen Datenmengen kann es eventuell zu Zeit\u00fcberschreitungen kommen. Daher sollten Sie besser seitenweise exportieren.
 BUTTON_ADMIN_EXPORT_CONTACTS_CSV=Alle Daten als CSV-Datei exportieren
+BUTTON_ADMIN_EXPORT_CONTACTS_XLS=Alle Daten als Excel-Datei exportieren
 LINK_ADMIN_EXPORT_CONTACT=Daten exportieren
 LINK_ADMIN_EXPORT_CONTACT_TITLE=Kontaktdaten exportieren
 PERSONAL_DATA_BIRTHDAY=Geburtsdatum (dd.mm.jjjj):
 BIRTHDAY_PATTERN=dd.MM.yyyy
 INVALID_BIRTHDAY=Ung\u00fcltiges Geburtsdatum eingegeben.
+ADMIN_EXPORT_CONTACT_ID=Kontaktdaten-Id
+ADMIN_EXPORT_CONTACT_GENDER=Anrede
+ADMIN_EXPORT_CONTACT_TITLE=Titel
+ADMIN_EXPORT_CONTACT_FIRST_NAME=Vorname
+ADMIN_EXPORT_CONTACT_FAMILY_NAME=Nachname
+ADMIN_EXPORT_CONTACT_STREET=Stra\u00dfe
+ADMIN_EXPORT_CONTACT_HOUSE_NUMBER=Hausnummer
+ADMIN_EXPORT_CONTACT_COUNTRY_CODE=L\u00e4ndercode
+ADMIN_EXPORT_CONTACT_ZIP_CODE=PLZ
+ADMIN_EXPORT_CONTACT_CITY=Wohnort
+ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email-Adresse
+ADMIN_EXPORT_CONTACT_BIRTHDAY=Geburtsdatum
+ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER=Handynummer
+ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Festnetznummer
+ADMIN_EXPORT_CONTACT_FAX_NUMBER=Faxnummer
+ADMIN_EXPORT_CONTACT_CREATED=Eintrag erstellt
index ad73ae5314a24d21e2c733771a77d14e1348c709..d0f840152e5a8adbc9034f48b8fb03ca7b9ce9b8 100644 (file)
@@ -506,8 +506,25 @@ ADMIN_EXPORT_CONTACTS_TITLE=Start data export
 #Bei sehr gro\u00dfen Datenmengen kann es eventuell zu Zeit\u00fcberschreitungen kommen. Daher sollten Sie besser seitenweise exportieren.
 ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING=Big data amount may lead to timeouts. You should then try to export each page separately.
 BUTTON_ADMIN_EXPORT_CONTACTS_CSV=Export all data as CSV file
+BUTTON_ADMIN_EXPORT_CONTACTS_XLS=Export all data as Excel file
 LINK_ADMIN_EXPORT_CONTACT=Export data
 LINK_ADMIN_EXPORT_CONTACT_TITLE=Export contact data
 PERSONAL_DATA_BIRTHDAY=Birthday (mm-dd-yyyy):
 BIRTHDAY_PATTERN=MM-dd-yyyy
 INVALID_BIRTHDAY=Wrong birthday entered.
+ADMIN_EXPORT_CONTACT_ID=Contact data id
+ADMIN_EXPORT_CONTACT_GENDER=Gender
+ADMIN_EXPORT_CONTACT_TITLE=Title
+ADMIN_EXPORT_CONTACT_FIRST_NAME=First name
+ADMIN_EXPORT_CONTACT_FAMILY_NAME=Family name
+ADMIN_EXPORT_CONTACT_STREET=Street
+ADMIN_EXPORT_CONTACT_HOUSE_NUMBER=House number
+ADMIN_EXPORT_CONTACT_COUNTRY_CODE=Country code
+ADMIN_EXPORT_CONTACT_ZIP_CODE=ZIP code
+ADMIN_EXPORT_CONTACT_CITY=City
+ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email address
+ADMIN_EXPORT_CONTACT_BIRTHDAY=Birthday
+ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER=Cellphone number
+ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Land-line number
+ADMIN_EXPORT_CONTACT_FAX_NUMBER=Fax number
+ADMIN_EXPORT_CONTACT_CREATED=Entry created
index 21816e6d070c59c9ea65bb91785af08386fd3d70..8ee9e3bdb12890e1738b3ecd739a33eae27e2974 100644 (file)
@@ -21,7 +21,7 @@
                                <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_big" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}" rendered="#{contactController.hasContacts()}">
                                        <p:column exportable="false">
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
                                                </f:facet>
 
                                                <h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_TITLE}" value="#{contact.contactId}">
@@ -31,7 +31,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_GENDER}" />
                                                </f:facet>
 
                                                <h:outputText value="#{msg[contact.contactGender.messageKey]}" />
@@ -39,7 +39,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_TITLE}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_TITLE}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactTitle}" />
@@ -47,7 +47,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FIRST_NAME}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactFirstName}" />
@@ -55,7 +55,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAMILY_NAME}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactFamilyName}" />
@@ -63,7 +63,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_STREET}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_STREET}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactStreet}" />
@@ -71,7 +71,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactHouseNumber}" />
@@ -79,7 +79,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_COUNTRY_CODE}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactCountry.countryCode}" />
@@ -87,7 +87,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ZIP_CODE}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactZipCode}" />
@@ -95,7 +95,7 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_CITY}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CITY}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactCity}" />
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS}" />
                                                </f:facet>
 
                                                <h:outputText value="#{contact.contactEmailAddress}" />
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_BIRTHDAY}" />
                                                </f:facet>
 
                                                <h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_CELLPHONE_NUMBER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER}" />
                                                </f:facet>
 
                                                <h:outputText value="#{adminContactController.generateCellphoneNumber(contact.contactCellphoneNumber)}" />
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_LANDLINE_NUMBER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
                                                </f:facet>
 
                                                <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactLandLineNumber)}" />
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_FAX_NUMBER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
                                                </f:facet>
 
                                                <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactFaxNumber)}" />
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                                </f:facet>
 
                                                <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="submit" type="submit" id="export_contacts" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_CSV}">
-                                                       <p:dataExporter type="csv" target="table_export_contacts" fileName="all_contacts" />
+                                               <h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
+                                                       <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
                                                </h:commandButton>
                                        </div>
                                </div>