diff --git a/hsarback/build.xml b/hsarback/build.xml index d5a5cb1..8c74c09 100644 --- a/hsarback/build.xml +++ b/hsarback/build.xml @@ -89,7 +89,7 @@ @@ -101,7 +101,7 @@ diff --git a/hsarback/lib/commons-beanutils-1.8.3.jar b/hsarback/lib/commons-beanutils-1.8.3.jar deleted file mode 100644 index 218510b..0000000 Binary files a/hsarback/lib/commons-beanutils-1.8.3.jar and /dev/null differ diff --git a/hsarback/lib/commons-beanutils-1.9.2.jar b/hsarback/lib/commons-beanutils-1.9.2.jar new file mode 100644 index 0000000..7d075ed Binary files /dev/null and b/hsarback/lib/commons-beanutils-1.9.2.jar differ diff --git a/hsarback/lib/commons-collections-3.2.1.jar b/hsarback/lib/commons-collections-3.2.1.jar deleted file mode 100644 index c35fa1f..0000000 Binary files a/hsarback/lib/commons-collections-3.2.1.jar and /dev/null differ diff --git a/hsarback/lib/commons-collections-3.2.2.jar b/hsarback/lib/commons-collections-3.2.2.jar new file mode 100644 index 0000000..fa5df82 Binary files /dev/null and b/hsarback/lib/commons-collections-3.2.2.jar differ diff --git a/hsarback/lib/commons-lang-2.4.jar b/hsarback/lib/commons-lang-2.4.jar deleted file mode 100644 index 532939e..0000000 Binary files a/hsarback/lib/commons-lang-2.4.jar and /dev/null differ diff --git a/hsarback/lib/commons-lang-2.6.jar b/hsarback/lib/commons-lang-2.6.jar new file mode 100644 index 0000000..98467d3 Binary files /dev/null and b/hsarback/lib/commons-lang-2.6.jar differ diff --git a/hsarback/lib/commons-logging-1.1.1.jar b/hsarback/lib/commons-logging-1.1.1.jar deleted file mode 100644 index e40f8f1..0000000 Binary files a/hsarback/lib/commons-logging-1.1.1.jar and /dev/null differ diff --git a/hsarback/lib/commons-logging-1.2.jar b/hsarback/lib/commons-logging-1.2.jar new file mode 100644 index 0000000..93a3b9f Binary files /dev/null and b/hsarback/lib/commons-logging-1.2.jar differ diff --git a/hsarback/lib/commons-pool-1.5.4.jar b/hsarback/lib/commons-pool-1.5.4.jar deleted file mode 100644 index 43edf99..0000000 Binary files a/hsarback/lib/commons-pool-1.5.4.jar and /dev/null differ diff --git a/hsarback/lib/commons-pool-1.6.jar b/hsarback/lib/commons-pool-1.6.jar new file mode 100644 index 0000000..72ca75a Binary files /dev/null and b/hsarback/lib/commons-pool-1.6.jar differ diff --git a/hsarback/lib/hsadmin-util-4.0.1-SNAPSHOT.jar b/hsarback/lib/hsadmin-util-4.0.1-SNAPSHOT.jar index 4ee364f..6b69012 100644 Binary files a/hsarback/lib/hsadmin-util-4.0.1-SNAPSHOT.jar and b/hsarback/lib/hsadmin-util-4.0.1-SNAPSHOT.jar differ diff --git a/hsarback/lib/openjpa-2.1.1.jar b/hsarback/lib/openjpa-2.1.1.jar deleted file mode 100644 index ba14cba..0000000 Binary files a/hsarback/lib/openjpa-2.1.1.jar and /dev/null differ diff --git a/hsarback/lib/openjpa-2.4.3.jar b/hsarback/lib/openjpa-2.4.3.jar new file mode 100644 index 0000000..646ecbf Binary files /dev/null and b/hsarback/lib/openjpa-2.4.3.jar differ diff --git a/hsarback/lib/org.apache.bval.bundle-0.5.jar b/hsarback/lib/org.apache.bval.bundle-0.5.jar new file mode 100644 index 0000000..798fa58 Binary files /dev/null and b/hsarback/lib/org.apache.bval.bundle-0.5.jar differ diff --git a/hsarback/lib/serp-1.13.1.jar b/hsarback/lib/serp-1.13.1.jar deleted file mode 100644 index 0f7fd7b..0000000 Binary files a/hsarback/lib/serp-1.13.1.jar and /dev/null differ diff --git a/hsarback/lib/serp-1.15.1.jar b/hsarback/lib/serp-1.15.1.jar new file mode 100644 index 0000000..6a33923 Binary files /dev/null and b/hsarback/lib/serp-1.15.1.jar differ diff --git a/hsarback/lib/xbean-asm6-shaded-4.8.jar b/hsarback/lib/xbean-asm6-shaded-4.8.jar new file mode 100644 index 0000000..792fe6c Binary files /dev/null and b/hsarback/lib/xbean-asm6-shaded-4.8.jar differ diff --git a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java index 7ad4f56..1c9f675 100644 --- a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java +++ b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; +import javax.annotation.processing.SupportedSourceVersion; import javax.persistence.EntityManager; import javax.persistence.Query; import javax.servlet.ServletException; @@ -137,7 +138,6 @@ public class JsonPillarServlet extends HttpServlet { } writer.println(" \"domain\": \"" + domName + "\""); writer.println(" , \"opts\": {"); - writer.println(" \"letsencrypt\": \"" + domainOpts.get("letsencrypt").toString().toLowerCase() + "\""); firstLoop = true; for (final SelectableValue val : domainOptionValues.get()) { if (firstLoop) {