--- a/src/main/java/de/intevation/lada/exporter/laf/LafCreator.java	Fri May 29 11:48:04 2015 +0200
+++ b/src/main/java/de/intevation/lada/exporter/laf/LafCreator.java	Fri May 29 13:08:41 2015 +0200
@@ -13,7 +13,6 @@
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.persistence.Query;
 
 import de.intevation.lada.exporter.Creator;
 import de.intevation.lada.model.land.LKommentarM;

--- a/src/main/java/de/intevation/lada/importer/laf/AttributeMapper.java	Fri May 29 11:48:04 2015 +0200
+++ b/src/main/java/de/intevation/lada/importer/laf/AttributeMapper.java	Fri May 29 13:08:41 2015 +0200
@@ -18,7 +18,6 @@
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
-import javax.persistence.Query;
 
 import de.intevation.lada.importer.ReportItem;
 import de.intevation.lada.model.land.LKommentarM;

--- a/src/main/java/de/intevation/lada/model/stamm/DeVg.java	Fri May 29 11:48:04 2015 +0200
+++ b/src/main/java/de/intevation/lada/model/stamm/DeVg.java	Fri May 29 13:08:41 2015 +0200
@@ -20,7 +20,6 @@
 
 import org.hibernate.annotations.Type;
 
-import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.MultiPolygon;
 
 

--- a/src/main/java/de/intevation/lada/model/stamm/Deskriptoren.java	Fri May 29 11:48:04 2015 +0200
+++ b/src/main/java/de/intevation/lada/model/stamm/Deskriptoren.java	Fri May 29 13:08:41 2015 +0200
@@ -8,14 +8,10 @@
 package de.intevation.lada.model.stamm;
 
 import java.io.Serializable;
-import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 
@@ -42,12 +38,6 @@
     private Integer sn;
 
     private Integer vorgaenger;
-//    @ManyToOne
-//    @JoinColumn(name="vorgaenger")
-//    private Deskriptoren deskriptoren;
-
-//    @OneToMany(mappedBy="deskriptoren")
-//    private List<Deskriptoren> deskriptorens;
 
     public Deskriptoren() {
     }

--- a/src/main/java/de/intevation/lada/util/auth/OpenIDFilter.java	Fri May 29 11:48:04 2015 +0200
+++ b/src/main/java/de/intevation/lada/util/auth/OpenIDFilter.java	Fri May 29 13:08:41 2015 +0200
@@ -8,46 +8,40 @@
 
 package de.intevation.lada.util.auth;
 
-import org.apache.log4j.Logger;
-
-import java.util.Map;
-import java.util.List;
-import java.util.LinkedHashMap;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLDecoder;
 import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-import java.util.Enumeration;
-
-import java.io.InputStream;
-import java.io.IOException;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpSession;
 
-import org.openid4java.association.AssociationSessionType;
+import org.apache.log4j.Logger;
 import org.openid4java.association.AssociationException;
+import org.openid4java.association.AssociationSessionType;
+import org.openid4java.consumer.AbstractNonceVerifier;
+import org.openid4java.consumer.ConsumerException;
 import org.openid4java.consumer.ConsumerManager;
-import org.openid4java.consumer.ConsumerException;
 import org.openid4java.consumer.InMemoryConsumerAssociationStore;
-import org.openid4java.consumer.AbstractNonceVerifier;
-import org.openid4java.message.ParameterList;
 import org.openid4java.consumer.VerificationResult;
+import org.openid4java.discovery.DiscoveryException;
 import org.openid4java.discovery.DiscoveryInformation;
 import org.openid4java.discovery.Identifier;
-import org.openid4java.discovery.DiscoveryException;
-import org.openid4java.message.MessageException;
 import org.openid4java.message.AuthRequest;
 import org.openid4java.message.AuthSuccess;
+import org.openid4java.message.MessageException;
+import org.openid4java.message.ParameterList;
 import org.openid4java.message.ax.AxMessage;
 import org.openid4java.message.ax.FetchRequest;
 import org.openid4java.message.ax.FetchResponse;
@@ -105,7 +99,7 @@
 
     private boolean discoverServer() {
         /* Perform discovery on the configured providerUrl */
-        List discoveries = null;
+        List<?> discoveries = null;
         try {
             discoveries = manager.discover(providerUrl);
         } catch (DiscoveryException e) {