jars from tomee

hsarback/.classpath

@@ -3,33 +3,17 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/activemq-core-5.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-dbcp-1.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-net2-2.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-	<classpathentry kind="lib" path="lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/geronimo-jpa_2.0_spec-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/geronimo-jta_1.1_spec-1.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/geronimo-validation_1.0_spec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/jpwgen-1.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/mail.jar"/>
-	<classpathentry kind="lib" path="lib/openjpa-2.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/org.apache.bval.bundle-0.2-incubating.jar"/>
-	<classpathentry kind="lib" path="lib/serp-1.13.1.jar"/>
-	<classpathentry kind="lib" path="lib/servlet-api-2.4.jar"/>
 	<classpathentry kind="lib" path="lib/ws-commons-util-1.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/xmlrpc-client-3.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/xmlrpc-common-3.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/xmlrpc-server-3.1.3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/velocity-1.7.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-api-1.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/javaee-api-6.0-5-tomcat.jar"/>
+	<classpathentry kind="lib" path="lib/commons-net-3.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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) {
+		entityManager.detach(entity);
-			OpenJPAEntityManager openjpaEM = (OpenJPAEntityManager) entityManager;
-			openjpaEM.detach(entity);
-		}
 	}
 
 	class QueueTaskStore {

hsarweb/.classpath

@@ -7,7 +7,7 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/ws-commons-util-1.0.2.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlrpc-client-3.1.3.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlrpc-common-3.1.3.jar"/>
-	<classpathentry kind="lib" path="/hsarback/lib/servlet-api-2.4.jar"/>
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/vaadin-6.8.7.jar"/>
+	<classpathentry kind="lib" path="/hsarback/lib/servlet-api.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>