diff --git a/build-fast.sh b/build-fast.sh index a7a6b5b4c..3d9bba32b 100755 --- a/build-fast.sh +++ b/build-fast.sh @@ -10,6 +10,7 @@ function check_error { fi } +# export JAVA_HOME=/home/jens/bin/jdk-17.0.9-full/ export JAVA_HOME=/home/jens/bin/jdk1.8.0_131 # there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now @@ -24,6 +25,7 @@ ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xm check_error $? ant -buildfile j-lawyer-server-api/build.xml jar check_error $? +# ant -Dplatforms.default_platform.home=/home/jens/bin/jdk-17.0.9-full/ -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist ant -Dplatforms.default_platform.home=/home/jens/bin/jdk-11.0.9.1-full/ -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist check_error $? ant -buildfile j-lawyer-io-common/build.xml jar diff --git a/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar b/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar index 81b574c7c..d4a8e96a4 100644 Binary files a/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar and b/j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar differ diff --git a/j-lawyer-client/lib/jakarta.persistence-api-2.2.3.jar b/j-lawyer-client/lib/jakarta.persistence-api-2.2.3.jar new file mode 100644 index 000000000..9c758cf5c Binary files /dev/null and b/j-lawyer-client/lib/jakarta.persistence-api-2.2.3.jar differ diff --git a/j-lawyer-client/lib/javaee-api-6.0/javaee-api-6.0.jar b/j-lawyer-client/lib/javaee-api-6.0/javaee-api-6.0.jar deleted file mode 100755 index 8a88bd651..000000000 Binary files a/j-lawyer-client/lib/javaee-api-6.0/javaee-api-6.0.jar and /dev/null differ diff --git a/j-lawyer-client/lib/javaee-api-6.0/javaee6-doc-api.zip b/j-lawyer-client/lib/javaee-api-6.0/javaee6-doc-api.zip deleted file mode 100755 index 03fe1ccd0..000000000 Binary files a/j-lawyer-client/lib/javaee-api-6.0/javaee6-doc-api.zip and /dev/null differ diff --git a/j-lawyer-client/lib/nblibraries.properties b/j-lawyer-client/lib/nblibraries.properties index a28947576..bfbf24982 100755 --- a/j-lawyer-client/lib/nblibraries.properties +++ b/j-lawyer-client/lib/nblibraries.properties @@ -11,11 +11,6 @@ libs.hamcrest.classpath=\ ${base}/hamcrest/hamcrest-core-1.3.jar libs.hamcrest.displayName=Hamcrest 1.3 libs.hamcrest.prop-maven-dependencies=org.hamcrest:hamcrest-core:1.3:jar -libs.javaee-api-6.0.classpath=\ - ${base}/javaee-api-6.0/javaee-api-6.0.jar -libs.javaee-api-6.0.displayName=Java EE 6 API Library -libs.javaee-api-6.0.javadoc=\ - ${base}/javaee-api-6.0/javaee6-doc-api.zip libs.junit.classpath=\ ${base}/junit/junit-3.8.2.jar libs.junit.displayName=JUnit 3.8.2 @@ -30,35 +25,6 @@ libs.junit_4.javadoc=\ libs.junit_4.prop-maven-dependencies=junit:junit:4.10:jar libs.junit_4.src=\ ${base}/junit_4/junit-4.10-sources.jar -libs.restapi.classpath=\ - ${base}/restapi/javax.ws.rs-api-2.0.jar -libs.restapi.displayName=JAX-RS 2.0 -libs.restapi.prop-maven-dependencies=javax.ws.rs:javax.ws.rs-api:jar -libs.restlib.classpath=\ - ${base}/restlib/asm-all-repackaged-2.2.0-b21.jar:\ - ${base}/restlib/cglib-2.2.0-b21.jar:\ - ${base}/restlib/guava-14.0.1.jar:\ - ${base}/restlib/hk2-api-2.2.0-b21.jar:\ - ${base}/restlib/hk2-locator-2.2.0-b21.jar:\ - ${base}/restlib/hk2-utils-2.2.0-b21.jar:\ - ${base}/restlib/javax.annotation-api-1.2.jar:\ - ${base}/restlib/javax.inject-2.2.0-b21.jar:\ - ${base}/restlib/javax.servlet-api-3.0.1.jar:\ - ${base}/restlib/jaxb-api-2.2.7.jar:\ - ${base}/restlib/jersey-entity-filtering-2.5.1.jar:\ - ${base}/restlib/jersey-media-moxy-2.5.1.jar:\ - ${base}/restlib/org.osgi.core-4.2.0.jar:\ - ${base}/restlib/osgi-resource-locator-1.0.1.jar:\ - ${base}/restlib/persistence-api-1.0.jar:\ - ${base}/restlib/validation-api-1.1.0.Final.jar:\ - ${base}/restlib/jersey-client.jar:\ - ${base}/restlib/jersey-common.jar:\ - ${base}/restlib/jersey-container-servlet.jar:\ - ${base}/restlib/jersey-container-servlet-core.jar:\ - ${base}/restlib/jersey-server.jar:\ - ${base}/restlib/eclipselink.jar -libs.restlib.displayName=Jersey 2.5.1 (JAX-RS RI) -libs.restlib.prop-maven-dependencies=\n org.glassfish.jersey.containers:jersey-container-servlet:2.5.1:jar\n org.glassfish.jersey.core:jersey-client:2.5.1:jar\n org.glassfish.jersey.media:jersey-media-moxy:2.5.1:jar\n libs.swing-layout.classpath=\ ${base}/swing-layout/swing-layout-1.0.4.jar libs.swing-layout.displayName=Swing Layout Extensions diff --git a/j-lawyer-client/lib/persistence-api-1.0.2.jar b/j-lawyer-client/lib/persistence-api-1.0.2.jar deleted file mode 100644 index a18dd1bcd..000000000 Binary files a/j-lawyer-client/lib/persistence-api-1.0.2.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restapi/javax.ws.rs-api-2.0.jar b/j-lawyer-client/lib/restapi/javax.ws.rs-api-2.0.jar deleted file mode 100644 index b9de41659..000000000 Binary files a/j-lawyer-client/lib/restapi/javax.ws.rs-api-2.0.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/asm-all-repackaged-2.2.0-b21.jar b/j-lawyer-client/lib/restlib/asm-all-repackaged-2.2.0-b21.jar deleted file mode 100644 index cf13a293a..000000000 Binary files a/j-lawyer-client/lib/restlib/asm-all-repackaged-2.2.0-b21.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/cglib-2.2.0-b21.jar b/j-lawyer-client/lib/restlib/cglib-2.2.0-b21.jar deleted file mode 100644 index 70d51ba22..000000000 Binary files a/j-lawyer-client/lib/restlib/cglib-2.2.0-b21.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/eclipselink.jar b/j-lawyer-client/lib/restlib/eclipselink.jar deleted file mode 100644 index 60e581cb7..000000000 Binary files a/j-lawyer-client/lib/restlib/eclipselink.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/guava-14.0.1.jar b/j-lawyer-client/lib/restlib/guava-14.0.1.jar deleted file mode 100644 index 472840ca9..000000000 Binary files a/j-lawyer-client/lib/restlib/guava-14.0.1.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/hk2-api-2.2.0-b21.jar b/j-lawyer-client/lib/restlib/hk2-api-2.2.0-b21.jar deleted file mode 100644 index 9020a445c..000000000 Binary files a/j-lawyer-client/lib/restlib/hk2-api-2.2.0-b21.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/hk2-locator-2.2.0-b21.jar b/j-lawyer-client/lib/restlib/hk2-locator-2.2.0-b21.jar deleted file mode 100644 index acf3db27b..000000000 Binary files a/j-lawyer-client/lib/restlib/hk2-locator-2.2.0-b21.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/hk2-utils-2.2.0-b21.jar b/j-lawyer-client/lib/restlib/hk2-utils-2.2.0-b21.jar deleted file mode 100644 index 2c628ceb3..000000000 Binary files a/j-lawyer-client/lib/restlib/hk2-utils-2.2.0-b21.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/javax.annotation-api-1.2.jar b/j-lawyer-client/lib/restlib/javax.annotation-api-1.2.jar deleted file mode 100644 index 00523c78e..000000000 Binary files a/j-lawyer-client/lib/restlib/javax.annotation-api-1.2.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/javax.inject-2.2.0-b21.jar b/j-lawyer-client/lib/restlib/javax.inject-2.2.0-b21.jar deleted file mode 100644 index 6320b22ae..000000000 Binary files a/j-lawyer-client/lib/restlib/javax.inject-2.2.0-b21.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/javax.servlet-api-3.0.1.jar b/j-lawyer-client/lib/restlib/javax.servlet-api-3.0.1.jar deleted file mode 100644 index 8336627e8..000000000 Binary files a/j-lawyer-client/lib/restlib/javax.servlet-api-3.0.1.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jaxb-api-2.2.7.jar b/j-lawyer-client/lib/restlib/jaxb-api-2.2.7.jar deleted file mode 100644 index 4cf7619f4..000000000 Binary files a/j-lawyer-client/lib/restlib/jaxb-api-2.2.7.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-client.jar b/j-lawyer-client/lib/restlib/jersey-client.jar deleted file mode 100644 index 81d34f2c6..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-client.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-common.jar b/j-lawyer-client/lib/restlib/jersey-common.jar deleted file mode 100644 index 428c13f4f..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-common.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-container-servlet-core.jar b/j-lawyer-client/lib/restlib/jersey-container-servlet-core.jar deleted file mode 100644 index 0133fb8ea..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-container-servlet-core.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-container-servlet.jar b/j-lawyer-client/lib/restlib/jersey-container-servlet.jar deleted file mode 100644 index 3a249e589..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-container-servlet.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-entity-filtering-2.5.1.jar b/j-lawyer-client/lib/restlib/jersey-entity-filtering-2.5.1.jar deleted file mode 100644 index 1dc257bd6..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-entity-filtering-2.5.1.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-media-moxy-2.5.1.jar b/j-lawyer-client/lib/restlib/jersey-media-moxy-2.5.1.jar deleted file mode 100644 index 96323f45d..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-media-moxy-2.5.1.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/jersey-server.jar b/j-lawyer-client/lib/restlib/jersey-server.jar deleted file mode 100644 index 4379d6f76..000000000 Binary files a/j-lawyer-client/lib/restlib/jersey-server.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/org.osgi.core-4.2.0.jar b/j-lawyer-client/lib/restlib/org.osgi.core-4.2.0.jar deleted file mode 100644 index c24988bd0..000000000 Binary files a/j-lawyer-client/lib/restlib/org.osgi.core-4.2.0.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/osgi-resource-locator-1.0.1.jar b/j-lawyer-client/lib/restlib/osgi-resource-locator-1.0.1.jar deleted file mode 100644 index 552cb84b8..000000000 Binary files a/j-lawyer-client/lib/restlib/osgi-resource-locator-1.0.1.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/persistence-api-1.0.jar b/j-lawyer-client/lib/restlib/persistence-api-1.0.jar deleted file mode 100644 index 012afb8a5..000000000 Binary files a/j-lawyer-client/lib/restlib/persistence-api-1.0.jar and /dev/null differ diff --git a/j-lawyer-client/lib/restlib/validation-api-1.1.0.Final.jar b/j-lawyer-client/lib/restlib/validation-api-1.1.0.Final.jar deleted file mode 100644 index da7d94370..000000000 Binary files a/j-lawyer-client/lib/restlib/validation-api-1.1.0.Final.jar and /dev/null differ diff --git a/j-lawyer-client/nbproject/project.properties b/j-lawyer-client/nbproject/project.properties index e48ee7a27..451e161b1 100755 --- a/j-lawyer-client/nbproject/project.properties +++ b/j-lawyer-client/nbproject/project.properties @@ -38,6 +38,7 @@ file.reference.jakarta.activation-1.2.2.jar=lib/bea/jakarta.activation-1.2.2.jar file.reference.jakarta.activation-api-1.2.2.jar=lib/bea/jakarta.activation-api-1.2.2.jar file.reference.jakarta.annotation-api-1.3.5.jar=lib/bea/jakarta.annotation-api-1.3.5.jar file.reference.jakarta.jws-api-2.1.0.jar=lib/bea/jakarta.jws-api-2.1.0.jar +file.reference.jakarta.persistence-api-2.2.3.jar=lib/jakarta.persistence-api-2.2.3.jar file.reference.jakarta.xml.bind-api-2.3.3.jar=lib/bea/jakarta.xml.bind-api-2.3.3.jar file.reference.jakarta.xml.soap-api-1.4.2.jar=lib/bea/jakarta.xml.soap-api-1.4.2.jar file.reference.jakarta.xml.ws-api-2.3.3.jar=lib/bea/jakarta.xml.ws-api-2.3.3.jar @@ -157,7 +158,6 @@ file.reference.sam.jar=lib/sam.jar test.src.dir=test file.reference.jtidy-8.0.jar=lib/jtidy-8.0.jar file.reference.httpcore-4.4.11.jar=lib/httpcore-4.4.11.jar -file.reference.persistence-api-1.0.2.jar=lib/persistence-api-1.0.2.jar file.reference.actgorithm_identifier-1.0.0.10.jar=lib/bea/algorithm_identifier-1.0.0.10.jar jar.index=${jnlp.enabled} build.sysclasspath=ignore @@ -310,13 +310,10 @@ javac.classpath=\ ${file.reference.hamcrest-core-1.3.jar}:\ ${file.reference.commons-beanutils-1.8.0.jar}:\ ${file.reference.json-simple-2.3.0.jar}:\ - ${libs.restapi.classpath}:\ - ${libs.restlib.classpath}:\ ${file.reference.SHEF.jar}:\ ${file.reference.j-lawyer-server-api.jar}:\ ${file.reference.config_schulung.jar-1}:\ ${file.reference.jbig2-imageio-3.0.0.jar}:\ - ${file.reference.persistence-api-1.0.2.jar}:\ ${file.reference.j-lawyer-cloud.jar}:\ ${file.reference.javax.mail-1.6.2.jar}:\ ${file.reference.openpdf-1.3.22.jar}:\ @@ -455,7 +452,8 @@ javac.classpath=\ ${file.reference.poi-5.2.3.jar}:\ ${file.reference.rtf-to-html-1.0.1.jar}:\ ${file.reference.poi-scratchpad-5.2.3.jar}:\ - ${file.reference.ehcache-3.10.8.jar} + ${file.reference.ehcache-3.10.8.jar}:\ + ${file.reference.jakarta.persistence-api-2.2.3.jar} file.reference.j-lawyer-server-entities.jar=../j-lawyer-server-entities/dist/j-lawyer-server-entities.jar file.reference.novaworx-syntax-0.0.7.jar=lib/novaworx-syntax-0.0.7.jar file.reference.ical4j-0.9.18.jar=lib/bizcal/ical4j-0.9.18.jar diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/research/urteilegesetze/UgAccess.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/research/urteilegesetze/UgAccess.java index 7a181b144..09ec473d7 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/research/urteilegesetze/UgAccess.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/research/urteilegesetze/UgAccess.java @@ -663,36 +663,26 @@ */ package com.jdimension.jlawyer.client.editors.research.urteilegesetze; -import java.util.ArrayList; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import org.jboss.logging.Logger; -import org.json.simple.JsonArray; -import org.json.simple.JsonKey; -import org.json.simple.JsonObject; -import org.json.simple.Jsoner; - /** * * @author jens */ public class UgAccess { - - public static final int SEARCHTYPE_ALL=10; - public static final int SEARCHTYPE_GESETZE=20; - public static final int SEARCHTYPE_URTEILE=30; - - private static final Logger log=Logger.getLogger(UgAccess.class.getName()); + public static final int SEARCHTYPE_ALL = 10; + public static final int SEARCHTYPE_GESETZE = 20; + public static final int SEARCHTYPE_URTEILE = 30; + +// private static final Logger log=Logger.getLogger(UgAccess.class.getName()); +// private static UgAccess instance = null; - private Client client = null; - private WebTarget webTarget = null; +// private Client client = null; +// private WebTarget webTarget = null; private UgAccess() { - String BASE_URI = "https://urteile-gesetze.de/extapi/v1/"; - client = javax.ws.rs.client.ClientBuilder.newClient(); - //WebTarget webTarget = client.target(BASE_URI).path("restws"); - webTarget = client.target(BASE_URI); +// String BASE_URI = "https://urteile-gesetze.de/extapi/v1/"; +// client = javax.ws.rs.client.ClientBuilder.newClient(); +// webTarget = client.target(BASE_URI); } public static synchronized UgAccess getInstance() { @@ -703,79 +693,80 @@ public static synchronized UgAccess getInstance() { } public UgSearchResult search(String query, int searchType) throws Exception { - - query=query.replaceAll("\"", ""); - try { - UgSearchResult searchResult=new UgSearchResult(); - String jsonQuery="{\"query\":\"" + query + "\", \"referer\":\"j-lawyer\", \"filter\": {\"categories\":[\"rechtsprechung\", \"gesetze\"]}}"; - if(searchType==SEARCHTYPE_GESETZE) { - jsonQuery="{\"query\":\"" + query + "\", \"referer\":\"j-lawyer\", \"filter\": {\"categories\":[\"gesetze\"]}}"; - } else if(searchType==SEARCHTYPE_URTEILE) { - jsonQuery="{\"query\":\"" + query + "\", \"referer\":\"j-lawyer\", \"filter\": {\"categories\":[\"rechtsprechung\"]}}"; - } - String returnValue = webTarget.request(javax.ws.rs.core.MediaType.APPLICATION_JSON).post(javax.ws.rs.client.Entity.entity(jsonQuery, javax.ws.rs.core.MediaType.APPLICATION_JSON), String.class); - ArrayList returnList=new ArrayList<>(); - Object jsonOutput = Jsoner.deserialize(returnValue); - if (jsonOutput instanceof JsonObject) { - JsonObject result = (JsonObject) jsonOutput; - JsonKey hitCountKey = Jsoner.mintJsonKey("anzahlDerTreffer", null); - Integer hitCount = result.getInteger(hitCountKey); - searchResult.setNumberOfHits(hitCount); - JsonKey hitListLinkKey = Jsoner.mintJsonKey("linkZurTrefferliste", null); - String hitListUrl = result.getString(hitListLinkKey); - searchResult.setUrl(hitListUrl); - JsonKey hitListArrayKey = Jsoner.mintJsonKey("treffer", null); - Object hitList = result.getCollection(hitListArrayKey); - if (hitList instanceof JsonArray) { - JsonArray hitListArray = (JsonArray) hitList; - for (Object hitObject : hitListArray) { - if (hitObject instanceof JsonObject) { - JsonObject hit = (JsonObject) hitObject; - UgHit ugHit=new UgHit(); - //System.out.println("hit: " + hit); - if(hit.get("abkuerzung")!=null) - ugHit.setAbkuerzung(hit.get("abkuerzung").toString()); - if(hit.get("beschlussdatum")!=null) - ugHit.setBeschlussDatum(hit.get("beschlussdatum").toString()); - if(hit.get("titel")!=null) - ugHit.setTitel(hit.get("titel").toString()); - if(hit.get("url")!=null) - ugHit.setUrl(hit.get("url").toString()); - if(hit.get("kurzbeschreibung") != null) - ugHit.setKurzbeschreibung(hit.get("kurzbeschreibung").toString()); - if ("rechtsprechung".equalsIgnoreCase(hit.get("type").toString())) { - // titel gericht abkuerzung type url aktenzeichen beschlussdatum - ugHit.setType(UgHit.TYPE_RECHTSPRECHUNG); - if(hit.get("aktenzeichen")!=null) - ugHit.setAktenzeichen(hit.get("aktenzeichen").toString()); - if(hit.get("gericht")!=null) - ugHit.setGericht(hit.get("gericht").toString()); - } else if ("gesetz".equalsIgnoreCase(hit.get("type").toString())) { - // titel abkuerzung type url beschlussdatum - ugHit.setType(UgHit.TYPE_GESETZ); - - } else { - log.error("unknown hit type: " + hit.get("type").toString()); - throw new Exception("Unbekannter Ergebnistyp: " + hit.get("type").toString()); - } - if(ugHit.getTitel()==null) { - ugHit.setTitel("(leer)"); - } - returnList.add(ugHit); - } - } - } - searchResult.setHits(returnList); - return searchResult; - } else { - throw new Exception("Ergebnis ist kein JSON-Dokument!"); - } - - } catch (Throwable t) { - log.error(t); - throw new Exception(t); - } +// query=query.replaceAll("\"", ""); +// +// try { +// UgSearchResult searchResult=new UgSearchResult(); +// String jsonQuery="{\"query\":\"" + query + "\", \"referer\":\"j-lawyer\", \"filter\": {\"categories\":[\"rechtsprechung\", \"gesetze\"]}}"; +// if(searchType==SEARCHTYPE_GESETZE) { +// jsonQuery="{\"query\":\"" + query + "\", \"referer\":\"j-lawyer\", \"filter\": {\"categories\":[\"gesetze\"]}}"; +// } else if(searchType==SEARCHTYPE_URTEILE) { +// jsonQuery="{\"query\":\"" + query + "\", \"referer\":\"j-lawyer\", \"filter\": {\"categories\":[\"rechtsprechung\"]}}"; +// } +// String returnValue = webTarget.request(javax.ws.rs.core.MediaType.APPLICATION_JSON).post(javax.ws.rs.client.Entity.entity(jsonQuery, javax.ws.rs.core.MediaType.APPLICATION_JSON), String.class); +// ArrayList returnList=new ArrayList<>(); +// Object jsonOutput = Jsoner.deserialize(returnValue); +// if (jsonOutput instanceof JsonObject) { +// JsonObject result = (JsonObject) jsonOutput; +// JsonKey hitCountKey = Jsoner.mintJsonKey("anzahlDerTreffer", null); +// Integer hitCount = result.getInteger(hitCountKey); +// searchResult.setNumberOfHits(hitCount); +// JsonKey hitListLinkKey = Jsoner.mintJsonKey("linkZurTrefferliste", null); +// String hitListUrl = result.getString(hitListLinkKey); +// searchResult.setUrl(hitListUrl); +// JsonKey hitListArrayKey = Jsoner.mintJsonKey("treffer", null); +// Object hitList = result.getCollection(hitListArrayKey); +// if (hitList instanceof JsonArray) { +// JsonArray hitListArray = (JsonArray) hitList; +// for (Object hitObject : hitListArray) { +// if (hitObject instanceof JsonObject) { +// JsonObject hit = (JsonObject) hitObject; +// UgHit ugHit=new UgHit(); +// //System.out.println("hit: " + hit); +// if(hit.get("abkuerzung")!=null) +// ugHit.setAbkuerzung(hit.get("abkuerzung").toString()); +// if(hit.get("beschlussdatum")!=null) +// ugHit.setBeschlussDatum(hit.get("beschlussdatum").toString()); +// if(hit.get("titel")!=null) +// ugHit.setTitel(hit.get("titel").toString()); +// if(hit.get("url")!=null) +// ugHit.setUrl(hit.get("url").toString()); +// if(hit.get("kurzbeschreibung") != null) +// ugHit.setKurzbeschreibung(hit.get("kurzbeschreibung").toString()); +// if ("rechtsprechung".equalsIgnoreCase(hit.get("type").toString())) { +// // titel gericht abkuerzung type url aktenzeichen beschlussdatum +// ugHit.setType(UgHit.TYPE_RECHTSPRECHUNG); +// if(hit.get("aktenzeichen")!=null) +// ugHit.setAktenzeichen(hit.get("aktenzeichen").toString()); +// if(hit.get("gericht")!=null) +// ugHit.setGericht(hit.get("gericht").toString()); +// } else if ("gesetz".equalsIgnoreCase(hit.get("type").toString())) { +// // titel abkuerzung type url beschlussdatum +// ugHit.setType(UgHit.TYPE_GESETZ); +// +// } else { +// log.error("unknown hit type: " + hit.get("type").toString()); +// throw new Exception("Unbekannter Ergebnistyp: " + hit.get("type").toString()); +// } +// if(ugHit.getTitel()==null) { +// ugHit.setTitel("(leer)"); +// } +// returnList.add(ugHit); +// } +// } +// } +// searchResult.setHits(returnList); +// return searchResult; +// } else { +// throw new Exception("Ergebnis ist kein JSON-Dokument!"); +// } +// +// } catch (Throwable t) { +// log.error(t); +// throw new Exception(t); +// } + return null; } diff --git a/j-lawyer-fax/lib/nblibraries.properties b/j-lawyer-fax/lib/nblibraries.properties index 6c5f215da..7db4d070b 100755 --- a/j-lawyer-fax/lib/nblibraries.properties +++ b/j-lawyer-fax/lib/nblibraries.properties @@ -31,8 +31,6 @@ libs.restlib.classpath=\ ${base}/restlib/jersey-media-moxy-2.5.1.jar:\ ${base}/restlib/org.osgi.core-4.2.0.jar:\ ${base}/restlib/osgi-resource-locator-1.0.1.jar:\ - ${base}/restlib/persistence-api-1.0.jar:\ - ${base}/restlib/validation-api-1.1.0.Final.jar:\ ${base}/restlib/jersey-client.jar:\ ${base}/restlib/jersey-common.jar:\ ${base}/restlib/jersey-container-servlet.jar:\ diff --git a/j-lawyer-fax/lib/restlib/persistence-api-1.0.jar b/j-lawyer-fax/lib/restlib/persistence-api-1.0.jar deleted file mode 100644 index fe5dbcd47..000000000 Binary files a/j-lawyer-fax/lib/restlib/persistence-api-1.0.jar and /dev/null differ diff --git a/j-lawyer-fax/lib/restlib/validation-api-1.1.0.Final.jar b/j-lawyer-fax/lib/restlib/validation-api-1.1.0.Final.jar deleted file mode 100644 index de8540386..000000000 Binary files a/j-lawyer-fax/lib/restlib/validation-api-1.1.0.Final.jar and /dev/null differ diff --git a/j-lawyer-server-entities/nbproject/build-impl.xml b/j-lawyer-server-entities/nbproject/build-impl.xml index cfd819ebe..0c05e0111 100644 --- a/j-lawyer-server-entities/nbproject/build-impl.xml +++ b/j-lawyer-server-entities/nbproject/build-impl.xml @@ -805,19 +805,23 @@ exists or setup the property manually. For example like this: + + - + + + diff --git a/j-lawyer-server-entities/nbproject/genfiles.properties b/j-lawyer-server-entities/nbproject/genfiles.properties index f60af1b9a..24531e295 100755 --- a/j-lawyer-server-entities/nbproject/genfiles.properties +++ b/j-lawyer-server-entities/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=58f34b47 +build.xml.data.CRC32=376de38e build.xml.script.CRC32=fb901110 build.xml.stylesheet.CRC32=a737d6c5@1.74 # 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=58f34b47 -nbproject/build-impl.xml.script.CRC32=f514aa00 +nbproject/build-impl.xml.data.CRC32=376de38e +nbproject/build-impl.xml.script.CRC32=5d40db6b nbproject/build-impl.xml.stylesheet.CRC32=62693482@1.74 diff --git a/j-lawyer-server-entities/nbproject/project.properties b/j-lawyer-server-entities/nbproject/project.properties index 48aedf4f1..15d2e41c3 100755 --- a/j-lawyer-server-entities/nbproject/project.properties +++ b/j-lawyer-server-entities/nbproject/project.properties @@ -40,7 +40,7 @@ includes=** 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/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/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.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/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.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/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.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/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/jws/api/main/jsr181-api-1.0-MR1.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/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.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/persistence/api/main/javax.persistence-api-2.2.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/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/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.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-compat-1.2.6-RC1.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/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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.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/wsdl4j/api/main/wsdl4j-1.6.3.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/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.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/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/jakarta.activation-1.2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/jakarta.enterprise.cdi-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-3.1.0.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/jakarta.inject-api-1.0.5.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/jakarta.json-api-1.1.6.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/jakarta.json.bind-api-1.0.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/mail/api/main/jakarta.mail-1.6.7.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.7.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/jakarta.persistence-api-2.2.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/jakarta.security.enterprise-api-1.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-2.0.0.Final.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/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/transaction/api/main/jboss-transaction-api_1.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/jakarta.validation-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-2.0.2.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/xml/bind/api/main/jboss-jaxb-api_2.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.4_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/jakarta.enterprise.concurrent-1.1.1.jar j2ee.server.type=WildFly jar.compress=false jar.name=j-lawyer-server-entities.jar @@ -54,12 +54,12 @@ javac.classpath=\ ${file.reference.log4j-over-slf4j-1.7.30.jar}:\ ${file.reference.slf4j-api-1.7.30.jar}:\ ${file.reference.log4j-api-2.17.1.jar}:\ - ${file.reference.hibernate-core-5.3.28.Final.jar}:\ ${file.reference.log4j-core-2.17.1.jar}:\ ${file.reference.log4j-slf4j-impl-2.17.1.jar}:\ ${file.reference.picketbox-5.0.3.Final.jar}:\ ${file.reference.jboss-annotations-api_1.3_spec-2.0.1.Final.jar}:\ - ${file.reference.jboss-jaxb-api_2.3_spec-2.0.1.Final.jar} + ${file.reference.jboss-jaxb-api_2.3_spec-2.0.1.Final.jar}:\ + ${file.reference.hibernate-core-5.3.28.Final.jar} javac.debug=true javac.deprecation=false javac.processorpath=\ diff --git a/j-lawyer-server-entities/nbproject/project.xml b/j-lawyer-server-entities/nbproject/project.xml index 41ccdce7e..ed64819e4 100755 --- a/j-lawyer-server-entities/nbproject/project.xml +++ b/j-lawyer-server-entities/nbproject/project.xml @@ -7,6 +7,7 @@ 1.6.5 file.reference.j-lawyer-server-common.jar file.reference.flyway-core-5.2.1.jar + file.reference.hibernate-core-5.3.28.Final.jar diff --git a/j-lawyer-server/j-lawyer-io/lib/jakarta.persistence-api-2.2.3.jar b/j-lawyer-server/j-lawyer-io/lib/jakarta.persistence-api-2.2.3.jar new file mode 100644 index 000000000..9c758cf5c Binary files /dev/null and b/j-lawyer-server/j-lawyer-io/lib/jakarta.persistence-api-2.2.3.jar differ diff --git a/j-lawyer-server/j-lawyer-io/nbproject/genfiles.properties b/j-lawyer-server/j-lawyer-io/nbproject/genfiles.properties index 3e3910431..0b59c4570 100644 --- a/j-lawyer-server/j-lawyer-io/nbproject/genfiles.properties +++ b/j-lawyer-server/j-lawyer-io/nbproject/genfiles.properties @@ -3,7 +3,7 @@ build.xml.script.CRC32=e5830b72 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=26c5fb6c +nbproject/build-impl.xml.data.CRC32=167323f7 nbproject/build-impl.xml.script.CRC32=4439e6de nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.95.0.1 nbproject/rest-build.xml.data.CRC32=e92a8902 diff --git a/j-lawyer-server/j-lawyer-io/nbproject/project.properties b/j-lawyer-server/j-lawyer-io/nbproject/project.properties index 9532a1c90..8b2ef735c 100644 --- a/j-lawyer-server/j-lawyer-io/nbproject/project.properties +++ b/j-lawyer-server/j-lawyer-io/nbproject/project.properties @@ -3,6 +3,12 @@ annotation.processing.enabled.in.editor=true annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css +auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build @@ -28,6 +34,7 @@ dist.war=${dist.dir}/${war.name} endorsed.classpath=\ ${libs.javaee-endorsed-api-7.0.classpath} excludes= +file.reference.jakarta.persistence-api-2.2.3.jar=lib/jakarta.persistence-api-2.2.3.jar file.reference.jboss-client.jar=../lib/jboss-client.jar file.reference.jboss-jaxrs-api_2.1_spec-2.0.2.Final.jar=lib/jboss-jaxrs-api_2.1_spec-2.0.2.Final.jar includes=** @@ -35,7 +42,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/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/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.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/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.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/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.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/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/jws/api/main/jsr181-api-1.0-MR1.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/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.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/persistence/api/main/javax.persistence-api-2.2.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/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/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.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-compat-1.2.6-RC1.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/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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.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/wsdl4j/api/main/wsdl4j-1.6.3.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/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.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/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/jakarta.activation-1.2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/jakarta.enterprise.cdi-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-3.1.0.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/jakarta.inject-api-1.0.5.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/jakarta.json-api-1.1.6.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/jakarta.json.bind-api-1.0.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/mail/api/main/jakarta.mail-1.6.7.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.7.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/jakarta.persistence-api-2.2.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/jakarta.security.enterprise-api-1.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-2.0.0.Final.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/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/transaction/api/main/jboss-transaction-api_1.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/jakarta.validation-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-2.0.2.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/xml/bind/api/main/jboss-jaxb-api_2.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.4_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/jakarta.enterprise.concurrent-1.1.1.jar j2ee.server.type=WildFly jar.compress=false javac.classpath=\ @@ -45,6 +52,7 @@ javac.classpath=\ ${reference.j-lawyer-io-common.jar}:\ ${reference.j-lawyer-server-common.jar}:\ ${file.reference.jboss-client.jar}:\ + ${file.reference.jakarta.persistence-api-2.2.3.jar}:\ ${reference.j-lawyer-server-api.jar} # Space-separated list of extra javac options javac.compilerargs= diff --git a/j-lawyer-server/j-lawyer-io/nbproject/project.xml b/j-lawyer-server/j-lawyer-io/nbproject/project.xml index 86744f47e..f35673a97 100644 --- a/j-lawyer-server/j-lawyer-io/nbproject/project.xml +++ b/j-lawyer-server/j-lawyer-io/nbproject/project.xml @@ -28,6 +28,9 @@ ${file.reference.jboss-client.jar} + + ${file.reference.jakarta.persistence-api-2.2.3.jar} + ${reference.j-lawyer-server-api.jar} WEB-INF/lib diff --git a/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar b/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar index 81b574c7c..d4a8e96a4 100644 Binary files a/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar and b/j-lawyer-server/j-lawyer-server-ejb/lib/j-lawyer-cloud.jar differ diff --git a/j-lawyer-server/j-lawyer-server-ejb/nbproject/project.properties b/j-lawyer-server/j-lawyer-server-ejb/nbproject/project.properties index dfb53ccaa..d77d5a41d 100644 --- a/j-lawyer-server/j-lawyer-server-ejb/nbproject/project.properties +++ b/j-lawyer-server/j-lawyer-server-ejb/nbproject/project.properties @@ -17,7 +17,7 @@ file.reference.poi-excelant-4.1.2.jar=lib/poi/poi-excelant-4.1.2.jar file.reference.poi-ooxml-4.1.2.jar=lib/poi/poi-ooxml-4.1.2.jar file.reference.poi-ooxml-schemas-4.1.2.jar=lib/poi/poi-ooxml-schemas-4.1.2.jar file.reference.poi-scratchpad-4.1.2.jar=lib/poi/poi-scratchpad-4.1.2.jar -j2ee.platform.classpath=${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/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.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/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.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/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.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/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/jws/api/main/jsr181-api-1.0-MR1.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/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.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/persistence/api/main/javax.persistence-api-2.2.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/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/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.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-compat-1.2.6-RC1.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/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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.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/wsdl4j/api/main/wsdl4j-1.6.3.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/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.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/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/jakarta.activation-1.2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/jakarta.enterprise.cdi-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-3.1.0.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/jakarta.inject-api-1.0.5.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/jakarta.json-api-1.1.6.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/jakarta.json.bind-api-1.0.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/mail/api/main/jakarta.mail-1.6.7.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.7.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/jakarta.persistence-api-2.2.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/jakarta.security.enterprise-api-1.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-2.0.0.Final.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/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/transaction/api/main/jboss-transaction-api_1.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/jakarta.validation-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-2.0.2.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/xml/bind/api/main/jboss-jaxb-api_2.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.4_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/jakarta.enterprise.concurrent-1.1.1.jar javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ @@ -106,8 +106,9 @@ javadoc.private=false file.reference.xslt-runner-task-1.2.4-incubating.jar=../lib/xslt-runner-task-1.2.4-incubating.jar file.reference.j-lawyer-drebis-stubs.jar=../../j-lawyer-proprietary/libs/j-lawyer-drebis-stubs.jar javadoc.author=false -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} +endorsed.classpath= +# endorsed.classpath=\ +# ${libs.javaee-endorsed-api-6.0.classpath} reference.j-lawyer-server-common.jar=${project.j-lawyer-server-common}/dist/j-lawyer-server-common.jar file.reference.commons-lang3-3.5.jar=lib/commons-lang3-3.5.jar junit.selected.version=3 @@ -204,7 +205,7 @@ jars.in.ejbjar=false build.classes.excludes=**/*.java,**/*.form,**/.nbattrs file.reference.log4j-slf4j-impl-2.17.1.jar=../lib/log4j-slf4j-impl-2.17.1.jar dist.jar=${dist.dir}/${jar.name} -j2ee.platform=1.6 +j2ee.platform=1.8 project.j-lawyer-server-common=../../j-lawyer-server-common j2ee.server.type=WildFly build.test.classes.dir=${build.dir}/test/classes diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AbstractFacade.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AbstractFacade.java deleted file mode 100644 index 5c6874f03..000000000 --- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/AbstractFacade.java +++ /dev/null @@ -1,721 +0,0 @@ -/* - * 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.services; - -import java.util.List; -import javax.persistence.EntityManager; - -/** - * - * @author jens - */ -public abstract class AbstractFacade { - private Class entityClass; - - public AbstractFacade(Class entityClass) { - this.entityClass = entityClass; - } - - protected abstract EntityManager getEntityManager(); - - public void create(T entity) { - getEntityManager().persist(entity); - } - - public void edit(T entity) { - getEntityManager().merge(entity); - } - - public void remove(T entity) { - getEntityManager().remove(getEntityManager().merge(entity)); - } - - public T find(Object id) { - return getEntityManager().find(entityClass, id); - } - - public List findAll() { - javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(); - cq.select(cq.from(entityClass)); - return getEntityManager().createQuery(cq).getResultList(); - } - - public List findRange(int[] range) { - javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(); - cq.select(cq.from(entityClass)); - javax.persistence.Query q = getEntityManager().createQuery(cq); - q.setMaxResults(range[1] - range[0]); - q.setFirstResult(range[0]); - return q.getResultList(); - } - - public int count() { - javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery(); - javax.persistence.criteria.Root rt = cq.from(entityClass); - cq.select(getEntityManager().getCriteriaBuilder().count(rt)); - javax.persistence.Query q = getEntityManager().createQuery(cq); - return ((Long) q.getSingleResult()).intValue(); - } - -} diff --git a/j-lawyer-server/j-lawyer-server-io/nbproject/genfiles.properties b/j-lawyer-server/j-lawyer-server-io/nbproject/genfiles.properties index e28a93818..ce5879d60 100644 --- a/j-lawyer-server/j-lawyer-server-io/nbproject/genfiles.properties +++ b/j-lawyer-server/j-lawyer-server-io/nbproject/genfiles.properties @@ -1,11 +1,11 @@ build.xml.data.CRC32=81060244 build.xml.script.CRC32=db838f3c -build.xml.stylesheet.CRC32=1707db4f@1.86.0.1 +build.xml.stylesheet.CRC32=1707db4f@1.95.0.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=81060244 nbproject/build-impl.xml.script.CRC32=32615386 -nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1 +nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.95.0.1 nbproject/rest-build.xml.data.CRC32=6ab9c66c nbproject/rest-build.xml.script.CRC32=6f1c1141 nbproject/rest-build.xml.stylesheet.CRC32=0cfeebcc@1.30.1 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 f2b750c8f..da22c6419 100644 --- a/j-lawyer-server/j-lawyer-server-io/nbproject/project.properties +++ b/j-lawyer-server/j-lawyer-server-io/nbproject/project.properties @@ -3,6 +3,12 @@ annotation.processing.enabled.in.editor=true annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css +auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build @@ -39,7 +45,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/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/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.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/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.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/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.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/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/jws/api/main/jsr181-api-1.0-MR1.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/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.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/persistence/api/main/javax.persistence-api-2.2.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/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/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.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-compat-1.2.6-RC1.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/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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.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/wsdl4j/api/main/wsdl4j-1.6.3.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/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.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/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/jakarta.activation-1.2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/jakarta.enterprise.cdi-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-3.1.0.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/jakarta.inject-api-1.0.5.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/jakarta.json-api-1.1.6.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/jakarta.json.bind-api-1.0.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/mail/api/main/jakarta.mail-1.6.7.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.7.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/jakarta.persistence-api-2.2.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/jakarta.security.enterprise-api-1.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-2.0.0.Final.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/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/transaction/api/main/jboss-transaction-api_1.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/jakarta.validation-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-2.0.2.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/xml/bind/api/main/jboss-jaxb-api_2.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.4_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/jakarta.enterprise.concurrent-1.1.1.jar j2ee.server.type=WildFly jar.compress=false javac.classpath=\ 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 05c7d1c31..6c0240a94 100755 --- a/j-lawyer-server/j-lawyer-server-war/nbproject/project.properties +++ b/j-lawyer-server/j-lawyer-server-war/nbproject/project.properties @@ -3,6 +3,12 @@ annotation.processing.enabled.in.editor=true annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css +auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options= +auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false +auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build @@ -23,8 +29,9 @@ dist.dir=dist dist.ear.war=${dist.dir}/${war.ear.name} dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} +endorsed.classpath= +# endorsed.classpath=\ +# ${libs.javaee-endorsed-api-6.0.classpath} excludes= file.reference.commons-logging-1.2.jar=../lib/commons-logging-1.2.jar file.reference.commons-net-3.5.jar=../lib/commons-net-3.5.jar @@ -47,7 +54,7 @@ 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/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/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.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/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.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/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.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/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/jws/api/main/jsr181-api-1.0-MR1.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/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.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/persistence/api/main/javax.persistence-api-2.2.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/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/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.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-compat-1.2.6-RC1.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/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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.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/wsdl4j/api/main/wsdl4j-1.6.3.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/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.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/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/jakarta.activation-1.2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/jakarta.enterprise.cdi-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-3.1.0.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/jakarta.inject-api-1.0.5.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/jakarta.json-api-1.1.6.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/jakarta.json.bind-api-1.0.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/mail/api/main/jakarta.mail-1.6.7.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.7.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/jakarta.persistence-api-2.2.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/jakarta.security.enterprise-api-1.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-2.0.0.Final.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/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/transaction/api/main/jboss-transaction-api_1.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/jakarta.validation-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-2.0.2.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/xml/bind/api/main/jboss-jaxb-api_2.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.4_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/jakarta.enterprise.concurrent-1.1.1.jar j2ee.server.type=WildFly jar.compress=false javac.classpath=\ diff --git a/j-lawyer-server/lib/eclipselink/eclipselink-2.3.0.jar b/j-lawyer-server/lib/eclipselink/eclipselink-2.3.0.jar deleted file mode 100755 index 8bed7ae61..000000000 Binary files a/j-lawyer-server/lib/eclipselink/eclipselink-2.3.0.jar and /dev/null differ diff --git a/j-lawyer-server/lib/eclipselink/javax.persistence-2.0.jar b/j-lawyer-server/lib/eclipselink/javax.persistence-2.0.jar deleted file mode 100755 index dc24d1fef..000000000 Binary files a/j-lawyer-server/lib/eclipselink/javax.persistence-2.0.jar and /dev/null differ diff --git a/j-lawyer-server/lib/eclipselink/org.eclipse.persistence.jpa.jpql_1.0.0.jar b/j-lawyer-server/lib/eclipselink/org.eclipse.persistence.jpa.jpql_1.0.0.jar deleted file mode 100755 index b483de661..000000000 Binary files a/j-lawyer-server/lib/eclipselink/org.eclipse.persistence.jpa.jpql_1.0.0.jar and /dev/null differ diff --git a/j-lawyer-server/lib/javaee-endorsed-api-6.0/javaee6-doc-api.zip b/j-lawyer-server/lib/javaee-endorsed-api-6.0/javaee6-doc-api.zip deleted file mode 100755 index 03fe1ccd0..000000000 Binary files a/j-lawyer-server/lib/javaee-endorsed-api-6.0/javaee6-doc-api.zip and /dev/null differ diff --git a/j-lawyer-server/lib/javaee-endorsed-api-6.0/javax.annotation.jar b/j-lawyer-server/lib/javaee-endorsed-api-6.0/javax.annotation.jar deleted file mode 100755 index ec4b37232..000000000 Binary files a/j-lawyer-server/lib/javaee-endorsed-api-6.0/javax.annotation.jar and /dev/null differ diff --git a/j-lawyer-server/lib/javaee-endorsed-api-6.0/jaxb-api-osgi.jar b/j-lawyer-server/lib/javaee-endorsed-api-6.0/jaxb-api-osgi.jar deleted file mode 100755 index d167e2f62..000000000 Binary files a/j-lawyer-server/lib/javaee-endorsed-api-6.0/jaxb-api-osgi.jar and /dev/null differ diff --git a/j-lawyer-server/lib/javaee-endorsed-api-6.0/webservices-api-osgi.jar b/j-lawyer-server/lib/javaee-endorsed-api-6.0/webservices-api-osgi.jar deleted file mode 100755 index 217424dac..000000000 Binary files a/j-lawyer-server/lib/javaee-endorsed-api-6.0/webservices-api-osgi.jar and /dev/null differ diff --git a/j-lawyer-server/nbproject/genfiles.properties b/j-lawyer-server/nbproject/genfiles.properties index b9fb4aefb..44476175d 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=0ff5882c nbproject/build-impl.xml.script.CRC32=3195aac7 -nbproject/build-impl.xml.stylesheet.CRC32=abdce74a@1.58 +nbproject/build-impl.xml.stylesheet.CRC32=abdce74a@1.72 diff --git a/j-lawyer-server/nbproject/project.properties b/j-lawyer-server/nbproject/project.properties index c49ff8266..e3aabfede 100755 --- a/j-lawyer-server/nbproject/project.properties +++ b/j-lawyer-server/nbproject/project.properties @@ -7,14 +7,15 @@ debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath} display.browser=true dist.dir=dist dist.jar=${dist.dir}/${jar.name} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} +endorsed.classpath= +# endorsed.classpath=\ +# ${libs.javaee-endorsed-api-6.0.classpath} file.reference.j-lawyer-server-common.jar=../j-lawyer-server-common/dist/j-lawyer-server-common.jar 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/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/batch/api/main/jboss-batch-api_1.0_spec-1.0.1.Final.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/el/api/main/jboss-el-api_3.0_spec-1.0.13.Final.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/faces/api/main/jboss-jsf-api_2.3_spec-2.3.9.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/javax.inject-1.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/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/jws/api/main/jsr181-api-1.0-MR1.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/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-1.0.2.Final.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/persistence/api/main/javax.persistence-api-2.2.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/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/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.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-compat-1.2.6-RC1.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/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/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.3.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/wsdl4j/api/main/wsdl4j-1.6.3.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/xml/ws/api/main/jboss-jaxws-api_2.3_spec-1.0.0.Final.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/enterprise/concurrent/main/javax.enterprise.concurrent-1.0.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/json/main/javax.json-1.1.2.jar +j2ee.platform=1.8 +j2ee.platform.classpath=${j2ee.server.home}/modules/system/layers/base/javax/activation/api/main/jakarta.activation-1.2.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/annotation/api/main/jboss-annotations-api_1.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/batch/api/main/jboss-batch-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ejb/api/main/jboss-ejb-api_3.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/el/api/main/jboss-el-api_3.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/api/main/jakarta.enterprise.cdi-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/enterprise/concurrent/api/main/jboss-concurrency-api_1.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/faces/api/main/jboss-jsf-api_2.3_spec-3.1.0.SP01.jar:${j2ee.server.home}/modules/system/layers/base/javax/inject/api/main/jakarta.inject-api-1.0.5.jar:${j2ee.server.home}/modules/system/layers/base/javax/interceptor/api/main/jboss-interceptors-api_1.2_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/jms/api/main/jboss-jms-api_2.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/api/main/jakarta.json-api-1.1.6.jar:${j2ee.server.home}/modules/system/layers/base/javax/json/bind/api/main/jakarta.json.bind-api-1.0.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/mail/api/main/jakarta.mail-1.6.7.jar:${j2ee.server.home}/modules/system/layers/base/javax/management/j2ee/api/main/jboss-j2eemgmt-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/orb/api/main/openjdk-orb-8.1.7.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/persistence/api/main/jakarta.persistence-api-2.2.3.jar:${j2ee.server.home}/modules/system/layers/base/javax/resource/api/main/jboss-connector-api_1.7_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/auth/message/api/main/jboss-jaspi-api_1.1_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/enterprise/api/main/jakarta.security.enterprise-api-1.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/security/jacc/api/main/jboss-jacc-api_1.5_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-2.0.0.Final.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/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/transaction/api/main/jboss-transaction-api_1.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/validation/api/main/jakarta.validation-api-2.0.2.jar:${j2ee.server.home}/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_2.1_spec-2.0.2.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/xml/bind/api/main/jboss-jaxb-api_2.3_spec-2.0.1.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/rpc/api/main/jboss-jaxrpc-api_1.1_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/soap/api/main/jboss-saaj-api_1.4_spec-1.0.2.Final.jar:${j2ee.server.home}/modules/system/layers/base/javax/xml/ws/api/main/jboss-jaxws-api_2.3_spec-2.0.0.Final.jar:${j2ee.server.home}/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/jakarta.enterprise.concurrent-1.1.1.jar j2ee.server.type=WildFly jar.compress=false jar.content.additional=\ @@ -26,8 +27,8 @@ jar.content.additional=\ jar.name=j-lawyer-server.ear javac.debug=true javac.deprecation=false -javac.source=1.6 -javac.target=1.6 +javac.source=1.8 +javac.target=1.8 meta.inf=src/conf no.dependencies=false platform.active=default_platform