Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java Tue Nov 19 02:43:41 2013 @@ -18,6 +18,7 @@ package org.apache.openejb.resource.quar import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.util.LogCategory; +import org.apache.openejb.util.Logger; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; @@ -30,6 +31,7 @@ import org.quartz.listeners.SchedulerLis import javax.resource.ResourceException; import javax.resource.spi.ActivationSpec; import javax.resource.spi.BootstrapContext; +import javax.resource.spi.ResourceAdapter; import javax.resource.spi.ResourceAdapterInternalException; import javax.resource.spi.endpoint.MessageEndpoint; import javax.resource.spi.endpoint.MessageEndpointFactory; @@ -42,7 +44,7 @@ import java.util.concurrent.atomic.Atomi /** * @version $Rev$ $Date$ */ -public class QuartzResourceAdapter implements javax.resource.spi.ResourceAdapter { +public class QuartzResourceAdapter implements ResourceAdapter { public static final String OPENEJB_QUARTZ_TIMEOUT = "openejb.quartz.timeout"; @@ -56,7 +58,7 @@ public class QuartzResourceAdapter imple public void start(final BootstrapContext bootstrapContext) throws ResourceAdapterInternalException { if (null != this.bootstrapContext.getAndSet(bootstrapContext)) { - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("QuartzResourceAdapter is already starting"); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("QuartzResourceAdapter is already starting"); return; } @@ -125,14 +127,14 @@ public class QuartzResourceAdapter imple final Throwable exception = ex.get(); if (null != exception) { final String err = "Error creating Quartz Scheduler"; - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").error(err, exception); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").error(err, exception); throw new ResourceAdapterInternalException(err, exception); } if (started) { - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").info("Started Quartz Scheduler"); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").info("Started Quartz Scheduler"); } else { - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("Failed to start Quartz Scheduler within defined timeout, status unknown"); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("Failed to start Quartz Scheduler within defined timeout, status unknown"); } } @@ -210,7 +212,7 @@ public class QuartzResourceAdapter imple try { //Force a shutdown without waiting for jobs to complete. s.shutdown(false); - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("Forced Quartz stop - Jobs may be incomplete"); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("Forced Quartz stop - Jobs may be incomplete"); } catch (Throwable e) { QuartzResourceAdapter.this.ex.set(e); } @@ -235,9 +237,9 @@ public class QuartzResourceAdapter imple this.bootstrapContext.set(null); if (null != ex.get()) { - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("Error stopping Quartz Scheduler", ex.get()); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").warning("Error stopping Quartz Scheduler", ex.get()); } else { - org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").info("Stopped Quartz Scheduler"); + Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources").info("Stopped Quartz Scheduler"); } }
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletRequest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletRequest.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletRequest.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletRequest.java Tue Nov 19 02:43:41 2013 @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.http.Part; +import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.Principal; @@ -136,7 +137,7 @@ public class ThreadLocalHttpServletReque } @Override - public java.io.BufferedReader getReader() throws IOException { + public BufferedReader getReader() throws IOException { return get().getReader(); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletRequest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletRequest.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletRequest.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletRequest.java Tue Nov 19 02:43:41 2013 @@ -24,6 +24,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletInputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Enumeration; @@ -128,7 +129,7 @@ public class ThreadLocalServletRequest e } @Override - public java.io.BufferedReader getReader() throws IOException { + public BufferedReader getReader() throws IOException { return get().getReader(); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java Tue Nov 19 02:43:41 2013 @@ -23,6 +23,7 @@ import javax.security.auth.login.LoginEx import java.lang.reflect.Method; import java.security.Principal; import java.util.Collections; +import java.util.Properties; import java.util.Set; /** @@ -33,7 +34,7 @@ public class PseudoSecurityService imple PseudoPolicyConfigurationFactory.install(); } - public void init(java.util.Properties props) { + public void init(Properties props) { } public Object login(String user, String pass) throws LoginException { Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/CallerPrincipal.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/CallerPrincipal.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/CallerPrincipal.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/CallerPrincipal.java Tue Nov 19 02:43:41 2013 @@ -16,6 +16,9 @@ */ package org.apache.openejb.spi; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -28,7 +31,7 @@ import static java.lang.annotation.Reten * * @version $Rev$ $Date$ */ [email protected](value = {TYPE}) [email protected](value = RUNTIME) +@Target(value = {TYPE}) +@Retention(value = RUNTIME) public @interface CallerPrincipal { } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java Tue Nov 19 02:43:41 2013 @@ -659,7 +659,7 @@ public final class ApplicationComposers ThreadContext.exit(oldContext); } - System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName()); + System.setProperty(Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName()); System.getProperties().put(OPENEJB_APPLICATION_COMPOSER_CONTEXT, appContext.getGlobalJndiContext()); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java Tue Nov 19 02:43:41 2013 @@ -20,7 +20,9 @@ import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.lang.Object; import java.util.Enumeration; +import java.util.List; import java.util.NoSuchElementException; import java.util.Set; import java.util.Vector; @@ -36,7 +38,7 @@ public final class ArrayEnumeration impl elements.copyInto(this.elements); } - public ArrayEnumeration(java.util.List list) { + public ArrayEnumeration(List list) { this.elements = new Object[list.size()]; list.toArray(this.elements); } @@ -49,11 +51,11 @@ public final class ArrayEnumeration impl public ArrayEnumeration() { } - public java.lang.Object get(int index) { + public Object get(int index) { return elements[index]; } - public void set(int index, java.lang.Object o) { + public void set(int index, Object o) { elements[index] = o; } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java Tue Nov 19 02:43:41 2013 @@ -16,7 +16,9 @@ */ package org.apache.openejb.util; -public class DurationEditor extends java.beans.PropertyEditorSupport { +import java.beans.PropertyEditorSupport; + +public class DurationEditor extends PropertyEditorSupport { public void setAsText(String text) { Duration d = Duration.parse(text); setValue(d); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java Tue Nov 19 02:43:41 2013 @@ -16,10 +16,12 @@ */ package org.apache.openejb.util; +import java.io.Serializable; +import java.util.Enumeration; import java.util.List; import java.util.NoSuchElementException; -public class Enumerator implements java.io.Serializable, java.util.Enumeration { +public class Enumerator implements Serializable, Enumeration { private static final long serialVersionUID = 8382575322402414896L; private final List list; private int index; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java Tue Nov 19 02:43:41 2013 @@ -45,7 +45,7 @@ public class JarExtractor { * @param file Jar file to unpack * @param pathname Context path name for web application * @throws IllegalArgumentException if this is not a "jar:" URL - * @throws java.io.IOException if an input/output error was encountered + * @throws IOException if an input/output error was encountered * during expansion */ public static File extract(final File file, final String pathname) throws IOException { @@ -72,7 +72,7 @@ public class JarExtractor { * * @param file jar file to unpack * @param destinationDir the directory in which the jar will be unpacked; must not exist - * @throws java.io.IOException if an input/output error was encountered during expansion + * @throws IOException if an input/output error was encountered during expansion */ public static File extract(final File file, File destinationDir) throws IOException { if (destinationDir.exists()) { @@ -206,7 +206,7 @@ public class JarExtractor { * @param docBase Document base directory into which we are extracting * @param name Relative pathname of the file to be created * @return A handle to the extracted File - * @throws java.io.IOException if an input/output error occurs + * @throws IOException if an input/output error occurs */ protected static File extract(final InputStream input, final File docBase, final String name) throws IOException { Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Tue Nov 19 02:43:41 2013 @@ -114,8 +114,8 @@ public class JuliLogStreamFactory implem } value.addLogger(rootLogger); Reflections.invokeByReflection(Reflections.get(value, "systemContext"), "addLocalLogger", new Class<?>[] { Logger.class }, new Object[] { rootLogger }); - Reflections.invokeByReflection(java.util.logging.Logger.global, "setLogManager", new Class<?>[] { LogManager.class }, new Object[] { value }); - value.addLogger(java.util.logging.Logger.global); + Reflections.invokeByReflection(Logger.global, "setLogManager", new Class<?>[] { LogManager.class }, new Object[] { value }); + value.addLogger(Logger.global); } catch (final Throwable e) { // no-op } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java Tue Nov 19 02:43:41 2013 @@ -16,6 +16,8 @@ */ package org.apache.openejb.util; +import java.util.EmptyStackException; + public class LinkedListStack implements Stack { private LinkedEntry occupiedEntries; @@ -46,7 +48,7 @@ public class LinkedListStack implements return object; } - public synchronized Object pop() throws java.util.EmptyStackException { + public synchronized Object pop() throws EmptyStackException { /* Take an entry from the occupied list and move it to the vacant list. */ LinkedEntry entry = occupiedEntries; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java Tue Nov 19 02:43:41 2013 @@ -17,12 +17,13 @@ package org.apache.openejb.util; import org.apache.log4j.Level; +import org.apache.log4j.Logger; public class Log4jLogStream implements LogStream { - protected org.apache.log4j.Logger logger; + protected Logger logger; public Log4jLogStream(LogCategory logCategory) { - logger = org.apache.log4j.Logger.getLogger(logCategory.getName()); + logger = Logger.getLogger(logCategory.getName()); } public boolean isFatalEnabled() { Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Tue Nov 19 02:43:41 2013 @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.logging.Level; import java.util.logging.Logger; public class Log4jLogStreamFactory implements LogStreamFactory { @@ -168,7 +169,7 @@ public class Log4jLogStreamFactory imple // TODO Has to be a better way to set the log level final Logger logger = Logger.getLogger("org.apache"); final Logger parent = logger.getParent(); - parent.setLevel(java.util.logging.Level.WARNING); + parent.setLevel(Level.WARNING); } } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java Tue Nov 19 02:43:41 2013 @@ -16,6 +16,7 @@ */ package org.apache.openejb.util; +import org.apache.log4j.Logger; import org.apache.log4j.Priority; import java.io.PrintWriter; @@ -25,12 +26,12 @@ import java.io.PrintWriter; */ public class Log4jPrintWriter extends PrintWriter { private final StringBuffer text = new StringBuffer(""); - private final org.apache.log4j.Logger logger; + private final Logger logger; private final Priority priority; public Log4jPrintWriter(String category, Priority priority) { super(System.err); - logger = org.apache.log4j.Logger.getLogger(category); + logger = Logger.getLogger(category); this.priority = priority; } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java Tue Nov 19 02:43:41 2013 @@ -18,6 +18,7 @@ package org.apache.openejb.util; import org.apache.xbean.finder.ResourceFinder; +import java.io.IOException; import java.io.PrintStream; import java.util.Properties; @@ -39,7 +40,7 @@ public class OpenEjbVersion { try { ResourceFinder finder = new ResourceFinder(); info = finder.findProperties("openejb-version.properties"); - } catch (java.io.IOException e) { + } catch (IOException e) { e.printStackTrace(); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java Tue Nov 19 02:43:41 2013 @@ -18,7 +18,9 @@ package org.apache.openejb.util; import java.io.IOException; import java.io.ObjectInput; +import java.io.ObjectInputStream; import java.io.ObjectOutput; +import java.io.ObjectOutputStream; import java.io.ObjectStreamException; import java.io.Serializable; import java.lang.reflect.Field; @@ -214,11 +216,11 @@ public class PojoSerialization implement this.object = object; } - private void writeObject(java.io.ObjectOutputStream out) throws IOException { + private void writeObject(ObjectOutputStream out) throws IOException { write(out); } - private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { + private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { read(in); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java Tue Nov 19 02:43:41 2013 @@ -38,6 +38,7 @@ import java.util.concurrent.atomic.Atomi import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; +import java.util.logging.Logger; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -128,7 +129,7 @@ public class Pool<T> { scheduler.shutdown(); try { if (!scheduler.awaitTermination(10000, MILLISECONDS)) { - java.util.logging.Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Pool scheduler termination timeout expired"); + Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Pool scheduler termination timeout expired"); } } catch (InterruptedException e) { //Ignore @@ -165,7 +166,7 @@ public class Pool<T> { * @return an entry from the pool or null indicating permission to create and push() an instance into the pool * @throws InterruptedException vm level thread interruption * @throws IllegalStateException if a permit could not be acquired - * @throws java.util.concurrent.TimeoutException + * @throws TimeoutException * if no instance could be obtained within the timeout */ public Entry pop(final long timeout, final TimeUnit unit) throws InterruptedException, TimeoutException { @@ -262,7 +263,7 @@ public class Pool<T> { /** * Never call this method without having successfully called - * {@link #pop(long, java.util.concurrent.TimeUnit)} beforehand. + * {@link #pop(long, TimeUnit)} beforehand. * <p/> * Failure to do so will increase the max pool size by one. * @@ -275,7 +276,7 @@ public class Pool<T> { /** * Never call this method without having successfully called - * {@link #pop(long, java.util.concurrent.TimeUnit)} beforehand. + * {@link #pop(long, TimeUnit)} beforehand. * <p/> * Failure to do so will increase the max pool size by one. * Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java Tue Nov 19 02:43:41 2013 @@ -25,6 +25,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.Stack; /** * @version $Rev$ $Date$ @@ -76,7 +77,7 @@ public class References { Set<Circuit> circuits = new LinkedHashSet<Circuit>(); for (Node node : nodes.values()) { - findCircuits(circuits, node, new java.util.Stack<Node>()); + findCircuits(circuits, node, new Stack<Node>()); } ArrayList<Circuit> list = new ArrayList<Circuit>(circuits); @@ -159,7 +160,7 @@ public class References { return referees; } - private static void findCircuits(Set<Circuit> circuits, Node node, java.util.Stack<Node> stack) { + private static void findCircuits(Set<Circuit> circuits, Node node, Stack<Node> stack) { if (stack.contains(node)) { int fromIndex = stack.indexOf(node); int toIndex = stack.size(); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java Tue Nov 19 02:43:41 2013 @@ -18,6 +18,8 @@ package org.apache.openejb.util; import org.apache.openejb.OpenEJBException; +import java.net.URL; +import java.net.URLClassLoader; import java.util.HashMap; public class SafeToolkit { @@ -61,8 +63,8 @@ public class SafeToolkit { catch (Throwable exception) { exception.printStackTrace(); ClassLoader classLoader = clazz.getClassLoader(); - if (classLoader instanceof java.net.URLClassLoader) { - OpenEJBErrorHandler.classNotIntantiateableFromCodebaseForUnknownReason(systemLocation, clazz.getName(), getCodebase((java.net.URLClassLoader) classLoader), + if (classLoader instanceof URLClassLoader) { + OpenEJBErrorHandler.classNotIntantiateableFromCodebaseForUnknownReason(systemLocation, clazz.getName(), getCodebase((URLClassLoader) classLoader), exception.getClass().getName(), exception.getMessage()); } else { OpenEJBErrorHandler.classNotIntantiateableForUnknownReason(systemLocation, clazz.getName(), exception.getClass().getName(), exception.getMessage()); @@ -72,9 +74,9 @@ public class SafeToolkit { } - private static String getCodebase(java.net.URLClassLoader urlClassLoader) { + private static String getCodebase(URLClassLoader urlClassLoader) { StringBuilder codebase = new StringBuilder(); - java.net.URL urlList[] = urlClassLoader.getURLs(); + URL urlList[] = urlClassLoader.getURLs(); codebase.append(urlList[0].toString()); for (int i = 1; i < urlList.length; ++i) { codebase.append(';'); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java Tue Nov 19 02:43:41 2013 @@ -24,7 +24,7 @@ import java.security.PrivilegedAction; * @version $Rev$ $Date$ */ public class SetAccessible implements PrivilegedAction { - private final java.lang.reflect.AccessibleObject object; + private final AccessibleObject object; public SetAccessible(AccessibleObject object) { this.object = object; Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Stack.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Stack.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Stack.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Stack.java Tue Nov 19 02:43:41 2013 @@ -16,8 +16,10 @@ */ package org.apache.openejb.util; +import java.util.EmptyStackException; + public interface Stack { - Object pop() throws java.util.EmptyStackException; + Object pop() throws EmptyStackException; Object push(Object obj); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java Tue Nov 19 02:43:41 2013 @@ -38,6 +38,7 @@ import java.io.OutputStreamWriter; import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringReader; +import java.lang.System; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -54,7 +55,7 @@ import java.util.Set; * Properties which specifies the default values which are used if the key is not in this Properties. * * @see Hashtable - * @see java.lang.System#getProperties + * @see System#getProperties */ public class SuperProperties extends Properties { Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java Tue Nov 19 02:43:41 2013 @@ -27,6 +27,7 @@ import org.apache.xbean.finder.MetaAnnot import javax.naming.NamingException; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; public class DynamicProxyImplFactory { @@ -37,7 +38,7 @@ public class DynamicProxyImplFactory { || metaClass.getAnnotation(Proxy.class) != null); } - public static Object newProxy(BeanContext context, java.lang.reflect.InvocationHandler invocationHandler) { + public static Object newProxy(BeanContext context, InvocationHandler invocationHandler) { if (QueryProxy.class.isInstance(invocationHandler)) { EntityManager em = null; for (final Injection injection : context.getInjections()) { @@ -72,14 +73,14 @@ public class DynamicProxyImplFactory { return null; } - private static class Handler implements java.lang.reflect.InvocationHandler { - private java.lang.reflect.InvocationHandler handler; + private static class Handler implements InvocationHandler { + private InvocationHandler handler; - private Handler(java.lang.reflect.InvocationHandler handler) { + private Handler(InvocationHandler handler) { this.handler = handler; } - public java.lang.reflect.InvocationHandler realHandler() { + public InvocationHandler realHandler() { return handler; } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java Tue Nov 19 02:43:41 2013 @@ -18,6 +18,7 @@ package org.apache.openejb.util.proxy; import org.apache.openejb.OpenEJBException; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; import java.util.LinkedHashSet; import java.util.Properties; @@ -34,8 +35,8 @@ public class Jdk13ProxyFactory implement public void init(Properties props) throws OpenEJBException { } - public java.lang.reflect.InvocationHandler getInvocationHandler(Object proxy) throws IllegalArgumentException { - return (java.lang.reflect.InvocationHandler) Proxy.getInvocationHandler(proxy); + public InvocationHandler getInvocationHandler(Object proxy) throws IllegalArgumentException { + return (InvocationHandler) Proxy.getInvocationHandler(proxy); } public Class getProxyClass(Class interfce) throws IllegalArgumentException { @@ -60,7 +61,7 @@ public class Jdk13ProxyFactory implement * Returns an instance of a proxy class for the specified interface that dispatches method invocations to * the specified invocation handler. */ - public Object newProxyInstance(Class interfce, java.lang.reflect.InvocationHandler h) throws IllegalArgumentException { + public Object newProxyInstance(Class interfce, InvocationHandler h) throws IllegalArgumentException { try { return Proxy.newProxyInstance(interfce.getClassLoader(), new Class[]{interfce}, h); } catch (IllegalArgumentException iae) { @@ -78,7 +79,7 @@ public class Jdk13ProxyFactory implement * Returns an instance of a proxy class for the specified interface that dispatches method invocations to * the specified invocation handler. */ - public Object newProxyInstance(Class[] interfaces, java.lang.reflect.InvocationHandler handler) throws IllegalArgumentException { + public Object newProxyInstance(Class[] interfaces, InvocationHandler handler) throws IllegalArgumentException { if (interfaces.length < 1) { throw new IllegalArgumentException("It's boring to implement 0 interfaces!"); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java Tue Nov 19 02:43:41 2013 @@ -46,7 +46,7 @@ import java.util.concurrent.locks.Reentr public class LocalBeanProxyFactory implements Opcodes { - public static final java.lang.reflect.InvocationHandler NON_BUSINESS_HANDLER = new NonBusinessHandler(); + public static final InvocationHandler NON_BUSINESS_HANDLER = new NonBusinessHandler(); private static final String BUSSINESS_HANDLER_NAME = "businessHandler"; private static final String NON_BUSINESS_HANDLER_NAME = "nonBusinessHandler"; @@ -77,12 +77,12 @@ public class LocalBeanProxyFactory imple } } - public static java.lang.reflect.InvocationHandler getInvocationHandler(final Object proxy) { + public static InvocationHandler getInvocationHandler(final Object proxy) { try { final Field field = proxy.getClass().getDeclaredField(BUSSINESS_HANDLER_NAME); field.setAccessible(true); try { - return (java.lang.reflect.InvocationHandler) field.get(proxy); + return (InvocationHandler) field.get(proxy); } finally { field.setAccessible(false); } @@ -93,7 +93,7 @@ public class LocalBeanProxyFactory imple } } - public static Object constructProxy(final Class clazz, final java.lang.reflect.InvocationHandler handler) throws IllegalStateException { + public static Object constructProxy(final Class clazz, final InvocationHandler handler) throws IllegalStateException { final Object instance = Unsafe.allocateInstance(clazz); @@ -686,7 +686,7 @@ public class LocalBeanProxyFactory imple } } - static class NonBusinessHandler implements java.lang.reflect.InvocationHandler, Serializable { + static class NonBusinessHandler implements InvocationHandler, Serializable { @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java Tue Nov 19 02:43:41 2013 @@ -18,13 +18,14 @@ package org.apache.openejb.util.proxy; import org.apache.openejb.OpenEJBException; +import java.lang.reflect.InvocationHandler; import java.util.Properties; public interface ProxyFactory { void init(Properties props) throws OpenEJBException; - java.lang.reflect.InvocationHandler getInvocationHandler(Object proxy) throws IllegalArgumentException; + InvocationHandler getInvocationHandler(Object proxy) throws IllegalArgumentException; Class getProxyClass(Class interfce) throws IllegalArgumentException; @@ -39,13 +40,13 @@ public interface ProxyFactory { * Returns an instance of a proxy class for the specified interface that dispatches method invocations to * the specified invocation handler. */ - Object newProxyInstance(Class interfce, java.lang.reflect.InvocationHandler h) throws IllegalArgumentException; + Object newProxyInstance(Class interfce, InvocationHandler h) throws IllegalArgumentException; /* * Returns an instance of a proxy class for the specified interface that dispatches method invocations to * the specified invocation handler. */ - Object newProxyInstance(Class[] interfaces, java.lang.reflect.InvocationHandler h) throws IllegalArgumentException; + Object newProxyInstance(Class[] interfaces, InvocationHandler h) throws IllegalArgumentException; } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java Tue Nov 19 02:43:41 2013 @@ -16,6 +16,7 @@ */ package org.apache.openejb.util.proxy; +import java.lang.reflect.InvocationHandler; import java.util.HashMap; public class ProxyManager { @@ -59,7 +60,7 @@ public class ProxyManager { return defaultFactoryName; } - public static java.lang.reflect.InvocationHandler getInvocationHandler(Object proxy) { + public static InvocationHandler getInvocationHandler(Object proxy) { if (LocalBeanProxyFactory.isProxy(proxy.getClass())) { return LocalBeanProxyFactory.getInvocationHandler(proxy); } @@ -76,11 +77,11 @@ public class ProxyManager { return defaultFactory.getProxyClass(interfaces); } - public static Object newProxyInstance(Class interfaceType, java.lang.reflect.InvocationHandler h) throws IllegalAccessException { + public static Object newProxyInstance(Class interfaceType, InvocationHandler h) throws IllegalAccessException { return newProxyInstance(new Class[]{interfaceType}, h); } - public static Object newProxyInstance(Class[] interfaces, java.lang.reflect.InvocationHandler h) throws IllegalAccessException { + public static Object newProxyInstance(Class[] interfaces, InvocationHandler h) throws IllegalAccessException { checkDefaultFactory(); return defaultFactory.newProxyInstance(interfaces, h); } Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java Tue Nov 19 02:43:41 2013 @@ -33,6 +33,7 @@ import javax.persistence.criteria.Predic import javax.persistence.criteria.Root; import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.SingularAttribute; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -43,7 +44,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -public class QueryProxy implements java.lang.reflect.InvocationHandler { +public class QueryProxy implements InvocationHandler { private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, QueryProxy.class); // keywords Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java?rev=1543294&r1=1543293&r2=1543294&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java Tue Nov 19 02:43:41 2013 @@ -16,12 +16,18 @@ */ package org.apache.openejb.util.urlhandler.resource; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.security.AccessController; +import java.security.PrivilegedAction; -public class Handler extends java.net.URLStreamHandler { +public class Handler extends URLStreamHandler { - protected URLConnection openConnection(URL url) throws java.io.IOException { + protected URLConnection openConnection(URL url) throws IOException { String cln = url.getHost(); String resrce = url.getFile().substring(1); @@ -36,27 +42,27 @@ public class Handler extends java.net.UR clz = Class.forName(cln, true, cl); } catch (ClassNotFoundException ex) { - throw (java.io.IOException)new java.net.MalformedURLException("Class " + cln + " cannot be found (" + ex + ")").initCause(ex); + throw (IOException)new MalformedURLException("Class " + cln + " cannot be found (" + ex + ")").initCause(ex); } realURL = cl.getResource(resrce); if (realURL == null) - throw new java.io.FileNotFoundException("Class resource " + resrce + " of class " + cln + " cannot be found"); + throw new FileNotFoundException("Class resource " + resrce + " of class " + cln + " cannot be found"); } else { ClassLoader cl = getContextClassLoader(); realURL = cl.getResource(resrce); if (realURL == null) - throw new java.io.FileNotFoundException("System resource " + resrce + " cannot be found"); + throw new FileNotFoundException("System resource " + resrce + " cannot be found"); } return realURL.openConnection(); } public static ClassLoader getContextClassLoader() { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + return (ClassLoader) AccessController.doPrivileged( + new PrivilegedAction() { public Object run() { return Thread.currentThread().getContextClassLoader(); }
