Code cleanup
diff --git a/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeployerEjb.java b/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeployerEjb.java
index 6d8b4e1..996dc3a 100755
--- a/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeployerEjb.java
+++ b/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeployerEjb.java
@@ -37,6 +37,7 @@
import javax.naming.NamingException;
import javax.naming.RefAddr;
import javax.servlet.ServletContext;
+import javax.validation.ValidationException;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.ContextResource;
@@ -192,13 +193,13 @@
logger.error("Error while deploying application with real path '" + loc + "' and web context path '" + this.webContextPath + "'", e);
- if (e instanceof javax.validation.ValidationException) {
- throw (javax.validation.ValidationException) e;
+ if (e instanceof ValidationException) {
+ throw (ValidationException) e;
}
if (e instanceof OpenEJBException) {
- if (e.getCause() instanceof javax.validation.ValidationException) {
- throw (javax.validation.ValidationException) e.getCause();
+ if (e.getCause() instanceof ValidationException) {
+ throw (ValidationException) e.getCause();
}
throw (OpenEJBException) e;
}
diff --git a/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeploymentLoader.java b/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeploymentLoader.java
index 521d03d..66859b5 100755
--- a/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeploymentLoader.java
+++ b/org.eclipse.virgo.web.enterprise.appdeployer/src/main/java/org/eclipse/virgo/web/enterprise/openejb/deployer/VirgoDeploymentLoader.java
@@ -23,21 +23,15 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
import javax.servlet.ServletContext;
import org.apache.openejb.ClassLoaderUtil;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.AppModule;
-import org.apache.openejb.config.ClientModule;
-import org.apache.openejb.config.ConnectorModule;
import org.apache.openejb.config.DeploymentLoader;
import org.apache.openejb.config.DeploymentModule;
import org.apache.openejb.config.EjbModule;
diff --git a/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/src/test/java/org/eclipse/virgo/web/enterprise/persistence/openejb/classloading/hook/BundleFileStub.java b/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/src/test/java/org/eclipse/virgo/web/enterprise/persistence/openejb/classloading/hook/BundleFileStub.java
index d9f921e..a1be47c 100755
--- a/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/src/test/java/org/eclipse/virgo/web/enterprise/persistence/openejb/classloading/hook/BundleFileStub.java
+++ b/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/src/test/java/org/eclipse/virgo/web/enterprise/persistence/openejb/classloading/hook/BundleFileStub.java
@@ -15,7 +15,6 @@
import java.io.IOException;
import java.util.Enumeration;
-import org.eclipse.osgi.baseadaptor.BaseData;
import org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry;
import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
diff --git a/org.eclipse.virgo.web.enterprise.services.accessor/src/main/java/org/eclipse/virgo/web/enterprise/services/accessor/VirgoEEBundleComparable.java b/org.eclipse.virgo.web.enterprise.services.accessor/src/main/java/org/eclipse/virgo/web/enterprise/services/accessor/VirgoEEBundleComparable.java
index 493dba0..b78da6a 100755
--- a/org.eclipse.virgo.web.enterprise.services.accessor/src/main/java/org/eclipse/virgo/web/enterprise/services/accessor/VirgoEEBundleComparable.java
+++ b/org.eclipse.virgo.web.enterprise.services.accessor/src/main/java/org/eclipse/virgo/web/enterprise/services/accessor/VirgoEEBundleComparable.java
@@ -1,10 +1,8 @@
package org.eclipse.virgo.web.enterprise.services.accessor;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.Set;
import org.osgi.framework.Bundle;
