diff --git a/hsarback/.classpath b/hsarback/.classpath
index 2c40f2b..17ccb58 100644
--- a/hsarback/.classpath
+++ b/hsarback/.classpath
@@ -3,33 +3,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/hsarback/lib/activemq-core-5.4.2.jar b/hsarback/lib/activemq-core-5.4.2.jar
deleted file mode 100644
index a077a5d..0000000
Binary files a/hsarback/lib/activemq-core-5.4.2.jar and /dev/null differ
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-codec-1.3.jar b/hsarback/lib/commons-codec-1.3.jar
deleted file mode 100644
index 957b675..0000000
Binary files a/hsarback/lib/commons-codec-1.3.jar and /dev/null differ
diff --git a/hsarback/lib/commons-codec-1.7.jar b/hsarback/lib/commons-codec-1.7.jar
new file mode 100644
index 0000000..efa7f72
Binary files /dev/null and b/hsarback/lib/commons-codec-1.7.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-dbcp-1.4.jar b/hsarback/lib/commons-dbcp-1.4.jar
deleted file mode 100644
index c4c1c4f..0000000
Binary files a/hsarback/lib/commons-dbcp-1.4.jar and /dev/null differ
diff --git a/hsarback/lib/commons-httpclient-3.1.jar b/hsarback/lib/commons-httpclient-3.1.jar
deleted file mode 100644
index 7c59774..0000000
Binary files a/hsarback/lib/commons-httpclient-3.1.jar and /dev/null 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-api-1.1.1.jar b/hsarback/lib/commons-logging-api-1.1.1.jar
deleted file mode 100644
index 624ad36..0000000
Binary files a/hsarback/lib/commons-logging-api-1.1.1.jar and /dev/null differ
diff --git a/hsarback/lib/commons-net-3.2.jar b/hsarback/lib/commons-net-3.2.jar
new file mode 100644
index 0000000..ad10675
Binary files /dev/null and b/hsarback/lib/commons-net-3.2.jar differ
diff --git a/hsarback/lib/commons-net2-2.0.jar b/hsarback/lib/commons-net2-2.0.jar
deleted file mode 100644
index b65bfb7..0000000
Binary files a/hsarback/lib/commons-net2-2.0.jar and /dev/null 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/geronimo-j2ee-management_1.1_spec-1.0.1.jar b/hsarback/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
deleted file mode 100644
index 0701ae0..0000000
Binary files a/hsarback/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar and /dev/null differ
diff --git a/hsarback/lib/geronimo-jms_1.1_spec-1.1.1.jar b/hsarback/lib/geronimo-jms_1.1_spec-1.1.1.jar
deleted file mode 100644
index 4f5e646..0000000
Binary files a/hsarback/lib/geronimo-jms_1.1_spec-1.1.1.jar and /dev/null differ
diff --git a/hsarback/lib/geronimo-jpa_2.0_spec-1.1.jar b/hsarback/lib/geronimo-jpa_2.0_spec-1.1.jar
deleted file mode 100644
index f151ca2..0000000
Binary files a/hsarback/lib/geronimo-jpa_2.0_spec-1.1.jar and /dev/null differ
diff --git a/hsarback/lib/geronimo-jta_1.1_spec-1.1.1.jar b/hsarback/lib/geronimo-jta_1.1_spec-1.1.1.jar
deleted file mode 100644
index ee9963d..0000000
Binary files a/hsarback/lib/geronimo-jta_1.1_spec-1.1.1.jar and /dev/null differ
diff --git a/hsarback/lib/geronimo-validation_1.0_spec-1.1.jar b/hsarback/lib/geronimo-validation_1.0_spec-1.1.jar
deleted file mode 100644
index 6a3a6b8..0000000
Binary files a/hsarback/lib/geronimo-validation_1.0_spec-1.1.jar and /dev/null differ
diff --git a/hsarback/lib/javaee-api-6.0-5-tomcat.jar b/hsarback/lib/javaee-api-6.0-5-tomcat.jar
new file mode 100644
index 0000000..4531165
Binary files /dev/null and b/hsarback/lib/javaee-api-6.0-5-tomcat.jar differ
diff --git a/hsarback/lib/mail.jar b/hsarback/lib/mail.jar
deleted file mode 100644
index d972ec8..0000000
Binary files a/hsarback/lib/mail.jar and /dev/null 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/org.apache.bval.bundle-0.2-incubating.jar b/hsarback/lib/org.apache.bval.bundle-0.2-incubating.jar
deleted file mode 100644
index 5d76fa6..0000000
Binary files a/hsarback/lib/org.apache.bval.bundle-0.2-incubating.jar and /dev/null 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/servlet-api-2.4.jar b/hsarback/lib/servlet-api-2.4.jar
deleted file mode 100644
index 16316ea..0000000
Binary files a/hsarback/lib/servlet-api-2.4.jar and /dev/null differ
diff --git a/hsarback/lib/servlet-api.jar b/hsarback/lib/servlet-api.jar
new file mode 100644
index 0000000..c6273b9
Binary files /dev/null and b/hsarback/lib/servlet-api.jar differ
diff --git a/hsarback/src/de/hsadmin/core/model/Transaction.java b/hsarback/src/de/hsadmin/core/model/Transaction.java
index 317f3ed..1edcee6 100644
--- a/hsarback/src/de/hsadmin/core/model/Transaction.java
+++ b/hsarback/src/de/hsadmin/core/model/Transaction.java
@@ -15,8 +15,6 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
import de.hsadmin.cliClientConnector.TechnicalException;
import de.hsadmin.core.qserv.QueueClient;
import de.hsadmin.core.qserv.QueueTask;
@@ -143,16 +141,8 @@ public class Transaction {
entityManager.close();
}
- /**
- * Detach entities from hibernate session.
- * Used to detach entities before update. Makes it possible to compare
- * old and new attribute values.
- */
public void detach(AbstractEntity entity) {
- if (entityManager instanceof OpenJPAEntityManager) {
- OpenJPAEntityManager openjpaEM = (OpenJPAEntityManager) entityManager;
- openjpaEM.detach(entity);
- }
+ entityManager.detach(entity);
}
class QueueTaskStore {
diff --git a/hsarweb/.classpath b/hsarweb/.classpath
index d759f69..2338b82 100644
--- a/hsarweb/.classpath
+++ b/hsarweb/.classpath
@@ -7,7 +7,7 @@
-
+