reviews = this.caseFacade.getAllOpenReviewsUnrestricted();
+
+ if (!this.targetDirectory.exists()) {
this.targetDirectory.mkdirs();
-
+ }
+
File revCsv = new File(this.targetDirectory.getAbsolutePath() + System.getProperty("file.separator") + "wiedervorlagen-fristen.csv");
- if(revCsv.exists())
+ if (revCsv.exists()) {
revCsv.delete();
-
+ }
+
StringBuffer excelStr = new StringBuffer();
-
+
// faellig, Typ, Aktenzeichen, Kurzrubrum, Grund
excelStr.append("faellig");
excelStr.append(CELL_BREAK);
@@ -754,17 +758,18 @@ public String exportReviews() throws Exception {
excelStr.append(CELL_BREAK);
excelStr.append("Grund");
excelStr.append(LINE_BREAK);
-
- for (ArchiveFileReviewsBean rev: reviews) {
-
+
+ for (ArchiveFileReviewsBean rev : reviews) {
+
excelStr.append(toDate(df, rev.getReviewDate()));
excelStr.append(CELL_BREAK);
- if(rev.getReviewType()==ArchiveFileReviewsBean.REVIEWTYPE_FOLLOWUP)
+ if (rev.getReviewType() == ArchiveFileReviewsBean.REVIEWTYPE_FOLLOWUP) {
excelStr.append(escape("Wiedervorlage"));
- else if(rev.getReviewType()==ArchiveFileReviewsBean.REVIEWTYPE_FOLLOWUP)
+ } else if (rev.getReviewType() == ArchiveFileReviewsBean.REVIEWTYPE_FOLLOWUP) {
excelStr.append(escape("Frist"));
- else
+ } else {
excelStr.append(escape("-"));
+ }
excelStr.append(CELL_BREAK);
excelStr.append(escape(rev.getArchiveFileKey().getFileNumber()));
excelStr.append(CELL_BREAK);
@@ -772,14 +777,14 @@ else if(rev.getReviewType()==ArchiveFileReviewsBean.REVIEWTYPE_FOLLOWUP)
excelStr.append(CELL_BREAK);
excelStr.append(escape(rev.getReviewReason()));
excelStr.append(LINE_BREAK);
-
+
}
-
- FileWriter fw=new FileWriter(revCsv);
+
+ FileWriter fw = new FileWriter(revCsv);
fw.write(excelStr.toString());
fw.flush();
fw.close();
-
+
return revCsv.getPath();
}
@@ -791,7 +796,7 @@ public String export(ArchiveFileBean dto, Date lastModified) throws Exception {
}
newDir.mkdirs();
-
+
copyToLocal("templates/exporthtml/index.html", "index.html", newDir, "");
copyToLocal("templates/exporthtml/j-lawyer_style.css", "j-lawyer_style.css", newDir, "");
@@ -894,18 +899,22 @@ public String export(ArchiveFileBean dto, Date lastModified) throws Exception {
String dbNewName = removeSonderzeichen(db.getName());
try {
- byte[] docContent = caseFacade.getDocumentContentUnrestricted(db.getId());
- FileOutputStream docOut = new FileOutputStream(newDir3.getAbsolutePath() + System.getProperty("file.separator") + dbNewName);
- docOut.write(docContent);
- docOut.close();
+ byte[] docContent = caseFacade.getDocumentContentUnrestricted(db.getId());
+ FileOutputStream docOut = new FileOutputStream(newDir3.getAbsolutePath() + System.getProperty("file.separator") + dbNewName);
+ docOut.write(docContent);
+ docOut.close();
+ File docOutFile = new File(newDir3.getAbsolutePath() + System.getProperty("file.separator") + dbNewName);
+ if (db.getCreationDate() != null) {
+ docOutFile.setLastModified(db.getCreationDate().getTime());
+ }
} catch (Throwable t) {
log.error("Could not export document " + db.getName() + " from case " + dto.getFileNumber(), t);
-
+
}
// 01.01.2013 | dings |
sb.append("");
- sb.append(toDate(df,db.getCreationDate()));
+ sb.append(toDate(df, db.getCreationDate()));
sb.append(" | ");
@@ -923,22 +932,22 @@ public String export(ArchiveFileBean dto, Date lastModified) throws Exception {
fw.write(sContent);
fw.close();
-
if (lastModified != null) {
FileWriter fwmod = new FileWriter(newDir.getPath() + File.separator + ".lastchanged");
fwmod.write("" + lastModified.getTime());
fwmod.close();
}
-
+
return newDir.getAbsolutePath();
}
-
+
private String toDate(SimpleDateFormat dateFormat, Date d) {
- if(d==null)
+ if (d == null) {
return "";
- else
+ } else {
return dateFormat.format(d);
+ }
}
public void zipDirectory(String dirToZip, String targetFile) throws Exception {
@@ -970,7 +979,13 @@ private void addDirToZipArchive(ZipOutputStream zos, File fileToZip, String parr
System.out.println(" " + zipEntryName);
byte[] buffer = new byte[1024];
FileInputStream fis = new FileInputStream(fileToZip);
- zos.putNextEntry(new ZipEntry(zipEntryName));
+ ZipEntry ze=new ZipEntry(zipEntryName);
+ try {
+ ze.setLastModifiedTime(FileTime.fromMillis(fileToZip.lastModified()));
+ } catch (Throwable t) {
+ log.error("Could not set last modified time of " + fileToZip.getName(), t);
+ }
+ zos.putNextEntry(ze);
int length;
while ((length = fis.read(buffer)) > 0) {
zos.write(buffer, 0, length);
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppOptionGroupBeanFacade.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppOptionGroupBeanFacade.java
index c38a5e877..20d7c6270 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppOptionGroupBeanFacade.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppOptionGroupBeanFacade.java
@@ -664,6 +664,7 @@
package com.jdimension.jlawyer.persistence;
import java.util.List;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -686,6 +687,7 @@ public AppOptionGroupBeanFacade() {
super(AppOptionGroupBean.class);
}
+ @RolesAllowed("loginRole")
public AppOptionGroupBean[] findByOptionGroup(String optionGroup) {
List results=em.createNamedQuery("AppOptionGroupBean.findByOptionGroup").setParameter("optionGroup", optionGroup).getResultList();
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppUserBeanFacade.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppUserBeanFacade.java
index e7454c962..6c3d93d3e 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppUserBeanFacade.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/AppUserBeanFacade.java
@@ -664,6 +664,8 @@
package com.jdimension.jlawyer.persistence;
import java.util.List;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -687,11 +689,20 @@ public AppUserBeanFacade() {
}
@Override
+ @RolesAllowed("loginRole")
public AppUserBean findByPrincipalId(String principalId) {
AppUserBean u=(AppUserBean)em.createNamedQuery("AppUserBean.findByPrincipalId").setParameter("principalId", principalId).getSingleResult();
return u;
}
+
+ @Override
+ @RolesAllowed("loginRole")
+ public List findAll() {
+ return super.findAll(); //To change body of generated methods, choose Tools | Templates.
+ }
+
+
}
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/DocumentTagsBeanFacade.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/DocumentTagsBeanFacade.java
new file mode 100644
index 000000000..90f34c635
--- /dev/null
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/DocumentTagsBeanFacade.java
@@ -0,0 +1,702 @@
+/*
+ * GNU AFFERO GENERAL PUBLIC LICENSE
+ * Version 3, 19 November 2007
+ *
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ * Everyone is permitted to copy and distribute verbatim copies
+ * of this license document, but changing it is not allowed.
+ *
+ * Preamble
+ *
+ * The GNU Affero General Public License is a free, copyleft license for
+ * software and other kinds of works, specifically designed to ensure
+ * cooperation with the community in the case of network server software.
+ *
+ * The licenses for most software and other practical works are designed
+ * to take away your freedom to share and change the works. By contrast,
+ * our General Public Licenses are intended to guarantee your freedom to
+ * share and change all versions of a program--to make sure it remains free
+ * software for all its users.
+ *
+ * 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
+ * them 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.
+ *
+ * Developers that use our General Public Licenses protect your rights
+ * with two steps: (1) assert copyright on the software, and (2) offer
+ * you this License which gives you legal permission to copy, distribute
+ * and/or modify the software.
+ *
+ * A secondary benefit of defending all users' freedom is that
+ * improvements made in alternate versions of the program, if they
+ * receive widespread use, become available for other developers to
+ * incorporate. Many developers of free software are heartened and
+ * encouraged by the resulting cooperation. However, in the case of
+ * software used on network servers, this result may fail to come about.
+ * The GNU General Public License permits making a modified version and
+ * letting the public access it on a server without ever releasing its
+ * source code to the public.
+ *
+ * The GNU Affero General Public License is designed specifically to
+ * ensure that, in such cases, the modified source code becomes available
+ * to the community. It requires the operator of a network server to
+ * provide the source code of the modified version running there to the
+ * users of that server. Therefore, public use of a modified version, on
+ * a publicly accessible server, gives the public access to the source
+ * code of the modified version.
+ *
+ * An older license, called the Affero General Public License and
+ * published by Affero, was designed to accomplish similar goals. This is
+ * a different license, not a version of the Affero GPL, but Affero has
+ * released a new version of the Affero GPL which permits relicensing under
+ * this license.
+ *
+ * The precise terms and conditions for copying, distribution and
+ * modification follow.
+ *
+ * TERMS AND CONDITIONS
+ *
+ * 0. Definitions.
+ *
+ * "This License" refers to version 3 of the GNU Affero General Public License.
+ *
+ * "Copyright" also means copyright-like laws that apply to other kinds of
+ * works, such as semiconductor masks.
+ *
+ * "The Program" refers to any copyrightable work licensed under this
+ * License. Each licensee is addressed as "you". "Licensees" and
+ * "recipients" may be individuals or organizations.
+ *
+ * To "modify" a work means to copy from or adapt all or part of the work
+ * in a fashion requiring copyright permission, other than the making of an
+ * exact copy. The resulting work is called a "modified version" of the
+ * earlier work or a work "based on" the earlier work.
+ *
+ * A "covered work" means either the unmodified Program or a work based
+ * on the Program.
+ *
+ * To "propagate" a work means to do anything with it that, without
+ * permission, would make you directly or secondarily liable for
+ * infringement under applicable copyright law, except executing it on a
+ * computer or modifying a private copy. Propagation includes copying,
+ * distribution (with or without modification), making available to the
+ * public, and in some countries other activities as well.
+ *
+ * To "convey" a work means any kind of propagation that enables other
+ * parties to make or receive copies. Mere interaction with a user through
+ * a computer network, with no transfer of a copy, is not conveying.
+ *
+ * An interactive user interface displays "Appropriate Legal Notices"
+ * to the extent that it includes a convenient and prominently visible
+ * feature that (1) displays an appropriate copyright notice, and (2)
+ * tells the user that there is no warranty for the work (except to the
+ * extent that warranties are provided), that licensees may convey the
+ * work under this License, and how to view a copy of this License. If
+ * the interface presents a list of user commands or options, such as a
+ * menu, a prominent item in the list meets this criterion.
+ *
+ * 1. Source Code.
+ *
+ * The "source code" for a work means the preferred form of the work
+ * for making modifications to it. "Object code" means any non-source
+ * form of a work.
+ *
+ * A "Standard Interface" means an interface that either is an official
+ * standard defined by a recognized standards body, or, in the case of
+ * interfaces specified for a particular programming language, one that
+ * is widely used among developers working in that language.
+ *
+ * The "System Libraries" of an executable work include anything, other
+ * than the work as a whole, that (a) is included in the normal form of
+ * packaging a Major Component, but which is not part of that Major
+ * Component, and (b) serves only to enable use of the work with that
+ * Major Component, or to implement a Standard Interface for which an
+ * implementation is available to the public in source code form. A
+ * "Major Component", in this context, means a major essential component
+ * (kernel, window system, and so on) of the specific operating system
+ * (if any) on which the executable work runs, or a compiler used to
+ * produce the work, or an object code interpreter used to run it.
+ *
+ * The "Corresponding Source" for a work in object code form means all
+ * the source code needed to generate, install, and (for an executable
+ * work) run the object code and to modify the work, including scripts to
+ * control those activities. However, it does not include the work's
+ * System Libraries, or general-purpose tools or generally available free
+ * programs which are used unmodified in performing those activities but
+ * which are not part of the work. For example, Corresponding Source
+ * includes interface definition files associated with source files for
+ * the work, and the source code for shared libraries and dynamically
+ * linked subprograms that the work is specifically designed to require,
+ * such as by intimate data communication or control flow between those
+ * subprograms and other parts of the work.
+ *
+ * The Corresponding Source need not include anything that users
+ * can regenerate automatically from other parts of the Corresponding
+ * Source.
+ *
+ * The Corresponding Source for a work in source code form is that
+ * same work.
+ *
+ * 2. Basic Permissions.
+ *
+ * All rights granted under this License are granted for the term of
+ * copyright on the Program, and are irrevocable provided the stated
+ * conditions are met. This License explicitly affirms your unlimited
+ * permission to run the unmodified Program. The output from running a
+ * covered work is covered by this License only if the output, given its
+ * content, constitutes a covered work. This License acknowledges your
+ * rights of fair use or other equivalent, as provided by copyright law.
+ *
+ * You may make, run and propagate covered works that you do not
+ * convey, without conditions so long as your license otherwise remains
+ * in force. You may convey covered works to others for the sole purpose
+ * of having them make modifications exclusively for you, or provide you
+ * with facilities for running those works, provided that you comply with
+ * the terms of this License in conveying all material for which you do
+ * not control copyright. Those thus making or running the covered works
+ * for you must do so exclusively on your behalf, under your direction
+ * and control, on terms that prohibit them from making any copies of
+ * your copyrighted material outside their relationship with you.
+ *
+ * Conveying under any other circumstances is permitted solely under
+ * the conditions stated below. Sublicensing is not allowed; section 10
+ * makes it unnecessary.
+ *
+ * 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+ *
+ * No covered work shall be deemed part of an effective technological
+ * measure under any applicable law fulfilling obligations under article
+ * 11 of the WIPO copyright treaty adopted on 20 December 1996, or
+ * similar laws prohibiting or restricting circumvention of such
+ * measures.
+ *
+ * When you convey a covered work, you waive any legal power to forbid
+ * circumvention of technological measures to the extent such circumvention
+ * is effected by exercising rights under this License with respect to
+ * the covered work, and you disclaim any intention to limit operation or
+ * modification of the work as a means of enforcing, against the work's
+ * users, your or third parties' legal rights to forbid circumvention of
+ * technological measures.
+ *
+ * 4. Conveying Verbatim Copies.
+ *
+ * You may convey 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;
+ * keep intact all notices stating that this License and any
+ * non-permissive terms added in accord with section 7 apply to the code;
+ * keep intact all notices of the absence of any warranty; and give all
+ * recipients a copy of this License along with the Program.
+ *
+ * You may charge any price or no price for each copy that you convey,
+ * and you may offer support or warranty protection for a fee.
+ *
+ * 5. Conveying Modified Source Versions.
+ *
+ * You may convey a work based on the Program, or the modifications to
+ * produce it from the Program, in the form of source code under the
+ * terms of section 4, provided that you also meet all of these conditions:
+ *
+ * a) The work must carry prominent notices stating that you modified
+ * it, and giving a relevant date.
+ *
+ * b) The work must carry prominent notices stating that it is
+ * released under this License and any conditions added under section
+ * 7. This requirement modifies the requirement in section 4 to
+ * "keep intact all notices".
+ *
+ * c) You must license the entire work, as a whole, under this
+ * License to anyone who comes into possession of a copy. This
+ * License will therefore apply, along with any applicable section 7
+ * additional terms, to the whole of the work, and all its parts,
+ * regardless of how they are packaged. This License gives no
+ * permission to license the work in any other way, but it does not
+ * invalidate such permission if you have separately received it.
+ *
+ * d) If the work has interactive user interfaces, each must display
+ * Appropriate Legal Notices; however, if the Program has interactive
+ * interfaces that do not display Appropriate Legal Notices, your
+ * work need not make them do so.
+ *
+ * A compilation of a covered work with other separate and independent
+ * works, which are not by their nature extensions of the covered work,
+ * and which are not combined with it such as to form a larger program,
+ * in or on a volume of a storage or distribution medium, is called an
+ * "aggregate" if the compilation and its resulting copyright are not
+ * used to limit the access or legal rights of the compilation's users
+ * beyond what the individual works permit. Inclusion of a covered work
+ * in an aggregate does not cause this License to apply to the other
+ * parts of the aggregate.
+ *
+ * 6. Conveying Non-Source Forms.
+ *
+ * You may convey a covered work in object code form under the terms
+ * of sections 4 and 5, provided that you also convey the
+ * machine-readable Corresponding Source under the terms of this License,
+ * in one of these ways:
+ *
+ * a) Convey the object code in, or embodied in, a physical product
+ * (including a physical distribution medium), accompanied by the
+ * Corresponding Source fixed on a durable physical medium
+ * customarily used for software interchange.
+ *
+ * b) Convey the object code in, or embodied in, a physical product
+ * (including a physical distribution medium), accompanied by a
+ * written offer, valid for at least three years and valid for as
+ * long as you offer spare parts or customer support for that product
+ * model, to give anyone who possesses the object code either (1) a
+ * copy of the Corresponding Source for all the software in the
+ * product that is covered by this License, on a durable physical
+ * medium customarily used for software interchange, for a price no
+ * more than your reasonable cost of physically performing this
+ * conveying of source, or (2) access to copy the
+ * Corresponding Source from a network server at no charge.
+ *
+ * c) Convey individual copies of the object code with a copy of the
+ * written offer to provide the Corresponding Source. This
+ * alternative is allowed only occasionally and noncommercially, and
+ * only if you received the object code with such an offer, in accord
+ * with subsection 6b.
+ *
+ * d) Convey the object code by offering access from a designated
+ * place (gratis or for a charge), and offer equivalent access to the
+ * Corresponding Source in the same way through the same place at no
+ * further charge. You need not require recipients to copy the
+ * Corresponding Source along with the object code. If the place to
+ * copy the object code is a network server, the Corresponding Source
+ * may be on a different server (operated by you or a third party)
+ * that supports equivalent copying facilities, provided you maintain
+ * clear directions next to the object code saying where to find the
+ * Corresponding Source. Regardless of what server hosts the
+ * Corresponding Source, you remain obligated to ensure that it is
+ * available for as long as needed to satisfy these requirements.
+ *
+ * e) Convey the object code using peer-to-peer transmission, provided
+ * you inform other peers where the object code and Corresponding
+ * Source of the work are being offered to the general public at no
+ * charge under subsection 6d.
+ *
+ * A separable portion of the object code, whose source code is excluded
+ * from the Corresponding Source as a System Library, need not be
+ * included in conveying the object code work.
+ *
+ * A "User Product" is either (1) a "consumer product", which means any
+ * tangible personal property which is normally used for personal, family,
+ * or household purposes, or (2) anything designed or sold for incorporation
+ * into a dwelling. In determining whether a product is a consumer product,
+ * doubtful cases shall be resolved in favor of coverage. For a particular
+ * product received by a particular user, "normally used" refers to a
+ * typical or common use of that class of product, regardless of the status
+ * of the particular user or of the way in which the particular user
+ * actually uses, or expects or is expected to use, the product. A product
+ * is a consumer product regardless of whether the product has substantial
+ * commercial, industrial or non-consumer uses, unless such uses represent
+ * the only significant mode of use of the product.
+ *
+ * "Installation Information" for a User Product means any methods,
+ * procedures, authorization keys, or other information required to install
+ * and execute modified versions of a covered work in that User Product from
+ * a modified version of its Corresponding Source. The information must
+ * suffice to ensure that the continued functioning of the modified object
+ * code is in no case prevented or interfered with solely because
+ * modification has been made.
+ *
+ * If you convey an object code work under this section in, or with, or
+ * specifically for use in, a User Product, and the conveying occurs as
+ * part of a transaction in which the right of possession and use of the
+ * User Product is transferred to the recipient in perpetuity or for a
+ * fixed term (regardless of how the transaction is characterized), the
+ * Corresponding Source conveyed under this section must be accompanied
+ * by the Installation Information. But this requirement does not apply
+ * if neither you nor any third party retains the ability to install
+ * modified object code on the User Product (for example, the work has
+ * been installed in ROM).
+ *
+ * The requirement to provide Installation Information does not include a
+ * requirement to continue to provide support service, warranty, or updates
+ * for a work that has been modified or installed by the recipient, or for
+ * the User Product in which it has been modified or installed. Access to a
+ * network may be denied when the modification itself materially and
+ * adversely affects the operation of the network or violates the rules and
+ * protocols for communication across the network.
+ *
+ * Corresponding Source conveyed, and Installation Information provided,
+ * in accord with this section must be in a format that is publicly
+ * documented (and with an implementation available to the public in
+ * source code form), and must require no special password or key for
+ * unpacking, reading or copying.
+ *
+ * 7. Additional Terms.
+ *
+ * "Additional permissions" are terms that supplement the terms of this
+ * License by making exceptions from one or more of its conditions.
+ * Additional permissions that are applicable to the entire Program shall
+ * be treated as though they were included in this License, to the extent
+ * that they are valid under applicable law. If additional permissions
+ * apply only to part of the Program, that part may be used separately
+ * under those permissions, but the entire Program remains governed by
+ * this License without regard to the additional permissions.
+ *
+ * When you convey a copy of a covered work, you may at your option
+ * remove any additional permissions from that copy, or from any part of
+ * it. (Additional permissions may be written to require their own
+ * removal in certain cases when you modify the work.) You may place
+ * additional permissions on material, added by you to a covered work,
+ * for which you have or can give appropriate copyright permission.
+ *
+ * Notwithstanding any other provision of this License, for material you
+ * add to a covered work, you may (if authorized by the copyright holders of
+ * that material) supplement the terms of this License with terms:
+ *
+ * a) Disclaiming warranty or limiting liability differently from the
+ * terms of sections 15 and 16 of this License; or
+ *
+ * b) Requiring preservation of specified reasonable legal notices or
+ * author attributions in that material or in the Appropriate Legal
+ * Notices displayed by works containing it; or
+ *
+ * c) Prohibiting misrepresentation of the origin of that material, or
+ * requiring that modified versions of such material be marked in
+ * reasonable ways as different from the original version; or
+ *
+ * d) Limiting the use for publicity purposes of names of licensors or
+ * authors of the material; or
+ *
+ * e) Declining to grant rights under trademark law for use of some
+ * trade names, trademarks, or service marks; or
+ *
+ * f) Requiring indemnification of licensors and authors of that
+ * material by anyone who conveys the material (or modified versions of
+ * it) with contractual assumptions of liability to the recipient, for
+ * any liability that these contractual assumptions directly impose on
+ * those licensors and authors.
+ *
+ * All other non-permissive additional terms are considered "further
+ * restrictions" within the meaning of section 10. If the Program as you
+ * received it, or any part of it, contains a notice stating that it is
+ * governed by this License along with a term that is a further
+ * restriction, you may remove that term. If a license document contains
+ * a further restriction but permits relicensing or conveying under this
+ * License, you may add to a covered work material governed by the terms
+ * of that license document, provided that the further restriction does
+ * not survive such relicensing or conveying.
+ *
+ * If you add terms to a covered work in accord with this section, you
+ * must place, in the relevant source files, a statement of the
+ * additional terms that apply to those files, or a notice indicating
+ * where to find the applicable terms.
+ *
+ * Additional terms, permissive or non-permissive, may be stated in the
+ * form of a separately written license, or stated as exceptions;
+ * the above requirements apply either way.
+ *
+ * 8. Termination.
+ *
+ * You may not propagate or modify a covered work except as expressly
+ * provided under this License. Any attempt otherwise to propagate or
+ * modify it is void, and will automatically terminate your rights under
+ * this License (including any patent licenses granted under the third
+ * paragraph of section 11).
+ *
+ * However, if you cease all violation of this License, then your
+ * license from a particular copyright holder is reinstated (a)
+ * provisionally, unless and until the copyright holder explicitly and
+ * finally terminates your license, and (b) permanently, if the copyright
+ * holder fails to notify you of the violation by some reasonable means
+ * prior to 60 days after the cessation.
+ *
+ * Moreover, your license from a particular copyright holder is
+ * reinstated permanently if the copyright holder notifies you of the
+ * violation by some reasonable means, this is the first time you have
+ * received notice of violation of this License (for any work) from that
+ * copyright holder, and you cure the violation prior to 30 days after
+ * your receipt of the notice.
+ *
+ * Termination of your rights under this section does not terminate the
+ * licenses of parties who have received copies or rights from you under
+ * this License. If your rights have been terminated and not permanently
+ * reinstated, you do not qualify to receive new licenses for the same
+ * material under section 10.
+ *
+ * 9. Acceptance Not Required for Having Copies.
+ *
+ * You are not required to accept this License in order to receive or
+ * run a copy of the Program. Ancillary propagation of a covered work
+ * occurring solely as a consequence of using peer-to-peer transmission
+ * to receive a copy likewise does not require acceptance. However,
+ * nothing other than this License grants you permission to propagate or
+ * modify any covered work. These actions infringe copyright if you do
+ * not accept this License. Therefore, by modifying or propagating a
+ * covered work, you indicate your acceptance of this License to do so.
+ *
+ * 10. Automatic Licensing of Downstream Recipients.
+ *
+ * Each time you convey a covered work, the recipient automatically
+ * receives a license from the original licensors, to run, modify and
+ * propagate that work, subject to this License. You are not responsible
+ * for enforcing compliance by third parties with this License.
+ *
+ * An "entity transaction" is a transaction transferring control of an
+ * organization, or substantially all assets of one, or subdividing an
+ * organization, or merging organizations. If propagation of a covered
+ * work results from an entity transaction, each party to that
+ * transaction who receives a copy of the work also receives whatever
+ * licenses to the work the party's predecessor in interest had or could
+ * give under the previous paragraph, plus a right to possession of the
+ * Corresponding Source of the work from the predecessor in interest, if
+ * the predecessor has it or can get it with reasonable efforts.
+ *
+ * You may not impose any further restrictions on the exercise of the
+ * rights granted or affirmed under this License. For example, you may
+ * not impose a license fee, royalty, or other charge for exercise of
+ * rights granted under this License, and you may not initiate litigation
+ * (including a cross-claim or counterclaim in a lawsuit) alleging that
+ * any patent claim is infringed by making, using, selling, offering for
+ * sale, or importing the Program or any portion of it.
+ *
+ * 11. Patents.
+ *
+ * A "contributor" is a copyright holder who authorizes use under this
+ * License of the Program or a work on which the Program is based. The
+ * work thus licensed is called the contributor's "contributor version".
+ *
+ * A contributor's "essential patent claims" are all patent claims
+ * owned or controlled by the contributor, whether already acquired or
+ * hereafter acquired, that would be infringed by some manner, permitted
+ * by this License, of making, using, or selling its contributor version,
+ * but do not include claims that would be infringed only as a
+ * consequence of further modification of the contributor version. For
+ * purposes of this definition, "control" includes the right to grant
+ * patent sublicenses in a manner consistent with the requirements of
+ * this License.
+ *
+ * Each contributor grants you a non-exclusive, worldwide, royalty-free
+ * patent license under the contributor's essential patent claims, to
+ * make, use, sell, offer for sale, import and otherwise run, modify and
+ * propagate the contents of its contributor version.
+ *
+ * In the following three paragraphs, a "patent license" is any express
+ * agreement or commitment, however denominated, not to enforce a patent
+ * (such as an express permission to practice a patent or covenant not to
+ * sue for patent infringement). To "grant" such a patent license to a
+ * party means to make such an agreement or commitment not to enforce a
+ * patent against the party.
+ *
+ * If you convey a covered work, knowingly relying on a patent license,
+ * and the Corresponding Source of the work is not available for anyone
+ * to copy, free of charge and under the terms of this License, through a
+ * publicly available network server or other readily accessible means,
+ * then you must either (1) cause the Corresponding Source to be so
+ * available, or (2) arrange to deprive yourself of the benefit of the
+ * patent license for this particular work, or (3) arrange, in a manner
+ * consistent with the requirements of this License, to extend the patent
+ * license to downstream recipients. "Knowingly relying" means you have
+ * actual knowledge that, but for the patent license, your conveying the
+ * covered work in a country, or your recipient's use of the covered work
+ * in a country, would infringe one or more identifiable patents in that
+ * country that you have reason to believe are valid.
+ *
+ * If, pursuant to or in connection with a single transaction or
+ * arrangement, you convey, or propagate by procuring conveyance of, a
+ * covered work, and grant a patent license to some of the parties
+ * receiving the covered work authorizing them to use, propagate, modify
+ * or convey a specific copy of the covered work, then the patent license
+ * you grant is automatically extended to all recipients of the covered
+ * work and works based on it.
+ *
+ * A patent license is "discriminatory" if it does not include within
+ * the scope of its coverage, prohibits the exercise of, or is
+ * conditioned on the non-exercise of one or more of the rights that are
+ * specifically granted under this License. You may not convey a covered
+ * work if you are a party to an arrangement with a third party that is
+ * in the business of distributing software, under which you make payment
+ * to the third party based on the extent of your activity of conveying
+ * the work, and under which the third party grants, to any of the
+ * parties who would receive the covered work from you, a discriminatory
+ * patent license (a) in connection with copies of the covered work
+ * conveyed by you (or copies made from those copies), or (b) primarily
+ * for and in connection with specific products or compilations that
+ * contain the covered work, unless you entered into that arrangement,
+ * or that patent license was granted, prior to 28 March 2007.
+ *
+ * Nothing in this License shall be construed as excluding or limiting
+ * any implied license or other defenses to infringement that may
+ * otherwise be available to you under applicable patent law.
+ *
+ * 12. No Surrender of Others' Freedom.
+ *
+ * If 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 convey a
+ * covered work so as to satisfy simultaneously your obligations under this
+ * License and any other pertinent obligations, then as a consequence you may
+ * not convey it at all. For example, if you agree to terms that obligate you
+ * to collect a royalty for further conveying from those to whom you convey
+ * the Program, the only way you could satisfy both those terms and this
+ * License would be to refrain entirely from conveying the Program.
+ *
+ * 13. Remote Network Interaction; Use with the GNU General Public License.
+ *
+ * Notwithstanding any other provision of this License, if you modify the
+ * Program, your modified version must prominently offer all users
+ * interacting with it remotely through a computer network (if your version
+ * supports such interaction) an opportunity to receive the Corresponding
+ * Source of your version by providing access to the Corresponding Source
+ * from a network server at no charge, through some standard or customary
+ * means of facilitating copying of software. This Corresponding Source
+ * shall include the Corresponding Source for any work covered by version 3
+ * of the GNU General Public License that is incorporated pursuant to the
+ * following paragraph.
+ *
+ * Notwithstanding any other provision of this License, you have
+ * permission to link or combine any covered work with a work licensed
+ * under version 3 of the GNU General Public License into a single
+ * combined work, and to convey the resulting work. The terms of this
+ * License will continue to apply to the part which is the covered work,
+ * but the work with which it is combined will remain governed by version
+ * 3 of the GNU General Public License.
+ *
+ * 14. Revised Versions of this License.
+ *
+ * The Free Software Foundation may publish revised and/or new versions of
+ * the GNU Affero 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 that a certain numbered version of the GNU Affero General
+ * Public License "or any later version" applies to it, you have the
+ * option of following the terms and conditions either of that numbered
+ * version or of any later version published by the Free Software
+ * Foundation. If the Program does not specify a version number of the
+ * GNU Affero General Public License, you may choose any version ever published
+ * by the Free Software Foundation.
+ *
+ * If the Program specifies that a proxy can decide which future
+ * versions of the GNU Affero General Public License can be used, that proxy's
+ * public statement of acceptance of a version permanently authorizes you
+ * to choose that version for the Program.
+ *
+ * Later license versions may give you additional or different
+ * permissions. However, no additional obligations are imposed on any
+ * author or copyright holder as a result of your choosing to follow a
+ * later version.
+ *
+ * 15. Disclaimer of Warranty.
+ *
+ * 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.
+ *
+ * 16. Limitation of Liability.
+ *
+ * IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+ * WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+ * 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.
+ *
+ * 17. Interpretation of Sections 15 and 16.
+ *
+ * If the disclaimer of warranty and limitation of liability provided
+ * above cannot be given local legal effect according to their terms,
+ * reviewing courts shall apply local law that most closely approximates
+ * an absolute waiver of all civil liability in connection with the
+ * Program, unless a warranty or assumption of liability accompanies a
+ * copy of the Program in return for a fee.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * How to Apply These Terms to Your New Programs
+ *
+ * If you develop a new program, and you want it to be of the greatest
+ * possible use to the public, the best way to achieve this is to make it
+ * free software which everyone can redistribute and change under these terms.
+ *
+ * To do so, attach the following notices to the program. It is safest
+ * to attach them to the start of each source file to most effectively
+ * state the exclusion of warranty; and each file should have at least
+ * the "copyright" line and a pointer to where the full notice is found.
+ *
+ *
+ * Copyright (C)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ * Also add information on how to contact you by electronic and paper mail.
+ *
+ * If your software can interact with users remotely through a computer
+ * network, you should also make sure that it provides a way for users to
+ * get its source. For example, if your program is a web application, its
+ * interface could display a "Source" link that leads users to an archive
+ * of the code. There are many ways you could offer source, and different
+ * solutions will be better for different programs; see section 13 for the
+ * specific requirements.
+ *
+ * You should also get your employer (if you work as a programmer) or school,
+ * if any, to sign a "copyright disclaimer" for the program, if necessary.
+ * For more information on this, and how to apply and follow the GNU AGPL, see
+ * .
+ */
+package com.jdimension.jlawyer.persistence;
+
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author jens
+ */
+@Stateless
+public class DocumentTagsBeanFacade extends AbstractFacade implements DocumentTagsBeanFacadeLocal {
+ @PersistenceContext(unitName = "j-lawyer-server-ejbPU")
+ private EntityManager em;
+
+ @Override
+ protected EntityManager getEntityManager() {
+ return em;
+ }
+
+ public DocumentTagsBeanFacade() {
+ super(DocumentTagsBean.class);
+ }
+
+ @Override
+ public List findByDocumentKey(ArchiveFileDocumentsBean documentKey) {
+
+ List list = getEntityManager().createQuery("from DocumentTagsBean where documentKey = ?1").setParameter(1, documentKey).getResultList();
+ return list;
+ }
+
+ @Override
+ public List findByDocumentKeyAndTagName(ArchiveFileDocumentsBean documentKey, String tagName) {
+ List list = getEntityManager().createQuery("from DocumentTagsBean where documentKey = ?1 and tagName = ?2").setParameter(1, documentKey).setParameter(2, tagName).getResultList();
+ return list;
+ }
+
+}
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/DocumentTagsBeanFacadeLocal.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/DocumentTagsBeanFacadeLocal.java
new file mode 100644
index 000000000..ce68d6ddf
--- /dev/null
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/DocumentTagsBeanFacadeLocal.java
@@ -0,0 +1,694 @@
+/*
+ * GNU AFFERO GENERAL PUBLIC LICENSE
+ * Version 3, 19 November 2007
+ *
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ * Everyone is permitted to copy and distribute verbatim copies
+ * of this license document, but changing it is not allowed.
+ *
+ * Preamble
+ *
+ * The GNU Affero General Public License is a free, copyleft license for
+ * software and other kinds of works, specifically designed to ensure
+ * cooperation with the community in the case of network server software.
+ *
+ * The licenses for most software and other practical works are designed
+ * to take away your freedom to share and change the works. By contrast,
+ * our General Public Licenses are intended to guarantee your freedom to
+ * share and change all versions of a program--to make sure it remains free
+ * software for all its users.
+ *
+ * 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
+ * them 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.
+ *
+ * Developers that use our General Public Licenses protect your rights
+ * with two steps: (1) assert copyright on the software, and (2) offer
+ * you this License which gives you legal permission to copy, distribute
+ * and/or modify the software.
+ *
+ * A secondary benefit of defending all users' freedom is that
+ * improvements made in alternate versions of the program, if they
+ * receive widespread use, become available for other developers to
+ * incorporate. Many developers of free software are heartened and
+ * encouraged by the resulting cooperation. However, in the case of
+ * software used on network servers, this result may fail to come about.
+ * The GNU General Public License permits making a modified version and
+ * letting the public access it on a server without ever releasing its
+ * source code to the public.
+ *
+ * The GNU Affero General Public License is designed specifically to
+ * ensure that, in such cases, the modified source code becomes available
+ * to the community. It requires the operator of a network server to
+ * provide the source code of the modified version running there to the
+ * users of that server. Therefore, public use of a modified version, on
+ * a publicly accessible server, gives the public access to the source
+ * code of the modified version.
+ *
+ * An older license, called the Affero General Public License and
+ * published by Affero, was designed to accomplish similar goals. This is
+ * a different license, not a version of the Affero GPL, but Affero has
+ * released a new version of the Affero GPL which permits relicensing under
+ * this license.
+ *
+ * The precise terms and conditions for copying, distribution and
+ * modification follow.
+ *
+ * TERMS AND CONDITIONS
+ *
+ * 0. Definitions.
+ *
+ * "This License" refers to version 3 of the GNU Affero General Public License.
+ *
+ * "Copyright" also means copyright-like laws that apply to other kinds of
+ * works, such as semiconductor masks.
+ *
+ * "The Program" refers to any copyrightable work licensed under this
+ * License. Each licensee is addressed as "you". "Licensees" and
+ * "recipients" may be individuals or organizations.
+ *
+ * To "modify" a work means to copy from or adapt all or part of the work
+ * in a fashion requiring copyright permission, other than the making of an
+ * exact copy. The resulting work is called a "modified version" of the
+ * earlier work or a work "based on" the earlier work.
+ *
+ * A "covered work" means either the unmodified Program or a work based
+ * on the Program.
+ *
+ * To "propagate" a work means to do anything with it that, without
+ * permission, would make you directly or secondarily liable for
+ * infringement under applicable copyright law, except executing it on a
+ * computer or modifying a private copy. Propagation includes copying,
+ * distribution (with or without modification), making available to the
+ * public, and in some countries other activities as well.
+ *
+ * To "convey" a work means any kind of propagation that enables other
+ * parties to make or receive copies. Mere interaction with a user through
+ * a computer network, with no transfer of a copy, is not conveying.
+ *
+ * An interactive user interface displays "Appropriate Legal Notices"
+ * to the extent that it includes a convenient and prominently visible
+ * feature that (1) displays an appropriate copyright notice, and (2)
+ * tells the user that there is no warranty for the work (except to the
+ * extent that warranties are provided), that licensees may convey the
+ * work under this License, and how to view a copy of this License. If
+ * the interface presents a list of user commands or options, such as a
+ * menu, a prominent item in the list meets this criterion.
+ *
+ * 1. Source Code.
+ *
+ * The "source code" for a work means the preferred form of the work
+ * for making modifications to it. "Object code" means any non-source
+ * form of a work.
+ *
+ * A "Standard Interface" means an interface that either is an official
+ * standard defined by a recognized standards body, or, in the case of
+ * interfaces specified for a particular programming language, one that
+ * is widely used among developers working in that language.
+ *
+ * The "System Libraries" of an executable work include anything, other
+ * than the work as a whole, that (a) is included in the normal form of
+ * packaging a Major Component, but which is not part of that Major
+ * Component, and (b) serves only to enable use of the work with that
+ * Major Component, or to implement a Standard Interface for which an
+ * implementation is available to the public in source code form. A
+ * "Major Component", in this context, means a major essential component
+ * (kernel, window system, and so on) of the specific operating system
+ * (if any) on which the executable work runs, or a compiler used to
+ * produce the work, or an object code interpreter used to run it.
+ *
+ * The "Corresponding Source" for a work in object code form means all
+ * the source code needed to generate, install, and (for an executable
+ * work) run the object code and to modify the work, including scripts to
+ * control those activities. However, it does not include the work's
+ * System Libraries, or general-purpose tools or generally available free
+ * programs which are used unmodified in performing those activities but
+ * which are not part of the work. For example, Corresponding Source
+ * includes interface definition files associated with source files for
+ * the work, and the source code for shared libraries and dynamically
+ * linked subprograms that the work is specifically designed to require,
+ * such as by intimate data communication or control flow between those
+ * subprograms and other parts of the work.
+ *
+ * The Corresponding Source need not include anything that users
+ * can regenerate automatically from other parts of the Corresponding
+ * Source.
+ *
+ * The Corresponding Source for a work in source code form is that
+ * same work.
+ *
+ * 2. Basic Permissions.
+ *
+ * All rights granted under this License are granted for the term of
+ * copyright on the Program, and are irrevocable provided the stated
+ * conditions are met. This License explicitly affirms your unlimited
+ * permission to run the unmodified Program. The output from running a
+ * covered work is covered by this License only if the output, given its
+ * content, constitutes a covered work. This License acknowledges your
+ * rights of fair use or other equivalent, as provided by copyright law.
+ *
+ * You may make, run and propagate covered works that you do not
+ * convey, without conditions so long as your license otherwise remains
+ * in force. You may convey covered works to others for the sole purpose
+ * of having them make modifications exclusively for you, or provide you
+ * with facilities for running those works, provided that you comply with
+ * the terms of this License in conveying all material for which you do
+ * not control copyright. Those thus making or running the covered works
+ * for you must do so exclusively on your behalf, under your direction
+ * and control, on terms that prohibit them from making any copies of
+ * your copyrighted material outside their relationship with you.
+ *
+ * Conveying under any other circumstances is permitted solely under
+ * the conditions stated below. Sublicensing is not allowed; section 10
+ * makes it unnecessary.
+ *
+ * 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+ *
+ * No covered work shall be deemed part of an effective technological
+ * measure under any applicable law fulfilling obligations under article
+ * 11 of the WIPO copyright treaty adopted on 20 December 1996, or
+ * similar laws prohibiting or restricting circumvention of such
+ * measures.
+ *
+ * When you convey a covered work, you waive any legal power to forbid
+ * circumvention of technological measures to the extent such circumvention
+ * is effected by exercising rights under this License with respect to
+ * the covered work, and you disclaim any intention to limit operation or
+ * modification of the work as a means of enforcing, against the work's
+ * users, your or third parties' legal rights to forbid circumvention of
+ * technological measures.
+ *
+ * 4. Conveying Verbatim Copies.
+ *
+ * You may convey 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;
+ * keep intact all notices stating that this License and any
+ * non-permissive terms added in accord with section 7 apply to the code;
+ * keep intact all notices of the absence of any warranty; and give all
+ * recipients a copy of this License along with the Program.
+ *
+ * You may charge any price or no price for each copy that you convey,
+ * and you may offer support or warranty protection for a fee.
+ *
+ * 5. Conveying Modified Source Versions.
+ *
+ * You may convey a work based on the Program, or the modifications to
+ * produce it from the Program, in the form of source code under the
+ * terms of section 4, provided that you also meet all of these conditions:
+ *
+ * a) The work must carry prominent notices stating that you modified
+ * it, and giving a relevant date.
+ *
+ * b) The work must carry prominent notices stating that it is
+ * released under this License and any conditions added under section
+ * 7. This requirement modifies the requirement in section 4 to
+ * "keep intact all notices".
+ *
+ * c) You must license the entire work, as a whole, under this
+ * License to anyone who comes into possession of a copy. This
+ * License will therefore apply, along with any applicable section 7
+ * additional terms, to the whole of the work, and all its parts,
+ * regardless of how they are packaged. This License gives no
+ * permission to license the work in any other way, but it does not
+ * invalidate such permission if you have separately received it.
+ *
+ * d) If the work has interactive user interfaces, each must display
+ * Appropriate Legal Notices; however, if the Program has interactive
+ * interfaces that do not display Appropriate Legal Notices, your
+ * work need not make them do so.
+ *
+ * A compilation of a covered work with other separate and independent
+ * works, which are not by their nature extensions of the covered work,
+ * and which are not combined with it such as to form a larger program,
+ * in or on a volume of a storage or distribution medium, is called an
+ * "aggregate" if the compilation and its resulting copyright are not
+ * used to limit the access or legal rights of the compilation's users
+ * beyond what the individual works permit. Inclusion of a covered work
+ * in an aggregate does not cause this License to apply to the other
+ * parts of the aggregate.
+ *
+ * 6. Conveying Non-Source Forms.
+ *
+ * You may convey a covered work in object code form under the terms
+ * of sections 4 and 5, provided that you also convey the
+ * machine-readable Corresponding Source under the terms of this License,
+ * in one of these ways:
+ *
+ * a) Convey the object code in, or embodied in, a physical product
+ * (including a physical distribution medium), accompanied by the
+ * Corresponding Source fixed on a durable physical medium
+ * customarily used for software interchange.
+ *
+ * b) Convey the object code in, or embodied in, a physical product
+ * (including a physical distribution medium), accompanied by a
+ * written offer, valid for at least three years and valid for as
+ * long as you offer spare parts or customer support for that product
+ * model, to give anyone who possesses the object code either (1) a
+ * copy of the Corresponding Source for all the software in the
+ * product that is covered by this License, on a durable physical
+ * medium customarily used for software interchange, for a price no
+ * more than your reasonable cost of physically performing this
+ * conveying of source, or (2) access to copy the
+ * Corresponding Source from a network server at no charge.
+ *
+ * c) Convey individual copies of the object code with a copy of the
+ * written offer to provide the Corresponding Source. This
+ * alternative is allowed only occasionally and noncommercially, and
+ * only if you received the object code with such an offer, in accord
+ * with subsection 6b.
+ *
+ * d) Convey the object code by offering access from a designated
+ * place (gratis or for a charge), and offer equivalent access to the
+ * Corresponding Source in the same way through the same place at no
+ * further charge. You need not require recipients to copy the
+ * Corresponding Source along with the object code. If the place to
+ * copy the object code is a network server, the Corresponding Source
+ * may be on a different server (operated by you or a third party)
+ * that supports equivalent copying facilities, provided you maintain
+ * clear directions next to the object code saying where to find the
+ * Corresponding Source. Regardless of what server hosts the
+ * Corresponding Source, you remain obligated to ensure that it is
+ * available for as long as needed to satisfy these requirements.
+ *
+ * e) Convey the object code using peer-to-peer transmission, provided
+ * you inform other peers where the object code and Corresponding
+ * Source of the work are being offered to the general public at no
+ * charge under subsection 6d.
+ *
+ * A separable portion of the object code, whose source code is excluded
+ * from the Corresponding Source as a System Library, need not be
+ * included in conveying the object code work.
+ *
+ * A "User Product" is either (1) a "consumer product", which means any
+ * tangible personal property which is normally used for personal, family,
+ * or household purposes, or (2) anything designed or sold for incorporation
+ * into a dwelling. In determining whether a product is a consumer product,
+ * doubtful cases shall be resolved in favor of coverage. For a particular
+ * product received by a particular user, "normally used" refers to a
+ * typical or common use of that class of product, regardless of the status
+ * of the particular user or of the way in which the particular user
+ * actually uses, or expects or is expected to use, the product. A product
+ * is a consumer product regardless of whether the product has substantial
+ * commercial, industrial or non-consumer uses, unless such uses represent
+ * the only significant mode of use of the product.
+ *
+ * "Installation Information" for a User Product means any methods,
+ * procedures, authorization keys, or other information required to install
+ * and execute modified versions of a covered work in that User Product from
+ * a modified version of its Corresponding Source. The information must
+ * suffice to ensure that the continued functioning of the modified object
+ * code is in no case prevented or interfered with solely because
+ * modification has been made.
+ *
+ * If you convey an object code work under this section in, or with, or
+ * specifically for use in, a User Product, and the conveying occurs as
+ * part of a transaction in which the right of possession and use of the
+ * User Product is transferred to the recipient in perpetuity or for a
+ * fixed term (regardless of how the transaction is characterized), the
+ * Corresponding Source conveyed under this section must be accompanied
+ * by the Installation Information. But this requirement does not apply
+ * if neither you nor any third party retains the ability to install
+ * modified object code on the User Product (for example, the work has
+ * been installed in ROM).
+ *
+ * The requirement to provide Installation Information does not include a
+ * requirement to continue to provide support service, warranty, or updates
+ * for a work that has been modified or installed by the recipient, or for
+ * the User Product in which it has been modified or installed. Access to a
+ * network may be denied when the modification itself materially and
+ * adversely affects the operation of the network or violates the rules and
+ * protocols for communication across the network.
+ *
+ * Corresponding Source conveyed, and Installation Information provided,
+ * in accord with this section must be in a format that is publicly
+ * documented (and with an implementation available to the public in
+ * source code form), and must require no special password or key for
+ * unpacking, reading or copying.
+ *
+ * 7. Additional Terms.
+ *
+ * "Additional permissions" are terms that supplement the terms of this
+ * License by making exceptions from one or more of its conditions.
+ * Additional permissions that are applicable to the entire Program shall
+ * be treated as though they were included in this License, to the extent
+ * that they are valid under applicable law. If additional permissions
+ * apply only to part of the Program, that part may be used separately
+ * under those permissions, but the entire Program remains governed by
+ * this License without regard to the additional permissions.
+ *
+ * When you convey a copy of a covered work, you may at your option
+ * remove any additional permissions from that copy, or from any part of
+ * it. (Additional permissions may be written to require their own
+ * removal in certain cases when you modify the work.) You may place
+ * additional permissions on material, added by you to a covered work,
+ * for which you have or can give appropriate copyright permission.
+ *
+ * Notwithstanding any other provision of this License, for material you
+ * add to a covered work, you may (if authorized by the copyright holders of
+ * that material) supplement the terms of this License with terms:
+ *
+ * a) Disclaiming warranty or limiting liability differently from the
+ * terms of sections 15 and 16 of this License; or
+ *
+ * b) Requiring preservation of specified reasonable legal notices or
+ * author attributions in that material or in the Appropriate Legal
+ * Notices displayed by works containing it; or
+ *
+ * c) Prohibiting misrepresentation of the origin of that material, or
+ * requiring that modified versions of such material be marked in
+ * reasonable ways as different from the original version; or
+ *
+ * d) Limiting the use for publicity purposes of names of licensors or
+ * authors of the material; or
+ *
+ * e) Declining to grant rights under trademark law for use of some
+ * trade names, trademarks, or service marks; or
+ *
+ * f) Requiring indemnification of licensors and authors of that
+ * material by anyone who conveys the material (or modified versions of
+ * it) with contractual assumptions of liability to the recipient, for
+ * any liability that these contractual assumptions directly impose on
+ * those licensors and authors.
+ *
+ * All other non-permissive additional terms are considered "further
+ * restrictions" within the meaning of section 10. If the Program as you
+ * received it, or any part of it, contains a notice stating that it is
+ * governed by this License along with a term that is a further
+ * restriction, you may remove that term. If a license document contains
+ * a further restriction but permits relicensing or conveying under this
+ * License, you may add to a covered work material governed by the terms
+ * of that license document, provided that the further restriction does
+ * not survive such relicensing or conveying.
+ *
+ * If you add terms to a covered work in accord with this section, you
+ * must place, in the relevant source files, a statement of the
+ * additional terms that apply to those files, or a notice indicating
+ * where to find the applicable terms.
+ *
+ * Additional terms, permissive or non-permissive, may be stated in the
+ * form of a separately written license, or stated as exceptions;
+ * the above requirements apply either way.
+ *
+ * 8. Termination.
+ *
+ * You may not propagate or modify a covered work except as expressly
+ * provided under this License. Any attempt otherwise to propagate or
+ * modify it is void, and will automatically terminate your rights under
+ * this License (including any patent licenses granted under the third
+ * paragraph of section 11).
+ *
+ * However, if you cease all violation of this License, then your
+ * license from a particular copyright holder is reinstated (a)
+ * provisionally, unless and until the copyright holder explicitly and
+ * finally terminates your license, and (b) permanently, if the copyright
+ * holder fails to notify you of the violation by some reasonable means
+ * prior to 60 days after the cessation.
+ *
+ * Moreover, your license from a particular copyright holder is
+ * reinstated permanently if the copyright holder notifies you of the
+ * violation by some reasonable means, this is the first time you have
+ * received notice of violation of this License (for any work) from that
+ * copyright holder, and you cure the violation prior to 30 days after
+ * your receipt of the notice.
+ *
+ * Termination of your rights under this section does not terminate the
+ * licenses of parties who have received copies or rights from you under
+ * this License. If your rights have been terminated and not permanently
+ * reinstated, you do not qualify to receive new licenses for the same
+ * material under section 10.
+ *
+ * 9. Acceptance Not Required for Having Copies.
+ *
+ * You are not required to accept this License in order to receive or
+ * run a copy of the Program. Ancillary propagation of a covered work
+ * occurring solely as a consequence of using peer-to-peer transmission
+ * to receive a copy likewise does not require acceptance. However,
+ * nothing other than this License grants you permission to propagate or
+ * modify any covered work. These actions infringe copyright if you do
+ * not accept this License. Therefore, by modifying or propagating a
+ * covered work, you indicate your acceptance of this License to do so.
+ *
+ * 10. Automatic Licensing of Downstream Recipients.
+ *
+ * Each time you convey a covered work, the recipient automatically
+ * receives a license from the original licensors, to run, modify and
+ * propagate that work, subject to this License. You are not responsible
+ * for enforcing compliance by third parties with this License.
+ *
+ * An "entity transaction" is a transaction transferring control of an
+ * organization, or substantially all assets of one, or subdividing an
+ * organization, or merging organizations. If propagation of a covered
+ * work results from an entity transaction, each party to that
+ * transaction who receives a copy of the work also receives whatever
+ * licenses to the work the party's predecessor in interest had or could
+ * give under the previous paragraph, plus a right to possession of the
+ * Corresponding Source of the work from the predecessor in interest, if
+ * the predecessor has it or can get it with reasonable efforts.
+ *
+ * You may not impose any further restrictions on the exercise of the
+ * rights granted or affirmed under this License. For example, you may
+ * not impose a license fee, royalty, or other charge for exercise of
+ * rights granted under this License, and you may not initiate litigation
+ * (including a cross-claim or counterclaim in a lawsuit) alleging that
+ * any patent claim is infringed by making, using, selling, offering for
+ * sale, or importing the Program or any portion of it.
+ *
+ * 11. Patents.
+ *
+ * A "contributor" is a copyright holder who authorizes use under this
+ * License of the Program or a work on which the Program is based. The
+ * work thus licensed is called the contributor's "contributor version".
+ *
+ * A contributor's "essential patent claims" are all patent claims
+ * owned or controlled by the contributor, whether already acquired or
+ * hereafter acquired, that would be infringed by some manner, permitted
+ * by this License, of making, using, or selling its contributor version,
+ * but do not include claims that would be infringed only as a
+ * consequence of further modification of the contributor version. For
+ * purposes of this definition, "control" includes the right to grant
+ * patent sublicenses in a manner consistent with the requirements of
+ * this License.
+ *
+ * Each contributor grants you a non-exclusive, worldwide, royalty-free
+ * patent license under the contributor's essential patent claims, to
+ * make, use, sell, offer for sale, import and otherwise run, modify and
+ * propagate the contents of its contributor version.
+ *
+ * In the following three paragraphs, a "patent license" is any express
+ * agreement or commitment, however denominated, not to enforce a patent
+ * (such as an express permission to practice a patent or covenant not to
+ * sue for patent infringement). To "grant" such a patent license to a
+ * party means to make such an agreement or commitment not to enforce a
+ * patent against the party.
+ *
+ * If you convey a covered work, knowingly relying on a patent license,
+ * and the Corresponding Source of the work is not available for anyone
+ * to copy, free of charge and under the terms of this License, through a
+ * publicly available network server or other readily accessible means,
+ * then you must either (1) cause the Corresponding Source to be so
+ * available, or (2) arrange to deprive yourself of the benefit of the
+ * patent license for this particular work, or (3) arrange, in a manner
+ * consistent with the requirements of this License, to extend the patent
+ * license to downstream recipients. "Knowingly relying" means you have
+ * actual knowledge that, but for the patent license, your conveying the
+ * covered work in a country, or your recipient's use of the covered work
+ * in a country, would infringe one or more identifiable patents in that
+ * country that you have reason to believe are valid.
+ *
+ * If, pursuant to or in connection with a single transaction or
+ * arrangement, you convey, or propagate by procuring conveyance of, a
+ * covered work, and grant a patent license to some of the parties
+ * receiving the covered work authorizing them to use, propagate, modify
+ * or convey a specific copy of the covered work, then the patent license
+ * you grant is automatically extended to all recipients of the covered
+ * work and works based on it.
+ *
+ * A patent license is "discriminatory" if it does not include within
+ * the scope of its coverage, prohibits the exercise of, or is
+ * conditioned on the non-exercise of one or more of the rights that are
+ * specifically granted under this License. You may not convey a covered
+ * work if you are a party to an arrangement with a third party that is
+ * in the business of distributing software, under which you make payment
+ * to the third party based on the extent of your activity of conveying
+ * the work, and under which the third party grants, to any of the
+ * parties who would receive the covered work from you, a discriminatory
+ * patent license (a) in connection with copies of the covered work
+ * conveyed by you (or copies made from those copies), or (b) primarily
+ * for and in connection with specific products or compilations that
+ * contain the covered work, unless you entered into that arrangement,
+ * or that patent license was granted, prior to 28 March 2007.
+ *
+ * Nothing in this License shall be construed as excluding or limiting
+ * any implied license or other defenses to infringement that may
+ * otherwise be available to you under applicable patent law.
+ *
+ * 12. No Surrender of Others' Freedom.
+ *
+ * If 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 convey a
+ * covered work so as to satisfy simultaneously your obligations under this
+ * License and any other pertinent obligations, then as a consequence you may
+ * not convey it at all. For example, if you agree to terms that obligate you
+ * to collect a royalty for further conveying from those to whom you convey
+ * the Program, the only way you could satisfy both those terms and this
+ * License would be to refrain entirely from conveying the Program.
+ *
+ * 13. Remote Network Interaction; Use with the GNU General Public License.
+ *
+ * Notwithstanding any other provision of this License, if you modify the
+ * Program, your modified version must prominently offer all users
+ * interacting with it remotely through a computer network (if your version
+ * supports such interaction) an opportunity to receive the Corresponding
+ * Source of your version by providing access to the Corresponding Source
+ * from a network server at no charge, through some standard or customary
+ * means of facilitating copying of software. This Corresponding Source
+ * shall include the Corresponding Source for any work covered by version 3
+ * of the GNU General Public License that is incorporated pursuant to the
+ * following paragraph.
+ *
+ * Notwithstanding any other provision of this License, you have
+ * permission to link or combine any covered work with a work licensed
+ * under version 3 of the GNU General Public License into a single
+ * combined work, and to convey the resulting work. The terms of this
+ * License will continue to apply to the part which is the covered work,
+ * but the work with which it is combined will remain governed by version
+ * 3 of the GNU General Public License.
+ *
+ * 14. Revised Versions of this License.
+ *
+ * The Free Software Foundation may publish revised and/or new versions of
+ * the GNU Affero 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 that a certain numbered version of the GNU Affero General
+ * Public License "or any later version" applies to it, you have the
+ * option of following the terms and conditions either of that numbered
+ * version or of any later version published by the Free Software
+ * Foundation. If the Program does not specify a version number of the
+ * GNU Affero General Public License, you may choose any version ever published
+ * by the Free Software Foundation.
+ *
+ * If the Program specifies that a proxy can decide which future
+ * versions of the GNU Affero General Public License can be used, that proxy's
+ * public statement of acceptance of a version permanently authorizes you
+ * to choose that version for the Program.
+ *
+ * Later license versions may give you additional or different
+ * permissions. However, no additional obligations are imposed on any
+ * author or copyright holder as a result of your choosing to follow a
+ * later version.
+ *
+ * 15. Disclaimer of Warranty.
+ *
+ * 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.
+ *
+ * 16. Limitation of Liability.
+ *
+ * IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+ * WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+ * 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.
+ *
+ * 17. Interpretation of Sections 15 and 16.
+ *
+ * If the disclaimer of warranty and limitation of liability provided
+ * above cannot be given local legal effect according to their terms,
+ * reviewing courts shall apply local law that most closely approximates
+ * an absolute waiver of all civil liability in connection with the
+ * Program, unless a warranty or assumption of liability accompanies a
+ * copy of the Program in return for a fee.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * How to Apply These Terms to Your New Programs
+ *
+ * If you develop a new program, and you want it to be of the greatest
+ * possible use to the public, the best way to achieve this is to make it
+ * free software which everyone can redistribute and change under these terms.
+ *
+ * To do so, attach the following notices to the program. It is safest
+ * to attach them to the start of each source file to most effectively
+ * state the exclusion of warranty; and each file should have at least
+ * the "copyright" line and a pointer to where the full notice is found.
+ *
+ *
+ * Copyright (C)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ * Also add information on how to contact you by electronic and paper mail.
+ *
+ * If your software can interact with users remotely through a computer
+ * network, you should also make sure that it provides a way for users to
+ * get its source. For example, if your program is a web application, its
+ * interface could display a "Source" link that leads users to an archive
+ * of the code. There are many ways you could offer source, and different
+ * solutions will be better for different programs; see section 13 for the
+ * specific requirements.
+ *
+ * You should also get your employer (if you work as a programmer) or school,
+ * if any, to sign a "copyright disclaimer" for the program, if necessary.
+ * For more information on this, and how to apply and follow the GNU AGPL, see
+ * .
+ */
+package com.jdimension.jlawyer.persistence;
+
+import java.util.List;
+import javax.ejb.Local;
+
+/**
+ *
+ * @author jens
+ */
+@Local
+public interface DocumentTagsBeanFacadeLocal {
+
+ void create(DocumentTagsBean documentTagsBean);
+
+ void edit(DocumentTagsBean documentTagsBean);
+
+ void remove(DocumentTagsBean documentTagsBean);
+
+ DocumentTagsBean find(Object id);
+
+ List findAll();
+
+ List findRange(int[] range);
+
+ public List findByDocumentKey(ArchiveFileDocumentsBean documentKey);
+
+ List findByDocumentKeyAndTagName(ArchiveFileDocumentsBean documentKey, String tagName);
+
+ int count();
+
+}
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacade.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacade.java
index 65dfea42b..cbb502555 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacade.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacade.java
@@ -663,6 +663,7 @@
*/
package com.jdimension.jlawyer.persistence;
+import javax.annotation.security.PermitAll;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -672,6 +673,7 @@
* @author jens
*/
@Stateless
+@PermitAll
public class FaxQueueBeanFacade extends AbstractFacade implements FaxQueueBeanFacadeLocal {
@PersistenceContext(unitName = "j-lawyer-server-ejbPU")
private EntityManager em;
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacadeLocal.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacadeLocal.java
index 3b6ee7a01..dc0e8ad8d 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacadeLocal.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/FaxQueueBeanFacadeLocal.java
@@ -664,6 +664,7 @@
package com.jdimension.jlawyer.persistence;
import java.util.List;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.Local;
/**
@@ -681,6 +682,7 @@ public interface FaxQueueBeanFacadeLocal {
FaxQueueBean find(Object id);
+ @RolesAllowed("loginRole")
List findAll();
List findRange(int[] range);
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/ServerSettingsBeanFacade.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/ServerSettingsBeanFacade.java
index c32fc0929..fe90b3742 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/ServerSettingsBeanFacade.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/persistence/ServerSettingsBeanFacade.java
@@ -663,6 +663,7 @@
*/
package com.jdimension.jlawyer.persistence;
+import javax.annotation.security.PermitAll;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -672,6 +673,7 @@
* @author jens
*/
@Stateless
+@PermitAll
public class ServerSettingsBeanFacade extends AbstractFacade implements ServerSettingsBeanFacadeLocal {
@PersistenceContext(unitName = "j-lawyer-server-ejbPU")
private EntityManager em;
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AddressService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AddressService.java
index c69911786..2421bbbaa 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AddressService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AddressService.java
@@ -680,7 +680,7 @@
import javax.annotation.security.RolesAllowed;
import javax.ejb.*;
import org.apache.log4j.Logger;
-import org.jboss.security.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
*
@@ -704,14 +704,14 @@ public class AddressService implements AddressServiceRemote, AddressServiceLocal
@EJB
private AddressTagsBeanFacadeLocal addressTagsFacade;
- private static final String PS_SEARCHENHANCED_2="select id from AddressBean where ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(phone) like ? or ucase(mobile) like ?";
+ private static final String PS_SEARCHENHANCED_2="select id from contacts where ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(beaSafeId) like ? or ucase(phone) like ? or ucase(mobile) like ?";
@Override
@RolesAllowed({"readAddressRole"})
public int getAddressCount() {
JDBCUtils utils = new JDBCUtils();
try {
- return utils.getRowCount("AddressBean");
+ return utils.getRowCount("contacts");
} catch (Exception ex) {
throw new EJBException("Error getting number of addresses", ex);
}
@@ -781,7 +781,7 @@ public AddressBean[] searchSimple(String query) {
ArrayList list=new ArrayList();
try {
con=utils.getConnection();
- st=con.prepareStatement("select id from AddressBean where ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(phone) like ? or ucase(mobile) like ?");
+ st=con.prepareStatement("select id from contacts where ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(beaSafeId) like ? or ucase(phone) like ? or ucase(mobile) like ?");
String wildCard= "%" + StringUtils.germanToUpperCase(query) + "%";
st.setString(1, wildCard);
st.setString(2, wildCard);
@@ -792,6 +792,7 @@ public AddressBean[] searchSimple(String query) {
st.setString(7, wildCard);
st.setString(8, wildCard);
st.setString(9, wildCard);
+ st.setString(10, wildCard);
rs=st.executeQuery();
//AddressLocalHome home=this.lookupAddressBean();
@@ -891,7 +892,7 @@ public void setTag(String addressId, AddressTagsBean tag, boolean active) throws
@Override
@RolesAllowed({"readAddressRole"})
- public Collection getTags(String addressId) {
+ public Collection getTags(String addressId) {
AddressBean ab = this.addressFacade.find(addressId);
List resultList = this.addressTagsFacade.findByAddressKey(ab);
@@ -908,7 +909,7 @@ public List searchTagsInUse() {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select distinct(tagName) from AddressTagsBean order by tagName asc");
+ st = con.prepareStatement("select distinct(tagName) from contact_tags order by tagName asc");
rs = st.executeQuery();
while (rs.next()) {
@@ -969,7 +970,7 @@ public AddressBean[] searchEnhanced(String query, String[] tagName) {
}
inClause=inClause.replaceFirst(",", "");
- st = con.prepareStatement("select AddressBean.id from AddressBean, AddressTagsBean where (ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(phone) like ? or ucase(mobile) like ?) and (AddressTagsBean.tagName in (" + inClause + ") and AddressTagsBean.addressKey=AddressBean.id)");
+ st = con.prepareStatement("select contacts.id from contacts, contact_tags where (ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(beaSafeId) like ? or ucase(phone) like ? or ucase(mobile) like ?) and (contact_tags.tagName in (" + inClause + ") and contact_tags.addressKey=contacts.id)");
String wildCard = "%" + StringUtils.germanToUpperCase(query) + "%";
st.setString(1, wildCard);
st.setString(2, wildCard);
@@ -980,8 +981,9 @@ public AddressBean[] searchEnhanced(String query, String[] tagName) {
st.setString(7, wildCard);
st.setString(8, wildCard);
st.setString(9, wildCard);
+ st.setString(10, wildCard);
//st.setString(10, tag);
- int index=10;
+ int index=11;
for(String t: tagName) {
st.setString(index, t);
index=index+1;
@@ -998,6 +1000,7 @@ public AddressBean[] searchEnhanced(String query, String[] tagName) {
st.setString(7, wildCard);
st.setString(8, wildCard);
st.setString(9, wildCard);
+ st.setString(10, wildCard);
}
rs=st.executeQuery();
@@ -1067,7 +1070,7 @@ public Hashtable> searchTagsEnhanced(String query, Stri
}
inClause=inClause.replaceFirst(",", "");
- st = con.prepareStatement("select addressKey, tagName from AddressTagsBean where addressKey in (" + "select AddressBean.id from AddressBean, AddressTagsBean where (ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(phone) like ? or ucase(mobile) like ?) and (AddressTagsBean.tagName in (" + inClause + ") and AddressTagsBean.addressKey=AddressBean.id)" + ")");
+ st = con.prepareStatement("select addressKey, tagName from contact_tags where addressKey in (" + "select contacts.id from contacts, contact_tags where (ucase(name) like ? or ucase(firstname) like ? or ucase(company) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(email) like ? or ucase(beaSafeId) like ? or ucase(phone) like ? or ucase(mobile) like ?) and (contact_tags.tagName in (" + inClause + ") and contact_tags.addressKey=contacts.id)" + ")");
String wildCard = "%" + StringUtils.germanToUpperCase(query) + "%";
st.setString(1, wildCard);
st.setString(2, wildCard);
@@ -1078,14 +1081,15 @@ public Hashtable> searchTagsEnhanced(String query, Stri
st.setString(7, wildCard);
st.setString(8, wildCard);
st.setString(9, wildCard);
+ st.setString(10, wildCard);
//st.setString(10, tag);
- int index=10;
+ int index=11;
for(String t: tagName) {
st.setString(index, t);
index=index+1;
}
} else {
- st = con.prepareStatement("select addressKey, tagName from AddressTagsBean where addressKey in (" + PS_SEARCHENHANCED_2 + ")");
+ st = con.prepareStatement("select addressKey, tagName from contact_tags where addressKey in (" + PS_SEARCHENHANCED_2 + ")");
String wildCard = "%" + StringUtils.germanToUpperCase(query) + "%";
st.setString(1, wildCard);
st.setString(2, wildCard);
@@ -1096,6 +1100,7 @@ public Hashtable> searchTagsEnhanced(String query, Stri
st.setString(7, wildCard);
st.setString(8, wildCard);
st.setString(9, wildCard);
+ st.setString(10, wildCard);
}
rs=st.executeQuery();
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java
index f0fba205a..93b624173 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileService.java
@@ -696,7 +696,7 @@
import javax.jms.Session;
import javax.naming.InitialContext;
import org.apache.log4j.Logger;
-import org.jboss.security.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jlawyer.data.tree.GenericNode;
import org.jlawyer.data.tree.TreeNodeUtils;
import org.jlawyer.search.SearchIndexRequest;
@@ -721,6 +721,8 @@ public class ArchiveFileService implements ArchiveFileServiceRemote, ArchiveFile
@EJB
private ArchiveFileTagsBeanFacadeLocal archiveFileTagsFacade;
@EJB
+ private DocumentTagsBeanFacadeLocal documentTagsFacade;
+ @EJB
private ArchiveFileDocumentsBeanFacadeLocal archiveFileDocumentsFacade;
@EJB
private ArchiveFileHistoryBeanFacadeLocal archiveFileHistoryFacade;
@@ -729,16 +731,16 @@ public class ArchiveFileService implements ArchiveFileServiceRemote, ArchiveFile
@EJB
private ServerSettingsBeanFacadeLocal settingsFacade;
- private static final String PS_SEARCHENHANCED_2 = "select id from ArchiveFileBean where ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?";
- //private static final String PS_SEARCHENHANCED_3 = "select ArchiveFileBean.id from ArchiveFileBean, ArchiveFileTagsBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and archived=0 and (ArchiveFileTagsBean.tagName=? and ArchiveFileTagsBean.archiveFileKey=ArchiveFileBean.id)";
- private static final String PS_SEARCHENHANCED_4 = "select id from ArchiveFileBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and archived=0";
+ private static final String PS_SEARCHENHANCED_2 = "select id from cases where ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?";
+ //private static final String PS_SEARCHENHANCED_3 = "select ArchiveFileBean.id from cases, ArchiveFileTagsBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and archived=0 and (ArchiveFileTagsBean.tagName=? and ArchiveFileTagsBean.archiveFileKey=ArchiveFileBean.id)";
+ private static final String PS_SEARCHENHANCED_4 = "select id from cases where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?) and archived=0";
@Override
@RolesAllowed({"loginRole"})
public int getArchiveFileCount() {
JDBCUtils utils = new JDBCUtils();
try {
- return utils.getRowCount("ArchiveFileBean");
+ return utils.getRowCount("cases");
} catch (Exception ex) {
throw new EJBException("Error getting number of archive files", ex);
}
@@ -781,7 +783,7 @@ private synchronized String getNextCaseNumber() throws InvalidCaseNumberPatternE
try {
con = utils.getConnection();
- st = con.prepareStatement("select distinct (fileNumber) from ArchiveFileBean order by fileNumber asc");
+ st = con.prepareStatement("select distinct (fileNumber) from cases order by fileNumber asc");
rs = st.executeQuery();
while (rs.next()) {
@@ -838,7 +840,7 @@ private synchronized String getNextCaseNumber() throws InvalidCaseNumberPatternE
suffix = "/" + suffix.substring(2);
try {
con = utils.getConnection();
- st = con.prepareStatement("select id from ArchiveFileBean where fileNumber = ?");
+ st = con.prepareStatement("select id from cases where fileNumber = ?");
boolean found = true;
while (found) {
newKey = nf.format(index) + suffix;
@@ -886,7 +888,7 @@ private synchronized String getNextCaseNumber() throws InvalidCaseNumberPatternE
//
// try {
// con = utils.getConnection();
-// st = con.prepareStatement("select id from ArchiveFileBean where fileNumber = ?");
+// st = con.prepareStatement("select id from cases where fileNumber = ?");
// boolean found = true;
// while (found) {
// st.setString(1, prefix + nf.format(index));
@@ -936,7 +938,7 @@ public ArchiveFileBean[] searchSimple(String query) {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select id from ArchiveFileBean where ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?");
+ st = con.prepareStatement("select id from cases where ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?");
String wildCard = "%" + StringUtils.germanToUpperCase(query) + "%";
st.setString(1, wildCard);
st.setString(2, wildCard);
@@ -944,6 +946,7 @@ public ArchiveFileBean[] searchSimple(String query) {
st.setString(4, wildCard);
st.setString(5, wildCard);
st.setString(6, wildCard);
+ st.setString(7, wildCard);
rs = st.executeQuery();
//ArchiveFileLocalHome home = this.lookupArchiveFileBean();
@@ -1282,12 +1285,12 @@ public List getLastChanged(String lastChangeUser, boolean userO
//st = con.prepareStatement("select distinct(archiveFileKey) from (select archiveFileKey, changeDate from ArchiveFileHistoryBean where principal = ? order by changeDate DESC limit 0,200) as t1 limit 0,?");
// leave out archived
//st = con.prepareStatement("select distinct(t1.archiveFileKey) from (select archiveFileKey, changeDate from ArchiveFileHistoryBean where principal = ? order by changeDate DESC limit 0,200) t1, ArchiveFileBean t2 where t1.archiveFileKey = t2.id and t2.archived=0 limit 0,?");
- st = con.prepareStatement("select t1.archiveFileKey from (select archiveFileKey, max(changeDate) as changeDate from ArchiveFileHistoryBean where principal = ? group by archiveFileKey order by changeDate desc) t1, ArchiveFileBean t2 where t1.archiveFileKey = t2.id and t2.archived=0 order by changeDate DESC limit 0,?");
+ st = con.prepareStatement("select t1.archiveFileKey from (select archiveFileKey, max(changeDate) as changeDate from case_history where principal = ? group by archiveFileKey order by changeDate desc) t1, cases t2 where t1.archiveFileKey = t2.id and t2.archived=0 order by changeDate DESC limit 0,?");
} else {
//st = con.prepareStatement("select distinct(archiveFileKey) from (select archiveFileKey, changeDate from ArchiveFileHistoryBean where principal != ? order by changeDate DESC limit 0,200) as t1 limit 0,?");
// leave out archived
//st = con.prepareStatement("select distinct(t1.archiveFileKey) from (select archiveFileKey, changeDate from ArchiveFileHistoryBean where principal != ? order by changeDate DESC limit 0,200) t1, ArchiveFileBean t2 where t1.archiveFileKey = t2.id and t2.archived=0 limit 0,?");
- st = con.prepareStatement("select t1.archiveFileKey from (select archiveFileKey, max(changeDate) as changeDate from ArchiveFileHistoryBean where principal != ? group by archiveFileKey order by changeDate desc) t1, ArchiveFileBean t2 where t1.archiveFileKey = t2.id and t2.archived=0 order by changeDate DESC limit 0,?");
+ st = con.prepareStatement("select t1.archiveFileKey from (select archiveFileKey, max(changeDate) as changeDate from case_history where principal != ? group by archiveFileKey order by changeDate desc) t1, cases t2 where t1.archiveFileKey = t2.id and t2.archived=0 order by changeDate DESC limit 0,?");
}
st.setString(1, lastChangeUser);
@@ -1337,7 +1340,7 @@ private Collection getAllOpenReviewsImpl() {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select id, archiveFileKey from ArchiveFileReviewsBean where done=0 order by reviewDate asc");
+ st = con.prepareStatement("select id, archiveFileKey from case_followups where done=0 order by reviewDate asc");
rs = st.executeQuery();
while (rs.next()) {
@@ -1574,7 +1577,7 @@ public int getArchiveFileArchivedCount() {
int count = 0;
try {
con = utils.getConnection();
- st = con.prepareStatement("select count(*) from ArchiveFileBean where archived=1");
+ st = con.prepareStatement("select count(*) from cases where archived=1");
rs = st.executeQuery();
if (rs.next()) {
@@ -1612,7 +1615,7 @@ public int getArchiveFileArchivedCount() {
public int getDocumentCount() {
JDBCUtils utils = new JDBCUtils();
try {
- return utils.getRowCount("ArchiveFileDocumentsBean");
+ return utils.getRowCount("case_documents");
} catch (Exception ex) {
throw new EJBException("Error getting number of archive files", ex);
}
@@ -1640,10 +1643,11 @@ public void removeDocument(String id) throws Exception {
} else {
boolean deleted = dbFile.delete();
if (!deleted) {
- throw new Exception("Dokument " + dst + " konnte nicht gelöscht werden!");
+ // could not delete document, but still let's continue with removal
+ log.error("Dokument " + dst + " konnte nicht gelöscht werden!");
}
}
-
+
try {
PreviewGenerator pg = new PreviewGenerator(this.archiveFileDocumentsFacade);
pg.deletePreview(aFile.getId(), db.getName());
@@ -1749,7 +1753,7 @@ public byte[] getDocumentContent(String id) throws Exception {
private byte[] getDocumentContentImpl(String id) throws Exception {
ArchiveFileDocumentsBean db = this.archiveFileDocumentsFacade.find(id);
- if(db==null) {
+ if (db == null) {
log.error("Document with id " + id + " does not exist");
throw new Exception("Dokument mit ID " + id + " existiert nicht!");
}
@@ -1804,7 +1808,7 @@ private long getDocumentSize(ArchiveFileDocumentsBean db) {
}
@Override
- public Collection getArchiveFileAddressesForAddress(String adressId) {
+ public Collection getArchiveFileAddressesForAddress(String adressId) {
AddressBean ab = this.addressFacade.find(adressId);
List l = this.archiveFileAddressesFacade.findByAddressKey(ab);
@@ -1918,9 +1922,10 @@ public ArchiveFileReviewsBean updateReview(String archiveFileId, ArchiveFileRevi
newHistEntry.setId(idGen.getID().toString());
newHistEntry.setArchiveFileKey(aFile);
newHistEntry.setChangeDate(new Date());
- String status="offen";
- if(review.getDoneBoolean())
- status="erledigt";
+ String status = "offen";
+ if (review.getDoneBoolean()) {
+ status = "erledigt";
+ }
newHistEntry.setChangeDescription(review.getReviewTypeName() + " geändert: " + review.getReviewReason() + " (" + review.toString() + ", " + status + ")");
newHistEntry.setPrincipal(context.getCallerPrincipal().getName());
this.archiveFileHistoryFacade.create(newHistEntry);
@@ -2000,12 +2005,12 @@ public void setTag(String archiveFileId, ArchiveFileTagsBean tag, boolean active
tag.setId(tagId);
tag.setArchiveFileKey(aFile);
this.archiveFileTagsFacade.create(tag);
- historyText = "Tag gesetzt: " + tag.getTagName();
+ historyText = "Akten-Tag gesetzt: " + tag.getTagName();
}
} else if (check.size() > 0) {
ArchiveFileTagsBean remove = (ArchiveFileTagsBean) check.get(0);
this.archiveFileTagsFacade.remove(remove);
- historyText = "Tag entfernt: " + tag.getTagName();
+ historyText = "Akten-Tag entfernt: " + tag.getTagName();
}
ArchiveFileHistoryBean newHistEntry = new ArchiveFileHistoryBean();
@@ -2019,15 +2024,59 @@ public void setTag(String archiveFileId, ArchiveFileTagsBean tag, boolean active
return;
}
+ @Override
+ @RolesAllowed({"writeArchiveFileRole"})
+ public void setDocumentTag(String documentId, DocumentTagsBean tag, boolean active) throws Exception {
+
+ ArchiveFileDocumentsBean aFile = this.archiveFileDocumentsFacade.find(documentId);
+ List check = this.documentTagsFacade.findByDocumentKeyAndTagName(aFile, tag.getTagName());
+ StringGenerator idGen = new StringGenerator();
+ String historyText = "";
+
+ if (active) {
+ if (check.size() == 0) {
+
+ String tagId = idGen.getID().toString();
+ tag.setId(tagId);
+ tag.setArchiveFileKey(aFile);
+ this.documentTagsFacade.create(tag);
+ historyText = "Dokument-Tag gesetzt an " + aFile.getName() + ": " + tag.getTagName();
+ }
+ } else if (check.size() > 0) {
+ DocumentTagsBean remove = (DocumentTagsBean) check.get(0);
+ this.documentTagsFacade.remove(remove);
+ historyText = "Dokument-Tag entfernt von " + aFile.getName() + ": " + tag.getTagName();
+ }
+
+ ArchiveFileHistoryBean newHistEntry = new ArchiveFileHistoryBean();
+ newHistEntry.setId(idGen.getID().toString());
+ newHistEntry.setArchiveFileKey(aFile.getArchiveFileKey());
+ newHistEntry.setChangeDate(new Date());
+ newHistEntry.setChangeDescription(historyText);
+ newHistEntry.setPrincipal(context.getCallerPrincipal().getName());
+ this.archiveFileHistoryFacade.create(newHistEntry);
+
+ return;
+ }
+
@Override
@RolesAllowed({"readArchiveFileRole"})
- public Collection getTags(String archiveFileId) {
+ public Collection getTags(String archiveFileId) {
ArchiveFileBean aFile = this.archiveFileFacade.find(archiveFileId);
List resultList = this.archiveFileTagsFacade.findByArchiveFileKey(aFile);
return resultList;
}
+ @Override
+ @RolesAllowed({"readArchiveFileRole"})
+ public Collection getDocumentTags(String documentId) {
+ ArchiveFileDocumentsBean aFile = this.archiveFileDocumentsFacade.find(documentId);
+
+ List resultList = this.documentTagsFacade.findByDocumentKey(aFile);
+ return resultList;
+ }
+
@Override
@RolesAllowed({"loginRole"})
public List searchTagsInUse() {
@@ -2039,7 +2088,49 @@ public List searchTagsInUse() {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select distinct(tagName) from ArchiveFileTagsBean order by tagName asc");
+ st = con.prepareStatement("select distinct(tagName) from case_tags order by tagName asc");
+ rs = st.executeQuery();
+
+ while (rs.next()) {
+ String t = rs.getString(1);
+ list.add(t);
+ }
+ } catch (SQLException sqle) {
+ log.error("Error finding tags in use", sqle);
+ throw new EJBException("Aktuelle genutzte Tags konnten nicht gefunden werden.", sqle);
+ } finally {
+ try {
+ rs.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ try {
+ st.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ try {
+ con.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ }
+
+ return list;
+ }
+
+ @Override
+ @RolesAllowed({"loginRole"})
+ public List searchDocumentTagsInUse() {
+
+ JDBCUtils utils = new JDBCUtils();
+ Connection con = null;
+ ResultSet rs = null;
+ PreparedStatement st = null;
+ ArrayList list = new ArrayList();
+ try {
+ con = utils.getConnection();
+ st = con.prepareStatement("select distinct(tagName) from document_tags order by tagName asc");
rs = st.executeQuery();
while (rs.next()) {
@@ -2072,7 +2163,7 @@ public List searchTagsInUse() {
@Override
@RolesAllowed({"readArchiveFileRole"})
- public ArchiveFileBean[] searchEnhanced(String query, boolean withArchive, String[] tagName) {
+ public ArchiveFileBean[] searchEnhanced(String query, boolean withArchive, String[] tagName, String[] documentTagNames) {
JDBCUtils utils = new JDBCUtils();
Connection con = null;
ResultSet rs = null;
@@ -2088,6 +2179,26 @@ public ArchiveFileBean[] searchEnhanced(String query, boolean withArchive, Strin
}
+ boolean withDocumentTag = false;
+ if (documentTagNames != null && documentTagNames.length > 0) {
+ if (documentTagNames.length == 1 && "".equals(documentTagNames[0])) {
+ withDocumentTag = false;
+ } else {
+ withDocumentTag = true;
+ }
+
+ }
+
+ if (withTag || withDocumentTag) {
+ if (tagName == null || tagName.length == 0) {
+ tagName = new String[]{"some-non-existing-string"};
+ }
+
+ if (documentTagNames == null || documentTagNames.length == 0) {
+ documentTagNames = new String[]{"some-non-existing-string"};
+ }
+ }
+
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
@@ -2095,27 +2206,53 @@ public ArchiveFileBean[] searchEnhanced(String query, boolean withArchive, Strin
if (withArchive) {
// with archive
- if (withTag) {
+ if (withTag || withDocumentTag) {
- String inClause = "";
- for (String t : tagName) {
- inClause = inClause + ",?";
+ String inClauseCase = "?";
+ if (withTag) {
+ inClauseCase = "";
+ for (String t : tagName) {
+ inClauseCase = inClauseCase + ",?";
+ }
+ }
+ String inClauseDoc = "?";
+ if (withDocumentTag) {
+ inClauseDoc = "";
+ for (String t : documentTagNames) {
+ inClauseDoc = inClauseDoc + ",?";
+ }
}
- inClause = inClause.replaceFirst(",", "");
+ inClauseCase = inClauseCase.replaceFirst(",", "");
+ inClauseDoc = inClauseDoc.replaceFirst(",", "");
// with archive and tag
- st = con.prepareStatement("select ArchiveFileBean.id from ArchiveFileBean, ArchiveFileTagsBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and (ArchiveFileTagsBean.tagName in (" + inClause + ") and ArchiveFileTagsBean.archiveFileKey=ArchiveFileBean.id)");
+ //st = con.prepareStatement("select distinct(cases.id) from cases, case_tags, case_documents, document_tags where (ucase(cases.name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?) and ((case_tags.tagName in (" + inClauseCase + ") and case_tags.archiveFileKey=cases.id) or (document_tags.tagName in (" + inClauseDoc + ") and document_tags.documentKey=case_documents.id and case_documents.archiveFileKey=cases.id))");
+ st = con.prepareStatement("select distinct(cases.id) from cases \n"
+ + "left join case_tags on case_tags.archiveFileKey=cases.id \n"
+ + "left join case_documents on case_documents.archiveFileKey=cases.id \n"
+ + "left join document_tags on document_tags.documentKey=case_documents.id\n"
+ + "where (ucase(cases.name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?)\n"
+ + " and (\n"
+ + " (case_tags.tagName in (" + inClauseCase + ")) or \n"
+ + " (document_tags.tagName in (" + inClauseDoc + "))\n"
+ + " )");
+
st.setString(1, wildCard);
st.setString(2, wildCard);
st.setString(3, wildCard);
st.setString(4, wildCard);
st.setString(5, wildCard);
st.setString(6, wildCard);
- int index = 7;
+ st.setString(7, wildCard);
+ int index = 8;
for (String t : tagName) {
st.setString(index, t);
index = index + 1;
}
+ for (String t : documentTagNames) {
+ st.setString(index, t);
+ index = index + 1;
+ }
} else {
// with archive but no tag
st = con.prepareStatement(PS_SEARCHENHANCED_2);
@@ -2125,39 +2262,66 @@ public ArchiveFileBean[] searchEnhanced(String query, boolean withArchive, Strin
st.setString(4, wildCard);
st.setString(5, wildCard);
st.setString(6, wildCard);
+ st.setString(7, wildCard);
}
} else // without archive
- if (withTag) {
+ if (withTag || withDocumentTag) {
- String inClause = "";
+ String inClauseCase = "?";
+ if (withTag) {
+ inClauseCase = "";
for (String t : tagName) {
- inClause = inClause + ",?";
+ inClauseCase = inClauseCase + ",?";
}
- inClause = inClause.replaceFirst(",", "");
-
- // without archive and with tag
- st = con.prepareStatement("select ArchiveFileBean.id from ArchiveFileBean, ArchiveFileTagsBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and archived=0 and (ArchiveFileTagsBean.tagName in (" + inClause + ") and ArchiveFileTagsBean.archiveFileKey=ArchiveFileBean.id)");
- st.setString(1, wildCard);
- st.setString(2, wildCard);
- st.setString(3, wildCard);
- st.setString(4, wildCard);
- st.setString(5, wildCard);
- st.setString(6, wildCard);
- int index = 7;
- for (String t : tagName) {
- st.setString(index, t);
- index = index + 1;
+ }
+ String inClauseDoc = "?";
+ if (withDocumentTag) {
+ inClauseDoc = "";
+ for (String t : documentTagNames) {
+ inClauseDoc = inClauseDoc + ",?";
}
- } else {
- // without archive and no tag
- st = con.prepareStatement(PS_SEARCHENHANCED_4);
- st.setString(1, wildCard);
- st.setString(2, wildCard);
- st.setString(3, wildCard);
- st.setString(4, wildCard);
- st.setString(5, wildCard);
- st.setString(6, wildCard);
}
+ inClauseCase = inClauseCase.replaceFirst(",", "");
+ inClauseDoc = inClauseDoc.replaceFirst(",", "");
+
+ // without archive and with tag
+ //st = con.prepareStatement("select distinct(cases.id) from cases, case_tags, case_documents, document_tags where (ucase(cases.name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?) and archived=0 and ((case_tags.tagName in (" + inClauseCase + ") and case_tags.archiveFileKey=cases.id) or (document_tags.tagName in (" + inClauseDoc + ") and document_tags.documentKey=case_documents.id and case_documents.archiveFileKey=cases.id))");
+ st = con.prepareStatement("select distinct(cases.id) from cases \n"
+ + "left join case_tags on case_tags.archiveFileKey=cases.id \n"
+ + "left join case_documents on case_documents.archiveFileKey=cases.id \n"
+ + "left join document_tags on document_tags.documentKey=case_documents.id\n"
+ + "where cases.archived=0 and (ucase(cases.name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?)\n"
+ + " and (\n"
+ + " (case_tags.tagName in (" + inClauseCase + ")) or \n"
+ + " (document_tags.tagName in (" + inClauseDoc + "))\n"
+ + " )");
+ st.setString(1, wildCard);
+ st.setString(2, wildCard);
+ st.setString(3, wildCard);
+ st.setString(4, wildCard);
+ st.setString(5, wildCard);
+ st.setString(6, wildCard);
+ st.setString(7, wildCard);
+ int index = 8;
+ for (String t : tagName) {
+ st.setString(index, t);
+ index = index + 1;
+ }
+ for (String t : documentTagNames) {
+ st.setString(index, t);
+ index = index + 1;
+ }
+ } else {
+ // without archive and no tag
+ st = con.prepareStatement(PS_SEARCHENHANCED_4);
+ st.setString(1, wildCard);
+ st.setString(2, wildCard);
+ st.setString(3, wildCard);
+ st.setString(4, wildCard);
+ st.setString(5, wildCard);
+ st.setString(6, wildCard);
+ st.setString(7, wildCard);
+ }
rs = st.executeQuery();
@@ -2239,25 +2403,25 @@ public Collection searchReviews(int status, int type, Da
con = utils.getConnection();
if (status == ArchiveFileConstants.REVIEWSTATUS_ANY) {
if (type == ArchiveFileConstants.REVIEWTYPE_ANY) {
- st = con.prepareStatement("select id, archiveFileKey from ArchiveFileReviewsBean where reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
+ st = con.prepareStatement("select id, archiveFileKey from case_followups where reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
st.setDate(1, new java.sql.Date(fromDate.getTime()));
st.setDate(2, new java.sql.Date(toDate.getTime()));
st.setInt(3, limit);
} else {
- st = con.prepareStatement("select id, archiveFileKey from ArchiveFileReviewsBean where reviewType=? and reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
+ st = con.prepareStatement("select id, archiveFileKey from case_followups where reviewType=? and reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
st.setInt(1, type);
st.setDate(2, new java.sql.Date(fromDate.getTime()));
st.setDate(3, new java.sql.Date(toDate.getTime()));
st.setInt(4, limit);
}
} else if (type == ArchiveFileConstants.REVIEWTYPE_ANY) {
- st = con.prepareStatement("select id, archiveFileKey from ArchiveFileReviewsBean where done=? and reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
+ st = con.prepareStatement("select id, archiveFileKey from case_followups where done=? and reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
st.setInt(1, status);
st.setDate(2, new java.sql.Date(fromDate.getTime()));
st.setDate(3, new java.sql.Date(toDate.getTime()));
st.setInt(4, limit);
} else {
- st = con.prepareStatement("select id, archiveFileKey from ArchiveFileReviewsBean where reviewType=? and done=? and reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
+ st = con.prepareStatement("select id, archiveFileKey from case_followups where reviewType=? and done=? and reviewDate >= ? and reviewDate <= ? order by reviewDate asc limit ?");
st.setInt(1, type);
st.setInt(2, status);
st.setDate(3, new java.sql.Date(fromDate.getTime()));
@@ -2314,9 +2478,9 @@ public Date[] getHistoryInterval(String principalId) {
try {
con = utils.getConnection();
if (principalId == null || "".equalsIgnoreCase(principalId)) {
- st = con.prepareStatement("select min(changeDate) as minDate, max(changeDate) as maxDate from ArchiveFileHistoryBean");
+ st = con.prepareStatement("select min(changeDate) as minDate, max(changeDate) as maxDate from case_history");
} else {
- st = con.prepareStatement("select min(changeDate) as minDate, max(changeDate) as maxDate from ArchiveFileHistoryBean where principal = ?");
+ st = con.prepareStatement("select min(changeDate) as minDate, max(changeDate) as maxDate from case_history where principal = ?");
st.setString(1, principalId);
}
rs = st.executeQuery();
@@ -2386,7 +2550,7 @@ public List getLastChanged(int limit) {
try {
con = utils.getConnection();
- st = con.prepareStatement("select archiveFileKey from (SELECT archiveFileKey, MAX(changeDate) as maxChangeDate FROM ArchiveFileHistoryBean GROUP BY archiveFileKey order by maxChangeDate DESC) a1, ArchiveFileBean a2 where a1.archiveFileKey = a2.id and a2.archived=0 order by maxChangeDate DESC limit 0,?");
+ st = con.prepareStatement("select archiveFileKey from (SELECT archiveFileKey, MAX(changeDate) as maxChangeDate FROM case_history GROUP BY archiveFileKey order by maxChangeDate DESC) a1, cases a2 where a1.archiveFileKey = a2.id and a2.archived=0 order by maxChangeDate DESC limit 0,?");
st.setInt(1, limit);
rs = st.executeQuery();
@@ -2468,7 +2632,7 @@ public Collection getAllWithMissingReviews() {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select id from ArchiveFileBean where archived=0 and id not in (select archiveFileKey from ArchiveFileReviewsBean where done=0) order by fileNumber asc");
+ st = con.prepareStatement("select id from cases where archived=0 and id not in (select archiveFileKey from case_followups where done=0) order by fileNumber asc");
rs = st.executeQuery();
while (rs.next()) {
@@ -2536,7 +2700,7 @@ public ArrayList getAllArchiveFileIds() {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select id from ArchiveFileBean");
+ st = con.prepareStatement("select id from cases");
rs = st.executeQuery();
//ArchiveFileLocalHome home = this.lookupArchiveFileBean();
@@ -2583,7 +2747,7 @@ public Date getLastChangedForArchiveFile(String archiveFileKey) {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("SELECT max(changeDate) FROM ArchiveFileHistoryBean where archiveFileKey=?;");
+ st = con.prepareStatement("SELECT max(changeDate) FROM case_history where archiveFileKey=?;");
st.setString(1, archiveFileKey);
rs = st.executeQuery();
@@ -2664,36 +2828,91 @@ public Collection getAllOpenReviewsUnrestricted() {
@Override
@RolesAllowed({"readArchiveFileRole"})
- public List getTagged(String[] tagName, int limit) {
+ public List getTagged(String[] tagName, String[] docTagName, int limit) {
JDBCUtils utils = new JDBCUtils();
Connection con = null;
ResultSet rs = null;
PreparedStatement st = null;
List returnList = new ArrayList();
+ if (tagName == null || tagName.length == 0) {
+ tagName = new String[]{"some-non-existing-string"};
+ }
+
+ if (docTagName == null || docTagName.length == 0) {
+ docTagName = new String[]{"some-non-existing-string"};
+ }
+
try {
con = utils.getConnection();
- String inClause = "";
- for (String t : tagName) {
- inClause = inClause + ",?";
+ String inClauseCase = "";
+ boolean empty = true;
+ if (tagName != null && tagName.length > 0) {
+ empty = false;
+ for (String t : tagName) {
+ inClauseCase = inClauseCase + ",?";
+ }
}
- inClause = inClause.replaceFirst(",", "");
- st = con.prepareStatement("select a1.archiveFileKey from (SELECT archiveFileKey, MAX(changeDate) as maxChangeDate FROM ArchiveFileHistoryBean GROUP BY archiveFileKey order by maxChangeDate DESC) a1, ArchiveFileBean a2, ArchiveFileTagsBean a3 where a1.archiveFileKey = a2.id and a2.archived=0 and a2.id = a3.archiveFileKey and a3.tagName in (" + inClause + ") order by maxChangeDate DESC limit 0,?");
+ String inClauseDoc = "";
+ if (docTagName != null && docTagName.length > 0) {
+ empty = false;
+ for (String t : docTagName) {
+ inClauseDoc = inClauseDoc + ",?";
+ }
+ }
+ if (empty) {
+ return new ArrayList();
+ }
+
+ inClauseCase = inClauseCase.replaceFirst(",", "");
+ inClauseDoc = inClauseDoc.replaceFirst(",", "");
+
+// st = con.prepareStatement("select distinct(allkeys.archiveFileKey) from (select a1.archiveFileKey from \n"
+// + " (SELECT archiveFileKey, MAX(changeDate) as maxChangeDate \n"
+// + " FROM case_history \n"
+// + " GROUP BY archiveFileKey \n"
+// + " order by maxChangeDate DESC) a1, cases a2, case_tags a3, document_tags a4, case_documents a5 \n"
+// + " where a1.archiveFileKey = a2.id and a2.archived=0 and ((a2.id = a3.archiveFileKey and a3.tagName in (" + inClauseCase + ")) or ((a4.tagName in (" + inClauseDoc + ") and a4.documentKey=a5.id and a5.archiveFileKey=a2.id))) order by maxChangeDate DESC) allkeys limit 0,?");
+ st = con.prepareStatement("select distinct(allkeys.archiveFileKey) from (\n"
+ + " select a1.archiveFileKey from (\n"
+ + " SELECT archiveFileKey, MAX(changeDate) as maxChangeDate \n"
+ + " FROM case_history \n"
+ + " GROUP BY archiveFileKey \n"
+ + " order by maxChangeDate DESC) a1\n"
+ + " left join cases a2 on a1.archiveFileKey = a2.id\n"
+ + " left join case_tags a3 on a2.id = a3.archiveFileKey\n"
+ + " left join case_documents a5 on a5.archiveFileKey=a2.id \n"
+ + " left join document_tags a4 on a4.documentKey=a5.id \n"
+ + " \n"
+ + " where a2.archived=0 and (\n"
+ + " (a3.tagName in (" + inClauseCase + ")) or (\n"
+ + " (a4.tagName in (" + inClauseDoc + "))\n"
+ + " \n"
+ + " )) order by maxChangeDate DESC) allkeys limit 0,?");
int index = 1;
- for (String t : tagName) {
- st.setString(index, t);
- index = index + 1;
+ if (tagName != null && tagName.length > 0) {
+ for (String t : tagName) {
+ st.setString(index, t);
+ index = index + 1;
+ }
}
+ if (docTagName != null && docTagName.length > 0) {
+ for (String t : docTagName) {
+ st.setString(index, t);
+ index = index + 1;
+ }
+ }
+
st.setInt(index, limit);
rs = st.executeQuery();
- ArrayList keyCache=new ArrayList();
+ ArrayList keyCache = new ArrayList();
while (rs.next()) {
String id = rs.getString(1);
// there might be duplicate cases in the result set
- if(!keyCache.contains(id)) {
+ if (!keyCache.contains(id)) {
keyCache.add(id);
returnList.add(this.archiveFileFacade.find(id));
}
@@ -2748,7 +2967,7 @@ public boolean setDocumentDate(String id, Date date) throws Exception {
return true;
}
-
+
@Override
@RolesAllowed({"writeArchiveFileRole"})
public boolean setDocumentFavorite(String id, boolean favorite) throws Exception {
@@ -2763,7 +2982,7 @@ public boolean setDocumentFavorite(String id, boolean favorite) throws Exception
@Override
@RolesAllowed({"readArchiveFileRole"})
- public Hashtable> searchTagsEnhanced(String query, boolean withArchive, String[] tagNames) {
+ public Hashtable> searchTagsEnhanced(String query, boolean withArchive, String[] tagNames, String[] documentTagNames) {
JDBCUtils utils = new JDBCUtils();
Connection con = null;
ResultSet rs = null;
@@ -2779,6 +2998,26 @@ public Hashtable> searchTagsEnhanced(String query, boo
}
+ boolean withDocumentTag = false;
+ if (documentTagNames != null && documentTagNames.length > 0) {
+ if (documentTagNames.length == 1 && "".equals(documentTagNames[0])) {
+ withDocumentTag = false;
+ } else {
+ withDocumentTag = true;
+ }
+
+ }
+
+ if (withTag || withDocumentTag) {
+ if (tagNames == null || tagNames.length == 0) {
+ tagNames = new String[]{"some-non-existing-string"};
+ }
+
+ if (documentTagNames == null || documentTagNames.length == 0) {
+ documentTagNames = new String[]{"some-non-existing-string"};
+ }
+ }
+
Hashtable> list = new Hashtable>();
try {
con = utils.getConnection();
@@ -2786,67 +3025,103 @@ public Hashtable> searchTagsEnhanced(String query, boo
if (withArchive) {
// with archive
- if (withTag) {
+ if (withTag || withDocumentTag) {
- String inClause = "";
- for (String t : tagNames) {
- inClause = inClause + ",?";
+ String inClauseCase = "?";
+ if (withTag) {
+ inClauseCase = "";
+ for (String t : tagNames) {
+ inClauseCase = inClauseCase + ",?";
+ }
}
- inClause = inClause.replaceFirst(",", "");
+ String inClauseDoc = "?";
+ if (withDocumentTag) {
+ inClauseDoc = "";
+ for (String t : documentTagNames) {
+ inClauseDoc = inClauseDoc + ",?";
+ }
+ }
+ inClauseCase = inClauseCase.replaceFirst(",", "");
+ inClauseDoc = inClauseDoc.replaceFirst(",", "");
// with archive and tag
- st = con.prepareStatement("select archiveFileKey, tagName from ArchiveFileTagsBean where archiveFileKey in (" + "select ArchiveFileBean.id from ArchiveFileBean, ArchiveFileTagsBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and (ArchiveFileTagsBean.tagName in (" + inClause + ") and ArchiveFileTagsBean.archiveFileKey=ArchiveFileBean.id)" + ")");
+ st = con.prepareStatement("select distinct case_tags.archiveFileKey, case_tags.tagName, document_tags.tagName from case_tags, case_documents, document_tags where case_tags.archiveFileKey in (" + "select cases.id from cases, case_tags where (ucase(cases.name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?) and ((case_tags.tagName in (" + inClauseCase + ") and case_tags.archiveFileKey=cases.id) or (document_tags.tagName in (" + inClauseDoc + ") and document_tags.documentKey=case_documents.id and case_documents.archiveFileKey=cases.id)))");
st.setString(1, wildCard);
st.setString(2, wildCard);
st.setString(3, wildCard);
st.setString(4, wildCard);
st.setString(5, wildCard);
st.setString(6, wildCard);
- int index = 7;
+ st.setString(7, wildCard);
+ int index = 8;
+
for (String t : tagNames) {
st.setString(index, t);
index = index + 1;
}
+ for (String t : documentTagNames) {
+ st.setString(index, t);
+ index = index + 1;
+ }
} else {
// with archive but no tag
- st = con.prepareStatement("select archiveFileKey, tagName from ArchiveFileTagsBean where archiveFileKey in (" + PS_SEARCHENHANCED_2 + ")");
+ st = con.prepareStatement("select archiveFileKey, tagName, tagName from case_tags where archiveFileKey in (" + PS_SEARCHENHANCED_2 + ")");
st.setString(1, wildCard);
st.setString(2, wildCard);
st.setString(3, wildCard);
st.setString(4, wildCard);
st.setString(5, wildCard);
st.setString(6, wildCard);
+ st.setString(7, wildCard);
}
} else // without archive
- if (withTag) {
- String inClause = "";
+ if (withTag || withDocumentTag) {
+ String inClauseCase = "?";
+ if (withTag) {
+ inClauseCase = "";
for (String t : tagNames) {
- inClause = inClause + ",?";
+ inClauseCase = inClauseCase + ",?";
}
- inClause = inClause.replaceFirst(",", "");
- // without archive and with tag
- st = con.prepareStatement("select archiveFileKey, tagName from ArchiveFileTagsBean where archiveFileKey in (" + "select ArchiveFileBean.id from ArchiveFileBean, ArchiveFileTagsBean where (ucase(name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ?) and archived=0 and (ArchiveFileTagsBean.tagName in (" + inClause + ") and ArchiveFileTagsBean.archiveFileKey=ArchiveFileBean.id)" + ")");
- st.setString(1, wildCard);
- st.setString(2, wildCard);
- st.setString(3, wildCard);
- st.setString(4, wildCard);
- st.setString(5, wildCard);
- st.setString(6, wildCard);
- int index = 7;
- for (String t : tagNames) {
- st.setString(index, t);
- index = index + 1;
+ }
+ String inClauseDoc = "?";
+ if (withDocumentTag) {
+ inClauseDoc = "";
+ for (String t : documentTagNames) {
+ inClauseDoc = inClauseDoc + ",?";
}
- } else {
- // without archive and no tag
- st = con.prepareStatement("select archiveFileKey, tagName from ArchiveFileTagsBean where archiveFileKey in (" + PS_SEARCHENHANCED_4 + ")");
- st.setString(1, wildCard);
- st.setString(2, wildCard);
- st.setString(3, wildCard);
- st.setString(4, wildCard);
- st.setString(5, wildCard);
- st.setString(6, wildCard);
}
+ inClauseCase = inClauseCase.replaceFirst(",", "");
+ inClauseDoc = inClauseDoc.replaceFirst(",", "");
+ // without archive and with tag
+ st = con.prepareStatement("select distinct case_tags.archiveFileKey, case_tags.tagName, document_tags.tagName from case_tags, case_documents, document_tags where case_tags.archiveFileKey in (" + "select cases.id from cases, case_tags where (ucase(cases.name) like ? or ucase(fileNumber) like ? or ucase(reason) like ? or ucase(custom1) like ? or ucase(custom2) like ? or ucase(custom3) like ? or ucase(subjectField) like ?) and archived=0 and ((case_tags.tagName in (" + inClauseCase + ") and case_tags.archiveFileKey=cases.id) or (document_tags.tagName in (" + inClauseDoc + ") and document_tags.documentKey=case_documents.id and case_documents.archiveFileKey=cases.id)))");
+ st.setString(1, wildCard);
+ st.setString(2, wildCard);
+ st.setString(3, wildCard);
+ st.setString(4, wildCard);
+ st.setString(5, wildCard);
+ st.setString(6, wildCard);
+ st.setString(7, wildCard);
+ int index = 8;
+
+ for (String t : tagNames) {
+ st.setString(index, t);
+ index = index + 1;
+ }
+ for (String t : documentTagNames) {
+ st.setString(index, t);
+ index = index + 1;
+ }
+ } else {
+ // without archive and no tag
+ st = con.prepareStatement("select archiveFileKey, tagName, tagName from case_tags where archiveFileKey in (" + PS_SEARCHENHANCED_4 + ")");
+ st.setString(1, wildCard);
+ st.setString(2, wildCard);
+ st.setString(3, wildCard);
+ st.setString(4, wildCard);
+ st.setString(5, wildCard);
+ st.setString(6, wildCard);
+ st.setString(7, wildCard);
+ }
rs = st.executeQuery();
@@ -2857,7 +3132,15 @@ public Hashtable> searchTagsEnhanced(String query, boo
list.put(id, new ArrayList());
}
ArrayList tagList = list.get(id);
- tagList.add(tagName);
+ if (!tagList.contains(tagName)) {
+ tagList.add(tagName);
+ }
+
+ String docTagName = rs.getString(3);
+ if (!tagList.contains(docTagName)) {
+ tagList.add(docTagName);
+ }
+
}
} catch (SQLException sqle) {
log.error("Error finding archive files", sqle);
@@ -2984,7 +3267,7 @@ public List getAddressesForCase(String archiveFileKey) {
}
return addressList;
}
-
+
private String getSortString(ArchiveFileAddressesBean afab) {
// 1 for clients, 2 for opponents, 3 for others
String sortString = "1";
@@ -3016,7 +3299,7 @@ public int compare(Object o1, Object o2) {
//return ((ArchiveFileAddressesBean) o1).getReferenceTypeAsString().compareTo(((ArchiveFileAddressesBean) o2).getReferenceTypeAsString());
return getSortString((ArchiveFileAddressesBean) o1).compareTo(getSortString((ArchiveFileAddressesBean) o2));
// sort by reference type, followed by display name
-
+
}
}
return -1;
@@ -3036,12 +3319,13 @@ public int compare(Object o1, Object o2) {
@Override
@RolesAllowed({"adminRole"})
public boolean udpateFileNumber(String from, String to) throws Exception {
- ArchiveFileBean afb=this.getArchiveFileByFileNumber(from);
- if(afb==null)
+ ArchiveFileBean afb = this.getArchiveFileByFileNumber(from);
+ if (afb == null) {
return false;
+ }
afb.setFileNumber(to);
this.archiveFileFacade.edit(afb);
-
+
StringGenerator idGen = new StringGenerator();
ArchiveFileHistoryBean newHistEntry = new ArchiveFileHistoryBean();
newHistEntry.setId(idGen.getID().toString());
@@ -3050,8 +3334,160 @@ public boolean udpateFileNumber(String from, String to) throws Exception {
newHistEntry.setChangeDescription("Aktenzeichen geändert: " + from + " --> " + to);
newHistEntry.setPrincipal(context.getCallerPrincipal().getName());
this.archiveFileHistoryFacade.create(newHistEntry);
-
+
return true;
}
+ @Override
+ @RolesAllowed({"loginRole"})
+ public boolean doesDocumentExist(String id) {
+ ArchiveFileDocumentsBean db = this.archiveFileDocumentsFacade.find(id);
+ if (db == null) {
+ return false;
+ }
+ String aId = db.getArchiveFileKey().getId();
+
+ String localBaseDir = System.getProperty("jlawyer.server.basedirectory");
+ localBaseDir = localBaseDir.trim();
+ if (!localBaseDir.endsWith(System.getProperty("file.separator"))) {
+ localBaseDir = localBaseDir + System.getProperty("file.separator");
+ }
+
+ String dst = localBaseDir + "archivefiles" + System.getProperty("file.separator") + aId + System.getProperty("file.separator");
+
+ File dstDir = new File(dst);
+ dstDir.mkdirs();
+
+ dst = dst + db.getName();
+
+ File dstFile = new File(dst);
+
+ if (!(dstFile.exists())) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ @RolesAllowed({"readArchiveFileRole"})
+ public List getTaggedDocuments(java.lang.String[] docTagName, int limit) {
+ JDBCUtils utils = new JDBCUtils();
+ Connection con = null;
+ ResultSet rs = null;
+ PreparedStatement st = null;
+ List returnList = new ArrayList();
+
+ try {
+ con = utils.getConnection();
+
+ String inClause = "";
+ for (String t : docTagName) {
+ inClause = inClause + ",?";
+ }
+ inClause = inClause.replaceFirst(",", "");
+
+ st = con.prepareStatement("select distinct(docid) from (select a5.id as docid from "
+ + " (SELECT archiveFileKey, MAX(changeDate) as maxChangeDate "
+ + " FROM case_history "
+ + " GROUP BY archiveFileKey "
+ + " order by maxChangeDate DESC) a1, cases a2, document_tags a4, case_documents a5 "
+ + " where a1.archiveFileKey = a2.id and a2.archived=0 and (((a4.tagName in (" + inClause + ") and a4.documentKey=a5.id and a5.archiveFileKey=a2.id))) order by maxChangeDate DESC) allkeys limit 0,?");
+
+ int index = 1;
+
+ for (String t : docTagName) {
+ st.setString(index, t);
+ index = index + 1;
+ }
+
+ st.setInt(index, limit);
+ rs = st.executeQuery();
+ ArrayList keyCache = new ArrayList();
+ while (rs.next()) {
+ String id = rs.getString(1);
+ // there might be duplicate cases in the result set
+ if (!keyCache.contains(id)) {
+ keyCache.add(id);
+ returnList.add(this.archiveFileDocumentsFacade.find(id));
+ }
+ }
+
+ try {
+ rs.close();
+ } catch (Exception ex) {
+ log.error(ex);
+ }
+
+ } catch (SQLException sqle) {
+ log.error("Error getting documents by specific tag", sqle);
+ throw new EJBException("Markierte Dokumente konnten nicht ermittelt werden.", sqle);
+ } finally {
+ try {
+ st.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ try {
+ con.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ }
+
+ return returnList;
+ }
+
+ @Override
+ @RolesAllowed({"readArchiveFileRole"})
+ public Hashtable> getDocumentTagsForCase(String caseId) {
+ JDBCUtils utils = new JDBCUtils();
+ Connection con = null;
+ ResultSet rs = null;
+ PreparedStatement st = null;
+ Hashtable> returnList = new Hashtable>();
+
+ try {
+ con = utils.getConnection();
+ st = con.prepareStatement("select docs.id, tags.tagName from case_documents docs, document_tags tags where docs.archiveFileKey=? and docs.id=tags.documentKey and docs.id in (select documentKey from document_tags)");
+
+ st.setString(1, caseId);
+ rs = st.executeQuery();
+ while (rs.next()) {
+ String id = rs.getString(1);
+ ArrayList tags = null;
+ if (returnList.containsKey(id)) {
+ tags = returnList.get(id);
+ } else {
+ tags = new ArrayList();
+ returnList.put(id, tags);
+ }
+
+ tags.add(rs.getString(2));
+ }
+
+ try {
+ rs.close();
+ } catch (Exception ex) {
+ log.error(ex);
+ }
+
+ } catch (SQLException sqle) {
+ log.error("Error getting documents tags", sqle);
+ throw new EJBException("Markierte Dokumente konnten nicht ermittelt werden.", sqle);
+ } finally {
+ try {
+ st.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ try {
+ con.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ }
+
+ return returnList;
+ }
+
}
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileServiceLocal.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileServiceLocal.java
index 2ea6a64a4..b36de526a 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileServiceLocal.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ArchiveFileServiceLocal.java
@@ -718,5 +718,7 @@ public interface ArchiveFileServiceLocal {
byte[] getDocumentContentUnrestricted(String id) throws Exception;
Collection getAllOpenReviewsUnrestricted();
+
+ boolean doesDocumentExist(String id);
}
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/CustomerRelationsService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/CustomerRelationsService.java
index aa3b93809..e5fb205ea 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/CustomerRelationsService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/CustomerRelationsService.java
@@ -699,7 +699,7 @@ You should also get your employer (if you work as a programmer) or school,
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import org.apache.log4j.Logger;
-import org.jboss.security.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jlawyer.data.tree.GenericNode;
import org.jlawyer.data.tree.TreeNodeUtils;
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/IntegrationService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/IntegrationService.java
index f0a93f7cc..dea9abc4d 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/IntegrationService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/IntegrationService.java
@@ -686,7 +686,7 @@
import javax.ejb.Stateless;
import org.apache.log4j.Logger;
import org.apache.tika.Tika;
-import org.jboss.security.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
*
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SecurityService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SecurityService.java
index d1518d8af..7504e9ddf 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SecurityService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SecurityService.java
@@ -667,7 +667,7 @@
import javax.annotation.security.RolesAllowed;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import org.jboss.security.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
/**
*
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SingletonService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SingletonService.java
index 84b7782bc..768dea3f8 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SingletonService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SingletonService.java
@@ -687,6 +687,7 @@ You should also get your employer (if you work as a programmer) or school,
import java.util.ArrayList;
import java.util.Date;
import java.util.Hashtable;
+import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
import javax.ejb.Singleton;
@@ -712,6 +713,7 @@ public int getSystemStatus() {
}
@Override
+ @PermitAll
public void setSystemStatus(int status) {
this.systemStatus=status;
}
@@ -723,6 +725,7 @@ public Hashtable getObservedFiles() {
}
@Override
+ @PermitAll
public void setObservedFiles(Hashtable fileNames) {
this.observedFileNames=fileNames;
}
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SystemManagement.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SystemManagement.java
index a4ce87b86..d30759982 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SystemManagement.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/SystemManagement.java
@@ -686,6 +686,7 @@
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
+import javax.annotation.security.PermitAll;
import javax.annotation.security.RolesAllowed;
import javax.ejb.Asynchronous;
import javax.ejb.EJB;
@@ -709,7 +710,7 @@
import javax.xml.xpath.XPathFactory;
import org.apache.log4j.Logger;
import org.apache.tika.Tika;
-import org.jboss.security.annotation.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jlawyer.data.tree.GenericNode;
import org.jlawyer.data.tree.TreeNodeUtils;
import org.w3c.dom.Document;
@@ -740,7 +741,7 @@ public class SystemManagement implements SystemManagementRemote, SystemManagemen
private ServerSettingsBeanFacadeLocal settingsFacade;
@Override
- @RolesAllowed({"readOptionGroupRole"})
+ @RolesAllowed({"loginRole"})
public AppOptionGroupBean[] getOptionGroup(String optionGroup) {
return appOptionGroupBeanFacade.findByOptionGroup(optionGroup);
@@ -759,7 +760,7 @@ public BankDataBean[] searchBankData(String query) {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select id, name, bankCode from BankDataBean where ucase(name) like ? or bankCode like ? order by bankCode, name");
+ st = con.prepareStatement("select id, name, bankCode from directory_banks where ucase(name) like ? or bankCode like ? order by bankCode, name");
String wildCard1 = StringUtils.germanToUpperCase(query) + "%";
String wildCard2 = "%" + wildCard1;
st.setString(1, wildCard2);
@@ -810,7 +811,7 @@ public CityDataBean[] searchCityData(String query) {
ArrayList list = new ArrayList();
try {
con = utils.getConnection();
- st = con.prepareStatement("select id, city, zipCode from CityDataBean where ucase(city) like ? or zipCode like ? order by zipCode");
+ st = con.prepareStatement("select id, city, zipCode from directory_cities where ucase(city) like ? or zipCode like ? order by zipCode");
String wildCard1 = StringUtils.germanToUpperCase(query) + "%";
String wildCard2 = "%" + wildCard1;
st.setString(1, wildCard2);
@@ -884,7 +885,7 @@ public void removeAllBankData() {
try {
con = utils.getConnection();
st = con.createStatement();
- st.execute("delete from BankDataBean");
+ st.execute("delete from directory_banks");
} catch (SQLException sqle) {
log.error("Error deleting bank data", sqle);
throw new EJBException("Bankdaten konnten nicht gelöscht werden.", sqle);
@@ -930,7 +931,7 @@ public void removeAllCityData() {
try {
con = utils.getConnection();
st = con.createStatement();
- st.execute("delete from CityDataBean");
+ st.execute("delete from directory_cities");
} catch (SQLException sqle) {
log.error("Error deleting city data", sqle);
throw new EJBException("Postleitzahldaten konnten nicht gelöscht werden.", sqle);
@@ -1247,6 +1248,7 @@ public void statusMail(String subject, String body) {
ServerSettingsBean smtpPwdS = this.settingsFacade.find("jlawyer.server.monitor.smtppwd");
ServerSettingsBean smtpToS = this.settingsFacade.find("jlawyer.server.monitor.smtpto");
ServerSettingsBean smtpSslS = this.settingsFacade.find("jlawyer.server.monitor.smtpssl");
+ ServerSettingsBean smtpStartTlsS = this.settingsFacade.find("jlawyer.server.monitor.smtpstarttls");
if (smtpHostS == null || smtpUserS == null || smtpPwdS == null || smtpToS == null) {
log.error("incomplete configuration for sending status mails");
@@ -1270,6 +1272,14 @@ public void statusMail(String subject, String body) {
if (smtpSsl == null) {
smtpSsl = "false";
}
+
+ String smtpStartTls = "false";
+ if (smtpStartTlsS != null) {
+ smtpStartTls = smtpStartTlsS.getSettingValue();
+ }
+ if (smtpStartTls == null) {
+ smtpStartTls = "false";
+ }
Properties props = new Properties();
// props.put("mail.smtp.host", smtpHost);
@@ -1281,7 +1291,11 @@ public void statusMail(String subject, String body) {
if ("true".equalsIgnoreCase(smtpSsl)) {
props.put("mail.smtp.ssl.enable", "true");
}
-
+
+ if ("true".equalsIgnoreCase(smtpStartTls)) {
+ props.put("mail.smtp.starttls.enable", "true");
+ }
+
props.put("mail.smtp.host", smtpHost);
props.put("mail.smtp.user", smtpUser);
props.put("mail.smtp.auth", true);
@@ -1345,8 +1359,50 @@ public boolean validateFileOnServer(File file, boolean isDirectory) {
}
@Override
+ @PermitAll
public String getServerVersion() {
- return "1.9";
+// ServerSettingsBean srvVersion = this.settingsFacade.find("jlawyer.server.database.version");
+// if(srvVersion!=null)
+// return srvVersion.getSettingValue();
+// else
+// return "unknown";
+
+ String version = "unknown";
+ JDBCUtils utils = new JDBCUtils();
+ Connection con = null;
+ ResultSet rs = null;
+ PreparedStatement st = null;
+ try {
+ con = utils.getConnection();
+ st = con.prepareStatement("SELECT version FROM flyway_schema_history where success =1 order by installed_rank desc limit 1");
+ rs = st.executeQuery();
+
+ if (rs.next()) {
+ version = rs.getString(1);
+
+ }
+ } catch (SQLException sqle) {
+ log.error("Error getting database / server version", sqle);
+ } finally {
+ try {
+ rs.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ try {
+ st.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ try {
+ con.close();
+ } catch (Throwable t) {
+ log.error(t);
+ }
+ }
+
+ return version;
+
}
@Override
@@ -1424,7 +1480,7 @@ public String getServerIpV4() throws Exception {
public String getServerInterfacesBoundTo() throws Exception {
File data = new File(System.getProperty("jlawyer.server.basedirectory"));
File jlawyer = data.getParentFile();
- File wildFlyConf = new File(jlawyer.getAbsolutePath() + File.separator + "wildfly-9.0.2.Final" + File.separator + "standalone" + File.separator + "configuration" + File.separator + "standalone-full.xml");
+ File wildFlyConf = new File(jlawyer.getAbsolutePath() + File.separator + "wildfly" + File.separator + "standalone" + File.separator + "configuration" + File.separator + "standalone-full.xml");
Document dom;
// Make an instance of the DocumentBuilderFactory
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -1469,7 +1525,7 @@ public String getServerInterfacesBoundTo() throws Exception {
public boolean setServerInterfaceBindings(String ip) throws Exception {
File data = new File(System.getProperty("jlawyer.server.basedirectory"));
File jlawyer = data.getParentFile();
- File wildFlyConf = new File(jlawyer.getAbsolutePath() + File.separator + "wildfly-9.0.2.Final" + File.separator + "standalone" + File.separator + "configuration" + File.separator + "standalone-full.xml");
+ File wildFlyConf = new File(jlawyer.getAbsolutePath() + File.separator + "wildfly" + File.separator + "standalone" + File.separator + "configuration" + File.separator + "standalone-full.xml");
if (!wildFlyConf.exists()) {
throw new Exception("server configuration not found: " + wildFlyConf.getAbsolutePath());
diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/VoipService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/VoipService.java
index ef8eba9be..161902374 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/VoipService.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/VoipService.java
@@ -896,10 +896,11 @@ public void deleteQueueEntries(List sessionIds) throws SipgateException
continue;
FaxQueueBean fb = this.faxFacade.find(id);
- String qFile = fb.getPdfQueueFile();
if (fb != null) {
+ String qFile = fb.getPdfQueueFile();
if (!SipUtils.isFinalStatus(fb.getLastStatus())) {
- throw new SipgateException("Fax " + id + " wird noch verarbeitet - Status kann nicht gelöscht werden!");
+ log.warn("Requested to delete fax queue entry in status " + fb.getLastStatus() + ", which is not a final status");
+ //throw new SipgateException("Fax " + id + " wird noch verarbeitet (Status: " + fb.getLastStatus() + ") - Status kann nicht gelöscht werden!");
}
this.faxFacade.remove(fb);
removed = true;
diff --git a/j-lawyer-server/j-lawyer-server-ejb/test/org/jlawyer/test/server/ejb/LibreOfficeODFTest.java b/j-lawyer-server/j-lawyer-server-ejb/test/org/jlawyer/test/server/ejb/LibreOfficeODFTest.java
index 7e6b3162b..fe6223862 100644
--- a/j-lawyer-server/j-lawyer-server-ejb/test/org/jlawyer/test/server/ejb/LibreOfficeODFTest.java
+++ b/j-lawyer-server/j-lawyer-server-ejb/test/org/jlawyer/test/server/ejb/LibreOfficeODFTest.java
@@ -705,6 +705,8 @@ public static void tearDownClass() {
@Before
public void setUp() {
+
+ //org.slf4j.helpers.Util.
}
@@ -771,6 +773,7 @@ public void setPlaceHoldersODT() {
System.out.println(content);
} catch (Throwable t) {
System.out.println(t.getMessage());
+ t.printStackTrace();
Assert.fail();
}
@@ -836,6 +839,7 @@ public void setReplaceEmptyLine() {
System.out.println(content);
} catch (Throwable t) {
System.out.println(t.getMessage());
+ t.printStackTrace();
Assert.fail();
}
@@ -906,6 +910,7 @@ public void setReplaceEmptyLine2() {
System.out.println(content);
} catch (Throwable t) {
System.out.println(t.getMessage());
+ t.printStackTrace();
Assert.fail();
}
@@ -938,6 +943,7 @@ public void setPlaceHoldersODS() {
LibreOfficeAccess.setPlaceHolders("test/data/template-run.ods", ph);
} catch (Throwable t) {
System.out.println(t.getMessage());
+ t.printStackTrace();
Assert.fail();
}
diff --git a/j-lawyer-server/j-lawyer-server-io/nbproject/ant-deploy.xml b/j-lawyer-server/j-lawyer-server-io/nbproject/ant-deploy.xml
index b97c127f5..1e585256a 100644
--- a/j-lawyer-server/j-lawyer-server-io/nbproject/ant-deploy.xml
+++ b/j-lawyer-server/j-lawyer-server-io/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
+
diff --git a/j-lawyer-server/j-lawyer-server-io/nbproject/project.properties b/j-lawyer-server/j-lawyer-server-io/nbproject/project.properties
index c47e51099..2258d310a 100644
--- a/j-lawyer-server/j-lawyer-server-io/nbproject/project.properties
+++ b/j-lawyer-server/j-lawyer-server-io/nbproject/project.properties
@@ -34,7 +34,7 @@ j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=true
j2ee.platform=1.7
-j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/cdi-api-1.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/jws/api/main/jsr181-api-1.0-MR1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/jboss-jstl-api_1.2_spec-1.1.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/wsdl4j/api/main/wsdl4j-1.6.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/sql/api/main/jboss-javax-sql-api_7.0_spec-1.1.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-1.0.4.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.2_spec-2.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.3_spec-1.0.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/bind/api/main/jboss-jaxb-api_2.2_spec-1.0.4.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/validation-api-1.1.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.2_spec-2.2.12.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.jar:${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/activation-1.1.1.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/hibernate-jpa-2.1-api-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.3.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/el/main/javax.el-impl-3.0.1-b05-jbossorg-1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.0.3.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/wsdl4j/api/main/wsdl4j-1.6.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.1.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/validation-api-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/javax.persistence-api-2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/mail/api/main/javax.mail-1.6.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/bind/api/main/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.3_spec-1.0.6.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/javax.security.enterprise-api-1.0.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/javax.json-api-1.1.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/javax.json.bind-api-1.0.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-impl-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-spec-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-compat-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/cdi-api-2.0.SP1.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/activation-1.1.1.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jws/api/main/jsr181-api-1.0-MR1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/el/main/javax.el-impl-3.0.1-b08-jbossorg-1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar
j2ee.server.type=WildFly
jar.compress=false
javac.classpath=\
diff --git a/j-lawyer-server/j-lawyer-server-war/nbproject/ant-deploy.xml b/j-lawyer-server/j-lawyer-server-war/nbproject/ant-deploy.xml
index b97c127f5..1e585256a 100755
--- a/j-lawyer-server/j-lawyer-server-war/nbproject/ant-deploy.xml
+++ b/j-lawyer-server/j-lawyer-server-war/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
+
diff --git a/j-lawyer-server/j-lawyer-server-war/nbproject/build-impl.xml b/j-lawyer-server/j-lawyer-server-war/nbproject/build-impl.xml
index 61d50fe8b..e862976b6 100755
--- a/j-lawyer-server/j-lawyer-server-war/nbproject/build-impl.xml
+++ b/j-lawyer-server/j-lawyer-server-war/nbproject/build-impl.xml
@@ -1038,16 +1038,16 @@ exists or setup the property manually. For example like this:
-
+
-
+
diff --git a/j-lawyer-server/j-lawyer-server-war/nbproject/genfiles.properties b/j-lawyer-server/j-lawyer-server-war/nbproject/genfiles.properties
index 70059e85e..6fa9fdeda 100755
--- a/j-lawyer-server/j-lawyer-server-war/nbproject/genfiles.properties
+++ b/j-lawyer-server/j-lawyer-server-war/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=c6ec73cb
+build.xml.data.CRC32=e473c08a
build.xml.script.CRC32=b9f96ad7
-build.xml.stylesheet.CRC32=651128d4@1.75.1.1
+build.xml.stylesheet.CRC32=651128d4@1.77.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=c6ec73cb
-nbproject/build-impl.xml.script.CRC32=a48a1dd4
-nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1
+nbproject/build-impl.xml.data.CRC32=e473c08a
+nbproject/build-impl.xml.script.CRC32=e626d049
+nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1
diff --git a/j-lawyer-server/j-lawyer-server-war/nbproject/project.properties b/j-lawyer-server/j-lawyer-server-war/nbproject/project.properties
index f6ed32725..fa44b0969 100755
--- a/j-lawyer-server/j-lawyer-server-war/nbproject/project.properties
+++ b/j-lawyer-server/j-lawyer-server-war/nbproject/project.properties
@@ -35,7 +35,7 @@ file.reference.jboss-client.jar=../lib/jboss-client.jar
file.reference.jboss-servlet-api_3.1_spec-1.0.0.Final.jar=../lib/jboss-servlet-api_3.1_spec-1.0.0.Final.jar
file.reference.jcifs-1.3.18.jar=../lib/jcifs-1.3.18.jar
file.reference.jsch-0.1.54.jar=../lib/jsch-0.1.54.jar
-file.reference.log4j.jar=../j-lawyer-server-ejb/lib/log4j.jar
+file.reference.log4j-1.2.17.jar=../lib/log4j-1.2.17.jar
file.reference.tika-app-1.5.jar=../j-lawyer-server-ejb/lib/tika-app-1.5.jar
file.reference.zip4j_1.3.2.jar=../lib/zip4j_1.3.2.jar
includes=**
@@ -43,13 +43,13 @@ j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
j2ee.deploy.on.save=false
j2ee.platform=1.6
-j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/cdi-api-1.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/jws/api/main/jsr181-api-1.0-MR1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/jboss-jstl-api_1.2_spec-1.1.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/wsdl4j/api/main/wsdl4j-1.6.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/sql/api/main/jboss-javax-sql-api_7.0_spec-1.1.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-1.0.4.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.2_spec-2.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.3_spec-1.0.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/bind/api/main/jboss-jaxb-api_2.2_spec-1.0.4.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/validation-api-1.1.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.2_spec-2.2.12.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.jar:${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/activation-1.1.1.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/hibernate-jpa-2.1-api-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.3.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/el/main/javax.el-impl-3.0.1-b05-jbossorg-1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.0.3.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/wsdl4j/api/main/wsdl4j-1.6.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.1.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/validation-api-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/javax.persistence-api-2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/mail/api/main/javax.mail-1.6.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/bind/api/main/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.3_spec-1.0.6.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/javax.security.enterprise-api-1.0.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/javax.json-api-1.1.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/javax.json.bind-api-1.0.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-impl-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-spec-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-compat-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/cdi-api-2.0.SP1.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/activation-1.1.1.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jws/api/main/jsr181-api-1.0-MR1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/el/main/javax.el-impl-3.0.1-b08-jbossorg-1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar
j2ee.server.type=WildFly
jar.compress=false
javac.classpath=\
${reference.j-lawyer-server-ejb.dist}:\
- ${file.reference.log4j.jar}:\
${reference.j-lawyer-server-common.jar}:\
+ ${file.reference.log4j-1.2.17.jar}:\
${reference.j-lawyer-server-entities.dist}:\
${file.reference.jboss-client.jar}:\
${file.reference.j-lawyer-fax.jar}:\
diff --git a/j-lawyer-server/j-lawyer-server-war/nbproject/project.xml b/j-lawyer-server/j-lawyer-server-war/nbproject/project.xml
index abadd0f41..f4955ea3e 100755
--- a/j-lawyer-server/j-lawyer-server-war/nbproject/project.xml
+++ b/j-lawyer-server/j-lawyer-server-war/nbproject/project.xml
@@ -10,11 +10,11 @@
${reference.j-lawyer-server-ejb.dist}
- ${file.reference.log4j.jar}
+ ${reference.j-lawyer-server-common.jar}
WEB-INF/lib
- ${reference.j-lawyer-server-common.jar}
+ ${file.reference.log4j-1.2.17.jar}
WEB-INF/lib
diff --git a/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/FaxQueueStatusTask.java b/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/FaxQueueStatusTask.java
index 86179f03b..688ff20af 100755
--- a/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/FaxQueueStatusTask.java
+++ b/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/FaxQueueStatusTask.java
@@ -673,6 +673,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import javax.annotation.security.RunAs;
import javax.jms.*;
import javax.naming.InitialContext;
import org.apache.log4j.Logger;
@@ -681,6 +682,7 @@
*
* @author jens
*/
+@RunAs("loginRole")
public class FaxQueueStatusTask extends java.util.TimerTask {
private static Logger log = Logger.getLogger(FaxQueueStatusTask.class.getName());
diff --git a/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/IterativeBackupTask.java b/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/IterativeBackupTask.java
index 27c21f9a1..3d5ad5c4b 100644
--- a/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/IterativeBackupTask.java
+++ b/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/IterativeBackupTask.java
@@ -741,8 +741,8 @@ public void run() {
ServerSettingsBeanFacadeLocal settings = (ServerSettingsBeanFacadeLocal) ic.lookup("java:global/j-lawyer-server/j-lawyer-server-ejb/ServerSettingsBeanFacade!com.jdimension.jlawyer.persistence.ServerSettingsBeanFacadeLocal");
ServerSettingsBean mode = settings.find("jlawyer.server.backup.backupmode");
if (!this.adHoc) {
- log.info("backup mode: " + mode);
if (mode != null) {
+ log.info("backup mode: " + mode.getSettingValue());
if ("off".equalsIgnoreCase(mode.getSettingValue())) {
isRunning=false;
return;
diff --git a/j-lawyer-server/lib/flyway-core-5.2.1.jar b/j-lawyer-server/lib/flyway-core-5.2.1.jar
new file mode 100644
index 000000000..70a111935
Binary files /dev/null and b/j-lawyer-server/lib/flyway-core-5.2.1.jar differ
diff --git a/j-lawyer-server/lib/jboss-cli-client.jar b/j-lawyer-server/lib/jboss-cli-client.jar
old mode 100755
new mode 100644
index 40198c69f..cb8cd793c
Binary files a/j-lawyer-server/lib/jboss-cli-client.jar and b/j-lawyer-server/lib/jboss-cli-client.jar differ
diff --git a/j-lawyer-server/lib/jboss-client.jar b/j-lawyer-server/lib/jboss-client.jar
old mode 100755
new mode 100644
index 0bbf0bb72..358e74278
Binary files a/j-lawyer-server/lib/jboss-client.jar and b/j-lawyer-server/lib/jboss-client.jar differ
diff --git a/j-lawyer-server/lib/jboss-ejb3-ext-api-2.2.0.Final.jar b/j-lawyer-server/lib/jboss-ejb3-ext-api-2.2.0.Final.jar
new file mode 100644
index 000000000..76b2d8930
Binary files /dev/null and b/j-lawyer-server/lib/jboss-ejb3-ext-api-2.2.0.Final.jar differ
diff --git a/j-lawyer-server/lib/log4j-1.2.17.jar b/j-lawyer-server/lib/log4j-1.2.17.jar
new file mode 100644
index 000000000..1d425cf7d
Binary files /dev/null and b/j-lawyer-server/lib/log4j-1.2.17.jar differ
diff --git a/j-lawyer-server/lib/mysql-connector-java-5.1.37-bin.jar b/j-lawyer-server/lib/mysql-connector-java-5.1.37-bin.jar
deleted file mode 100755
index 465af6701..000000000
Binary files a/j-lawyer-server/lib/mysql-connector-java-5.1.37-bin.jar and /dev/null differ
diff --git a/j-lawyer-server/lib/mysql-connector-java-8.0.13.jar b/j-lawyer-server/lib/mysql-connector-java-8.0.13.jar
new file mode 100644
index 000000000..362fd6efe
Binary files /dev/null and b/j-lawyer-server/lib/mysql-connector-java-8.0.13.jar differ
diff --git a/j-lawyer-server/nbproject/ant-deploy.xml b/j-lawyer-server/nbproject/ant-deploy.xml
index b97c127f5..1e585256a 100755
--- a/j-lawyer-server/nbproject/ant-deploy.xml
+++ b/j-lawyer-server/nbproject/ant-deploy.xml
@@ -1,4 +1,43 @@
+
diff --git a/j-lawyer-server/nbproject/genfiles.properties b/j-lawyer-server/nbproject/genfiles.properties
index 898a2e0f5..214c3b9d9 100755
--- a/j-lawyer-server/nbproject/genfiles.properties
+++ b/j-lawyer-server/nbproject/genfiles.properties
@@ -5,4 +5,4 @@ build.xml.stylesheet.CRC32=a5d15b16@1.49.1
# 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=13deddf3
nbproject/build-impl.xml.script.CRC32=7fc29334
-nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.53.1
+nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.54.1
diff --git a/j-lawyer-server/nbproject/project.properties b/j-lawyer-server/nbproject/project.properties
index a377a9e04..a5acce229 100755
--- a/j-lawyer-server/nbproject/project.properties
+++ b/j-lawyer-server/nbproject/project.properties
@@ -14,7 +14,7 @@ j2ee.clientName=${jar.name}
j2ee.compile.on.save=true
j2ee.deploy.on.save=false
j2ee.platform=1.6
-j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/cdi-api-1.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/jws/api/main/jsr181-api-1.0-MR1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/jboss-jstl-api_1.2_spec-1.1.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/wsdl4j/api/main/wsdl4j-1.6.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/sql/api/main/jboss-javax-sql-api_7.0_spec-1.1.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-1.0.4.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.2_spec-2.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.3_spec-1.0.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/bind/api/main/jboss-jaxb-api_2.2_spec-1.0.4.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/validation-api-1.1.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.2_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.2_spec-2.2.12.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.jar:${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/activation-1.1.1.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/hibernate-jpa-2.1-api-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.3.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/el/main/javax.el-impl-3.0.1-b05-jbossorg-1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.0.3.jar
+j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/wsdl4j/api/main/wsdl4j-1.6.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.1.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/validation-api-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/javax.persistence-api-2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/mail/api/main/javax.mail-1.6.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/bind/api/main/jboss-jaxb-api_2.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.3_spec-1.0.6.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/javax.security.enterprise-api-1.0.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/javax.json-api-1.1.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/javax.json.bind-api-1.0.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.3.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-impl-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-spec-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jstl/api/main/taglibs-standard-compat-1.2.6-RC1.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/cdi-api-2.0.SP1.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/activation-1.1.1.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-1.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jws/api/main/jsr181-api-1.0-MR1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/el/main/javax.el-impl-3.0.1-b08-jbossorg-1.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar
j2ee.server.type=WildFly
jar.compress=false
jar.content.additional=\
@@ -25,8 +25,8 @@ jar.content.additional=\
jar.name=j-lawyer-server.ear
javac.debug=true
javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.source=1.6
+javac.target=1.6
meta.inf=src/conf
no.dependencies=false
platform.active=default_platform
diff --git a/j-lawyer-server/setup/create_database.sql b/j-lawyer-server/setup/create_database.sql
index 40a0c2e0a..f36308e5d 100755
--- a/j-lawyer-server/setup/create_database.sql
+++ b/j-lawyer-server/setup/create_database.sql
@@ -497,5 +497,71 @@ alter table campaign_addresses add index `IDX_CAMPAIGNADDRESSES_ADDRESSKEY` (add
alter table ArchiveFileBean MODIFY `reason` VARCHAR(250) BINARY;
+##############################################
+# Introduced with change from 1.9.1 to 1.10
+# This is just for documentation purposes.
+# It MUST NOT be executed because starting
+# with this version Flyway will handle the
+# migrations
+##############################################
+
+-- insert into ServerSettingsBean(settingKey, settingValue) values('jlawyer.server.database.version','1.10.0.3') ON DUPLICATE KEY UPDATE settingValue = '1.10.0.3';
+--
+-- alter table ArchiveFileBean add index `IDX_ARCHIVEFILEBEAN_SUBJECTFIELD` (subjectField);
+--
+-- rename table AddressBean to contacts;
+-- rename table AddressTagsBean to contact_tags;
+--
+-- rename table AppOptionGroupBean to server_options;
+-- rename table ServerSettingsBean to server_settings;
+-- -- required for j-lawyer.BOX
+-- CREATE VIEW ServerSettingsBean AS SELECT * FROM server_settings;
+--
+-- -- views are required for the login module whose configuration will not change
+-- rename table AppRoleBean to security_roles;
+-- CREATE VIEW AppRoleBean AS SELECT * FROM security_roles;
+-- rename table AppUserBean to security_users;
+-- CREATE VIEW AppUserBean AS SELECT * FROM security_users;
+--
+-- rename table ArchiveFileBean to cases;
+-- rename table ArchiveFileAddressesBean to case_contacts;
+-- rename table ArchiveFileDocumentsBean to case_documents;
+-- rename table ArchiveFileHistoryBean to case_history;
+-- rename table ArchiveFileReviewsBean to case_followups;
+-- rename table ArchiveFileTagsBean to case_tags;
+-- rename table BankDataBean to directory_banks;
+-- rename table CityDataBean to directory_cities;
+-- rename table FaxQueueBean to communication_fax;
+--
+-- rename table campaign to campaigns;
+-- rename table campaign_addresses to campaign_contacts;
+
+-- delete from security_roles where role='readOptionGroupRole';
+-- insert into ServerSettingsBean(settingKey, settingValue) values('jlawyer.server.database.version','1.10.0.5') ON DUPLICATE KEY UPDATE settingValue = '1.10.0.5';
+
+-- alter table contacts add index `IDX_BEASAFEID` (beaSafeId);
+
+
+
+-- insert into ServerSettingsBean(settingKey, settingValue) values('jlawyer.server.database.version','1.10.0.6') ON DUPLICATE KEY UPDATE settingValue = '1.10.0.6';
+
+-- CREATE TABLE document_tags (
+-- `id` VARCHAR(250) BINARY NOT NULL,
+-- `documentKey` VARCHAR(250) BINARY,
+-- `tagName` VARCHAR(250) BINARY,
+-- CONSTRAINT `pk_document_tags` PRIMARY KEY (`id`),
+-- FOREIGN KEY (documentKey) REFERENCES case_documents(id) ON DELETE CASCADE
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+--
+-- alter table document_tags add index `IDX_TAGNAME` (tagName);
+-- alter table document_tags add index `IDX_DOCUMENTKEY` (documentKey);
+--
+-- alter table document_tags add index `IDX_DOCUMENTKEY_TAGNAME` (documentKey, tagName);
+-- alter table document_tags add unique index `IDX_DOCUMENTKEY_TAGNAME_UQ` (documentKey, tagName);
+
+insert into ServerSettingsBean(settingKey, settingValue) values('jlawyer.server.bea.beaendpoint','https://ksw.bea-brak.de') ON DUPLICATE KEY UPDATE settingValue = 'https://ksw.bea-brak.de';
+insert into ServerSettingsBean(settingKey, settingValue) values('jlawyer.server.database.version','1.10.0.7') ON DUPLICATE KEY UPDATE settingValue = '1.10.0.7';
+
+
commit;
diff --git a/j-lawyer-server/setup/update-1.9.1-to-1.10.sql b/j-lawyer-server/setup/update-1.9.1-to-1.10.sql
new file mode 100644
index 000000000..a45d1668e
--- /dev/null
+++ b/j-lawyer-server/setup/update-1.9.1-to-1.10.sql
@@ -0,0 +1,38 @@
+use jlawyerdb;
+
+# Remember to put database migrations into class DatabaseMigrator, this SQL file
+# is for documentation mainly or for cases where the servers datasource does not
+# have enough privileges to perform schema changes.
+
+insert into ServerSettingsBean(settingKey, settingValue) values('jlawyer.server.database.version','1.10.0.3') ON DUPLICATE KEY UPDATE settingValue = '1.10.0.3';
+
+alter table ArchiveFileBean add index `IDX_ARCHIVEFILEBEAN_SUBJECTFIELD` (subjectField);
+
+rename table AddressBean to contacts;
+rename table AddressTagsBean to contact_tags;
+
+rename table AppOptionGroupBean to server_options;
+rename table ServerSettingsBean to server_settings;
+-- required for j-lawyer.BOX
+CREATE VIEW ServerSettingsBean AS SELECT * FROM server_settings;
+
+-- views are required for the login module whose configuration will not change
+rename table AppRoleBean to security_roles;
+CREATE VIEW AppRoleBean AS SELECT * FROM security_roles;
+rename table AppUserBean to security_users;
+CREATE VIEW AppUserBean AS SELECT * FROM security_users;
+
+rename table ArchiveFileBean to cases;
+rename table ArchiveFileAddressesBean to case_contacts;
+rename table ArchiveFileDocumentsBean to case_documents;
+rename table ArchiveFileHistoryBean to case_history;
+rename table ArchiveFileReviewsBean to case_followups;
+rename table ArchiveFileTagsBean to case_tags;
+rename table BankDataBean to directory_banks;
+rename table CityDataBean to directory_cities;
+rename table FaxQueueBean to communication_fax;
+
+rename table campaign to campaigns;
+rename table campaign_addresses to campaign_contacts;
+
+commit;
\ No newline at end of file
diff --git a/j-lawyer-server/src/conf/jboss-deployment-structure.xml b/j-lawyer-server/src/conf/jboss-deployment-structure.xml
index 4387ca275..e750e6e20 100755
--- a/j-lawyer-server/src/conf/jboss-deployment-structure.xml
+++ b/j-lawyer-server/src/conf/jboss-deployment-structure.xml
@@ -7,6 +7,8 @@
+
+
\ No newline at end of file
|