You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/19 03:43:45 UTC
svn commit: r1543294 [3/4] - in
/tomee/tomee/trunk/container/openejb-core/src/main/java: javax/xml/ws/
javax/xml/ws/wsaddressing/ org/apache/openejb/
org/apache/openejb/assembler/ org/apache/openejb/assembler/classic/
org/apache/openejb/assembler/class...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java Tue Nov 19 02:43:41 2013
@@ -23,6 +23,7 @@ import org.apache.openejb.SystemExceptio
import org.apache.openejb.core.JndiFactory;
import javax.naming.Context;
+import javax.naming.NamingException;
import java.util.Map;
/**
@@ -39,7 +40,7 @@ public class IvmJndiFactory implements J
jndiRootContext.bind("openejb/client/.", "");
jndiRootContext.bind("openejb/Deployment/.", "");
jndiRootContext.bind("openejb/global/.", "");
- } catch (javax.naming.NamingException e) {
+ } catch (NamingException e) {
throw new OpenEJBRuntimeException("this should not happen", e);
}
}
@@ -48,8 +49,8 @@ public class IvmJndiFactory implements J
IvmContext context = new IvmContext();
try {
context.bind("java:comp/env/dummy", "dummy");
- } catch (javax.naming.NamingException e) {
- throw new org.apache.openejb.SystemException("Unable to create subcontext 'java:comp/env'. Exception:"+e.getMessage(),e);
+ } catch (NamingException e) {
+ throw new SystemException("Unable to create subcontext 'java:comp/env'. Exception:"+e.getMessage(),e);
}
for (Map.Entry<String, Object> entry: bindings.entrySet()) {
String name = entry.getKey();
@@ -58,8 +59,8 @@ public class IvmJndiFactory implements J
try {
context.bind(name, value);
- } catch (javax.naming.NamingException e) {
- throw new org.apache.openejb.SystemException("Unable to bind '" + name + "' into bean's enc.", e);
+ } catch (NamingException e) {
+ throw new SystemException("Unable to bind '" + name + "' into bean's enc.", e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java Tue Nov 19 02:43:41 2013
@@ -69,7 +69,7 @@ public class JaxWsServiceReference exten
this.injections = injections;
}
- public Object getObject() throws javax.naming.NamingException {
+ public Object getObject() throws NamingException {
String referenceClassName = referenceClass != null ? referenceClass.getName() : null;
Set<PortAddress> portAddresses = getPortAddressRegistry().getPorts(id, serviceQName, referenceClassName);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,12 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.BeanContext;
import org.apache.openejb.core.ThreadContext;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import java.io.InvalidObjectException;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
/*
This class is used as a replacement when a IvmContext referenced by a stateful bean
is being serialized for passivation along with the bean. It ensures that the entire
@@ -29,7 +35,7 @@ import org.apache.openejb.core.ThreadCon
this object.
*/
-public class JndiEncArtifact implements java.io.Serializable {
+public class JndiEncArtifact implements Serializable {
String path = new String();
public JndiEncArtifact(IvmContext context) {
@@ -40,17 +46,17 @@ public class JndiEncArtifact implements
} while (node != null);
}
- public Object readResolve() throws java.io.ObjectStreamException {
+ public Object readResolve() throws ObjectStreamException {
ThreadContext thrdCntx = ThreadContext.getThreadContext();
BeanContext deployment = thrdCntx.getBeanContext();
- javax.naming.Context cntx = deployment.getJndiEnc();
+ Context cntx = deployment.getJndiEnc();
try {
Object obj = cntx.lookup(path);
if (obj == null)
- throw new java.io.InvalidObjectException("JNDI ENC context reference could not be properly resolved when bean instance was activated");
+ throw new InvalidObjectException("JNDI ENC context reference could not be properly resolved when bean instance was activated");
return obj;
- } catch (javax.naming.NamingException e) {
- throw (java.io.InvalidObjectException)new java.io.InvalidObjectException("JNDI ENC context reference could not be properly resolved due to a JNDI exception, when bean instance was activated").initCause(e);
+ } catch (NamingException e) {
+ throw (InvalidObjectException)new InvalidObjectException("JNDI ENC context reference could not be properly resolved due to a JNDI exception, when bean instance was activated").initCause(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java Tue Nov 19 02:43:41 2013
@@ -36,7 +36,7 @@ public class JndiReference extends Refer
* some other JNDI name space. The context is provided and the lookup name, but the
* object is not resolved until it's requested.
*/
- public JndiReference(javax.naming.Context linkedContext, String jndiName) {
+ public JndiReference(Context linkedContext, String jndiName) {
this.context = linkedContext;
this.jndiName = jndiName;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java Tue Nov 19 02:43:41 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.core.ivm.naming;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
public class JndiUrlReference extends Reference {
private String jndiName;
@@ -25,7 +26,7 @@ public class JndiUrlReference extends Re
this.jndiName = jndiName;
}
- public Object getObject() throws javax.naming.NamingException {
+ public Object getObject() throws NamingException {
return new InitialContext().lookup(jndiName);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java Tue Nov 19 02:43:41 2013
@@ -19,11 +19,14 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.OpenEJBRuntimeException;
import javax.naming.Context;
+import javax.naming.NameAlreadyBoundException;
import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
import java.io.PrintStream;
+import java.io.Serializable;
import java.util.ArrayList;
-public class NameNode implements java.io.Serializable {
+public class NameNode implements Serializable {
private final String atomicName;
private final int atomicHash;
private NameNode lessTree;
@@ -63,9 +66,9 @@ public class NameNode implements java.io
}
}
- public Object resolve(ParsedName name) throws javax.naming.NameNotFoundException {
+ public Object resolve(ParsedName name) throws NameNotFoundException {
int compareResult = name.compareTo(atomicHash);
- javax.naming.NameNotFoundException n = null;
+ NameNotFoundException n = null;
int pos = name.getPos();
if (compareResult == ParsedName.IS_EQUAL && name.getComponent().equals(atomicName)) {
// hashcodes and String valuse are equal
@@ -107,7 +110,7 @@ public class NameNode implements java.io
} else {
return o;
}
- } catch (javax.naming.NamingException e) {
+ } catch (NamingException e) {
//ignore
}
}
@@ -117,15 +120,15 @@ public class NameNode implements java.io
}
}
if (n != null) throw n;
- throw new javax.naming.NameNotFoundException("Cannot resolve " + name);
+ throw new NameNotFoundException("Cannot resolve " + name);
}
- public void bind(ParsedName name, Object obj) throws javax.naming.NameAlreadyBoundException {
+ public void bind(ParsedName name, Object obj) throws NameAlreadyBoundException {
int compareResult = name.compareTo(atomicHash);
if (compareResult == ParsedName.IS_EQUAL && name.getComponent().equals(atomicName)) {
if (name.next()) {
if (myObject != null && !(myObject instanceof Federation)) {
- throw new javax.naming.NameAlreadyBoundException();
+ throw new NameAlreadyBoundException();
}
if (subTree == null)
subTree = new NameNode(this, name, obj, this);
@@ -135,7 +138,7 @@ public class NameNode implements java.io
if (obj instanceof Context) {
if (myObject != null) {
if (!(myObject instanceof Federation)) {
- throw new javax.naming.NameAlreadyBoundException(name.toString());
+ throw new NameAlreadyBoundException(name.toString());
}
} else {
myObject = new Federation();
@@ -143,10 +146,10 @@ public class NameNode implements java.io
((Federation)myObject).add((Context) obj);
} else {
if (subTree != null) {
- throw new javax.naming.NameAlreadyBoundException(name.toString());
+ throw new NameAlreadyBoundException(name.toString());
}
if (myObject != null) {
- throw new javax.naming.NameAlreadyBoundException(name.toString());
+ throw new NameAlreadyBoundException(name.toString());
}
unbound = false;
myObject = obj;// bind the object to this node
@@ -233,7 +236,7 @@ public class NameNode implements java.io
}
}
- public void unbind(ParsedName name) throws javax.naming.NameAlreadyBoundException {
+ public void unbind(ParsedName name) throws NameAlreadyBoundException {
int compareResult = name.compareTo(atomicHash);
if (compareResult == ParsedName.IS_EQUAL && name.getComponent().equals(atomicName)) {
if (name.next()) {
@@ -328,13 +331,13 @@ public class NameNode implements java.io
}
}
- public IvmContext createSubcontext(ParsedName name) throws javax.naming.NameAlreadyBoundException {
+ public IvmContext createSubcontext(ParsedName name) throws NameAlreadyBoundException {
try {
bind(name, null);
name.reset();
return (IvmContext) resolve(name);
}
- catch (javax.naming.NameNotFoundException exception) {
+ catch (NameNotFoundException exception) {
exception.printStackTrace();
throw new OpenEJBRuntimeException(exception);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java Tue Nov 19 02:43:41 2013
@@ -16,17 +16,22 @@
*/
package org.apache.openejb.core.ivm.naming;
+import org.apache.openejb.OpenEJBException;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
public class NamingException extends javax.naming.NamingException {
- private org.apache.openejb.OpenEJBException delegate;
+ private OpenEJBException delegate;
- public NamingException(String message, org.apache.openejb.OpenEJBException delegateArg) {
+ public NamingException(String message, OpenEJBException delegateArg) {
super();
delegate = delegateArg;
}
public NamingException(String message, Throwable rootCause) {
super();
- delegate = new org.apache.openejb.OpenEJBException(message, rootCause);
+ delegate = new OpenEJBException(message, rootCause);
}
public String getMessage() {
@@ -37,11 +42,11 @@ public class NamingException extends jav
delegate.printStackTrace();
}
- public void printStackTrace(java.io.PrintStream stream) {
+ public void printStackTrace(PrintStream stream) {
delegate.printStackTrace(stream);
}
- public void printStackTrace(java.io.PrintWriter writer) {
+ public void printStackTrace(PrintWriter writer) {
delegate.printStackTrace(writer);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java Tue Nov 19 02:43:41 2013
@@ -16,7 +16,10 @@
*/
package org.apache.openejb.core.ivm.naming;
-public class ParsedName implements java.io.Serializable {
+import java.io.Serializable;
+import java.util.StringTokenizer;
+
+public class ParsedName implements Serializable {
final static int IS_EQUAL = 0;
final static int IS_LESS = -1;
final static int IS_GREATER = 1;
@@ -34,7 +37,7 @@ public class ParsedName implements java.
components[0] = "";
hashcode = 0;
} else if (path.length() > 0) {
- java.util.StringTokenizer st = new java.util.StringTokenizer(path, "/");
+ StringTokenizer st = new StringTokenizer(path, "/");
components = new String[st.countTokens()];
for (int i = 0; st.hasMoreTokens() && i < components.length; i++)
components[i] = st.nextToken();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core.ivm.naming;
+import javax.naming.NamingException;
import javax.persistence.EntityManager;
/**
@@ -29,7 +30,7 @@ public class PersistenceContextReference
this.em = em;
}
- public Object getObject() throws javax.naming.NamingException {
+ public Object getObject() throws NamingException {
return em;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java Tue Nov 19 02:43:41 2013
@@ -467,7 +467,7 @@ public class ManagedContainer implements
* javax.ejb.SessionBean is a workaround for passing the TCK while the tests in
* question can be challenged or the spec can be changed/updated.
*/
- if (instance != null && instance.bean instanceof javax.ejb.SessionBean) {
+ if (instance != null && instance.bean instanceof SessionBean) {
throw new ApplicationException(new RemoveException("A stateful EJB enrolled in a transaction can not be removed"));
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core.managed;
+import org.apache.openejb.SystemException;
import org.apache.openejb.spi.Serializer;
import java.io.File;
@@ -44,11 +45,11 @@ public class RAFPassivater implements Pa
}
}
- public void init(Properties props) throws org.apache.openejb.SystemException {
+ public void init(Properties props) throws SystemException {
}
public synchronized void passivate(Map stateTable)
- throws org.apache.openejb.SystemException {
+ throws SystemException {
try {
fileID++;
@@ -70,12 +71,12 @@ public class RAFPassivater implements Pa
}
ras.close();
} catch (Exception e) {
- throw new org.apache.openejb.SystemException(e);
+ throw new SystemException(e);
}
}
public synchronized Object activate(Object primaryKey)
- throws org.apache.openejb.SystemException {
+ throws SystemException {
Pointer pointer = (Pointer) masterTable.get(primaryKey);
if (pointer == null)
@@ -89,7 +90,7 @@ public class RAFPassivater implements Pa
ras.close();
return Serializer.deserialize(bytes);
} catch (Exception e) {
- throw new org.apache.openejb.SystemException(e);
+ throw new SystemException(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java Tue Nov 19 02:43:41 2013
@@ -449,8 +449,8 @@ public class SimpleCache<K, V> implement
private void storeEntries(Map<K, V> entriesToStore) {
CacheListener<V> listener = this.getListener();
- for (Iterator<java.util.Map.Entry<K, V>> iterator = entriesToStore.entrySet().iterator(); iterator.hasNext();) {
- java.util.Map.Entry<K, V> entry = iterator.next();
+ for (Iterator<Map.Entry<K, V>> iterator = entriesToStore.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry<K, V> entry = iterator.next();
if (listener != null) {
try {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java Tue Nov 19 02:43:41 2013
@@ -24,6 +24,8 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import java.io.File;
+import java.io.IOException;
+import java.io.NotSerializableException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Map;
@@ -54,11 +56,11 @@ public class SimplePassivater implements
}
if (!sessionDirectory.exists() && !sessionDirectory.mkdirs()) {
- throw new java.io.IOException("Failed to create directory: " + sessionDirectory.getAbsolutePath());
+ throw new IOException("Failed to create directory: " + sessionDirectory.getAbsolutePath());
}
logger.info("Using directory " + sessionDirectory + " for stateful session passivation");
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
throw new SystemException(getClass().getName() + ".init(): can't use directory prefix " + dir + ":" + e, e);
}
}
@@ -78,7 +80,7 @@ public class SimplePassivater implements
oos.writeObject(state);// passivate just the bean instance
oos.close();
sessionFile.deleteOnExit();
- } catch (java.io.NotSerializableException nse) {
+ } catch (NotSerializableException nse) {
logger.error("Passivation failed ", nse);
throw (SystemException) new SystemException("The type " + nse.getMessage() + " is not serializable as mandated by the EJB specification.").initCause(nse);
} catch (Exception t) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java Tue Nov 19 02:43:41 2013
@@ -34,6 +34,7 @@ import javax.ejb.MessageDrivenBean;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.resource.spi.UnavailableException;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
@@ -213,8 +214,8 @@ public class MdbInstanceFactory {
return new Instance(context.getBean(), context.getInterceptors(), context.getCreationalContext());
} catch (Throwable e) {
- if (e instanceof java.lang.reflect.InvocationTargetException) {
- e = ((java.lang.reflect.InvocationTargetException) e).getTargetException();
+ if (e instanceof InvocationTargetException) {
+ e = ((InvocationTargetException) e).getTargetException();
}
String message = "The bean instance threw a system exception:" + e;
MdbInstanceFactory.logger.error(message, e);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java Tue Nov 19 02:43:41 2013
@@ -59,7 +59,7 @@ public class EjbWsContext implements Web
return wsaSupport;
}
- public EndpointReference getEndpointReference(org.w3c.dom.Element... referenceParameters) {
+ public EndpointReference getEndpointReference(Element... referenceParameters) {
return getAddressingSupport().getEndpointReference(referenceParameters);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java Tue Nov 19 02:43:41 2013
@@ -48,6 +48,8 @@ import javax.management.ObjectName;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.xml.ws.WebServiceContext;
+import java.lang.UnsupportedOperationException;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
@@ -198,8 +200,8 @@ public class SingletonInstanceManager {
return new Instance(context.getBean(), context.getInterceptors(), context.getCreationalContext(), lock);
} catch (Throwable e) {
- if (e instanceof java.lang.reflect.InvocationTargetException) {
- e = ((java.lang.reflect.InvocationTargetException) e).getTargetException();
+ if (e instanceof InvocationTargetException) {
+ e = ((InvocationTargetException) e).getTargetException();
}
String t = "The bean instance " + beanContext.getDeploymentID() + " threw a system exception:" + e;
logger.error(t, e);
@@ -378,7 +380,7 @@ public class SingletonInstanceManager {
}
public Condition newCondition() {
- throw new java.lang.UnsupportedOperationException("newCondition()");
+ throw new UnsupportedOperationException("newCondition()");
}
public boolean tryLock() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core.stateful;
+import org.apache.openejb.SystemException;
import org.apache.openejb.spi.Serializer;
import java.io.File;
@@ -44,12 +45,12 @@ public class RAFPassivater implements Pa
}
@Override
- public void init(final Properties props) throws org.apache.openejb.SystemException {
+ public void init(final Properties props) throws SystemException {
}
@Override
public synchronized void passivate(final Map stateTable)
- throws org.apache.openejb.SystemException {
+ throws SystemException {
try {
fileID++;
@@ -72,13 +73,13 @@ public class RAFPassivater implements Pa
}
ras.close();
} catch (Exception e) {
- throw new org.apache.openejb.SystemException(e);
+ throw new SystemException(e);
}
}
@Override
public synchronized Object activate(final Object primaryKey)
- throws org.apache.openejb.SystemException {
+ throws SystemException {
final Pointer pointer = (Pointer) masterTable.get(primaryKey);
if (pointer == null)
@@ -92,7 +93,7 @@ public class RAFPassivater implements Pa
ras.close();
return Serializer.deserialize(bytes);
} catch (Exception e) {
- throw new org.apache.openejb.SystemException(e);
+ throw new SystemException(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java Tue Nov 19 02:43:41 2013
@@ -532,8 +532,8 @@ public class SimpleCache<K, V> implement
private void storeEntries(Map<K, V> entriesToStore) {
CacheListener<V> listener = this.getListener();
- for (Iterator<java.util.Map.Entry<K, V>> iterator = entriesToStore.entrySet().iterator(); iterator.hasNext();) {
- java.util.Map.Entry<K, V> entry = iterator.next();
+ for (Iterator<Map.Entry<K, V>> iterator = entriesToStore.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry<K, V> entry = iterator.next();
if (listener != null) {
try {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java Tue Nov 19 02:43:41 2013
@@ -25,6 +25,8 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import java.io.File;
+import java.io.IOException;
+import java.io.NotSerializableException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Map;
@@ -55,16 +57,16 @@ public class SimplePassivater implements
}
if (!sessionDirectory.exists() && !sessionDirectory.mkdirs()) {
- throw new java.io.IOException("Failed to create session directory: " + sessionDirectory.getAbsolutePath());
+ throw new IOException("Failed to create session directory: " + sessionDirectory.getAbsolutePath());
}
if (sessionDirectory.exists() && !sessionDirectory.isDirectory()) {
- throw new java.io.IOException("Session directory exists as a file: " + sessionDirectory.getAbsolutePath());
+ throw new IOException("Session directory exists as a file: " + sessionDirectory.getAbsolutePath());
}
logger.info("Using directory " + sessionDirectory + " for stateful session passivation");
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
throw new SystemException(getClass().getName() + ".init(): can't use directory prefix " + dir + ":" + e, e);
}
}
@@ -85,7 +87,7 @@ public class SimplePassivater implements
IO.close(oos);
}
- } catch (java.io.NotSerializableException nse) {
+ } catch (NotSerializableException nse) {
logger.error("Passivation failed ", nse);
throw (SystemException) new SystemException("The type " + nse.getMessage() + " is not serializable as mandated by the EJB specification.").initCause(nse);
} catch (Exception t) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Tue Nov 19 02:43:41 2013
@@ -499,7 +499,7 @@ public class StatefulContainer implement
* javax.ejb.SessionBean is a workaround for passing the TCK while the tests in
* question can be challenged or the spec can be changed/updated.
*/
- if (instance != null && instance.bean instanceof javax.ejb.SessionBean) {
+ if (instance != null && instance.bean instanceof SessionBean) {
throw new ApplicationException(new RemoveException("A stateful EJB enrolled in a transaction can not be removed"));
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java Tue Nov 19 02:43:41 2013
@@ -59,7 +59,7 @@ public class EjbWsContext implements Web
return wsaSupport;
}
- public EndpointReference getEndpointReference(org.w3c.dom.Element... referenceParameters) {
+ public EndpointReference getEndpointReference(Element... referenceParameters) {
return getAddressingSupport().getEndpointReference(referenceParameters);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Tue Nov 19 02:43:41 2013
@@ -199,7 +199,7 @@ public class StatelessInstanceManager {
return createInstance(callContext, beanContext);
}
- private Instance createInstance(final ThreadContext callContext, final BeanContext beanContext) throws org.apache.openejb.ApplicationException {
+ private Instance createInstance(final ThreadContext callContext, final BeanContext beanContext) throws ApplicationException {
try {
final InstanceContext context = beanContext.newInstance();
if (context.getBean() instanceof SessionBean) {
@@ -226,7 +226,7 @@ public class StatelessInstanceManager {
}
final String t = "The bean instance " + beanContext.getDeploymentID() + " threw a system exception:" + e;
logger.error(t, e);
- throw new org.apache.openejb.ApplicationException(new RemoteException("Cannot obtain a free instance.", e));
+ throw new ApplicationException(new RemoteException("Cannot obtain a free instance.", e));
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java Tue Nov 19 02:43:41 2013
@@ -16,19 +16,21 @@
*/
package org.apache.openejb.core.webservices;
+import org.apache.openejb.core.stateless.EjbWsContext;
import org.w3c.dom.Element;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceContext;
/**
- * This interface defines the WS-Addressing functions of {@link javax.xml.ws.WebServiceContext WebServiceContext}
+ * This interface defines the WS-Addressing functions of {@link WebServiceContext WebServiceContext}
* that must be implemented by each JAX-WS provider. This interface is used within
- * {@link org.apache.openejb.core.stateless.EjbWsContext EjbWsContext} and its implementation can be passed to
+ * {@link EjbWsContext EjbWsContext} and its implementation can be passed to
* the stateless or singleton container on Web Service invocations.
*/
public interface AddressingSupport {
- EndpointReference getEndpointReference(org.w3c.dom.Element... referenceParameters);
+ EndpointReference getEndpointReference(Element... referenceParameters);
<T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java Tue Nov 19 02:43:41 2013
@@ -54,7 +54,7 @@ public class HandlerResolverImpl impleme
}
}
- public List<Handler> getHandlerChain(javax.xml.ws.handler.PortInfo portInfo) {
+ public List<Handler> getHandlerChain(PortInfo portInfo) {
List<Handler> chain = new ArrayList<Handler>();
for (HandlerChainData handlerChain : handlerChains) {
List<Handler> handlers = buildHandlers(portInfo, handlerChain);
@@ -65,7 +65,7 @@ public class HandlerResolverImpl impleme
return chain;
}
- private List<Handler> buildHandlers(javax.xml.ws.handler.PortInfo portInfo, HandlerChainData handlerChain) {
+ private List<Handler> buildHandlers(PortInfo portInfo, HandlerChainData handlerChain) {
if (!matchServiceName(portInfo, handlerChain.getServiceNamePattern()) ||
!matchPortName(portInfo, handlerChain.getPortNamePattern()) ||
!matchBinding(portInfo, handlerChain.getProtocolBindings())) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java Tue Nov 19 02:43:41 2013
@@ -28,7 +28,7 @@ public class NoAddressingSupport impleme
public static final NoAddressingSupport INSTANCE = new NoAddressingSupport();
- public EndpointReference getEndpointReference(org.w3c.dom.Element... referenceParameters) {
+ public EndpointReference getEndpointReference(Element... referenceParameters) {
throw new UnsupportedOperationException("JaxWS 2.1 APIs are not supported.");
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java Tue Nov 19 02:43:41 2013
@@ -43,6 +43,8 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.lang.Class;
+import java.lang.Object;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
@@ -217,7 +219,7 @@ public class ProviderWrapper extends Pro
}
@SuppressWarnings({"unchecked"})
- public Dispatch<java.lang.Object> createDispatch(final QName portName, final JAXBContext context, final Service.Mode mode, final WebServiceFeature... features) {
+ public Dispatch<Object> createDispatch(final QName portName, final JAXBContext context, final Service.Mode mode, final WebServiceFeature... features) {
return (Dispatch<Object>) invoke21Delegate(serviceDelegate, createDispatchJaxBContext,
portName,
context,
@@ -240,7 +242,7 @@ public class ProviderWrapper extends Pro
@SuppressWarnings({"unchecked"})
public <T> Dispatch<T> createDispatch(final EndpointReference endpointReference,
- final java.lang.Class<T> type,
+ final Class<T> type,
final Service.Mode mode,
final WebServiceFeature... features) {
return (Dispatch<T>) invoke21Delegate(serviceDelegate, createDispatchReferenceClass,
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java Tue Nov 19 02:43:41 2013
@@ -169,7 +169,7 @@ public class UriResolver {
try {
file = new File(uri);
} catch (IllegalArgumentException iae) {
- file = org.apache.openejb.util.URLs.toFile(uri.toURL());
+ file = URLs.toFile(uri.toURL());
if (!file.exists()) {
file = null;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,7 @@
*/
package org.apache.openejb.log.logger;
+import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -374,7 +375,7 @@ public abstract class AbstractDelegating
}
if (format.indexOf("{0") >= 0 || format.indexOf("{1") >= 0
|| format.indexOf("{2") >= 0 || format.indexOf("{3") >= 0) {
- return java.text.MessageFormat.format(format, parameters);
+ return MessageFormat.format(format, parameters);
}
return format;
} catch (Exception ex) {
@@ -388,7 +389,7 @@ public abstract class AbstractDelegating
* @param resourceBundleName
* the name of the resource bundle to load, cannot be null
* @return the loaded resource bundle.
- * @throws java.util.MissingResourceException
+ * @throws MissingResourceException
* If the specified resource bundle can not be loaded.
*/
static ResourceBundle loadResourceBundle(String resourceBundleName) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java Tue Nov 19 02:43:41 2013
@@ -20,6 +20,8 @@ package org.apache.openejb.log.logger;
import org.apache.log4j.Appender;
import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.apache.log4j.spi.LoggingEvent;
@@ -47,7 +49,7 @@ public class Log4jLogger extends Abstrac
private static final Map<Level, org.apache.log4j.Level> TO_LOG4J = new HashMap<Level, org.apache.log4j.Level>();
private static final org.apache.log4j.Level TRACE;
- private final org.apache.log4j.Logger log;
+ private final Logger log;
static {
//older versions of log4j don't have TRACE, use debug
@@ -73,7 +75,7 @@ public class Log4jLogger extends Abstrac
public Log4jLogger(String name, String resourceBundleName) {
super(name, resourceBundleName);
- log = org.apache.log4j.LogManager.getLogger(name);
+ log = LogManager.getLogger(name);
}
public Level getLevel() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java Tue Nov 19 02:43:41 2013
@@ -22,6 +22,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.PrintStream;
import java.io.PrintWriter;
+import java.lang.RuntimeException;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ConcurrentModificationException;
@@ -54,7 +55,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>MathRuntimeException</code> with specified
* formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
*/
@@ -79,7 +80,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>MathRuntimeException</code> with specified
* formatted detail message and nested <code>Throwable</code> root cause.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param rootCause the exception or error that caused this exception
* to be thrown.
* @param pattern format specifier
@@ -193,7 +194,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>ArithmeticException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -222,7 +223,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>ArrayIndexOutOfBoundsException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -251,7 +252,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>EOFException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -297,7 +298,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>IllegalArgumentException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -339,7 +340,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>IllegalStateException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -368,7 +369,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>ConcurrentModificationException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -397,7 +398,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>NoSuchElementException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -426,7 +427,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>NullPointerException</code> with specified formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param pattern format specifier
* @param arguments format arguments
* @return built exception
@@ -456,7 +457,7 @@ public class MathRuntimeException extend
/**
* Constructs a new <code>ParseException</code> with specified
* formatted detail message.
- * Message formatting is delegated to {@link java.text.MessageFormat}.
+ * Message formatting is delegated to {@link MessageFormat}.
* @param offset offset at which error occurred
* @param pattern format specifier
* @param arguments format arguments
@@ -485,9 +486,9 @@ public class MathRuntimeException extend
};
}
- /** Create an {@link java.lang.RuntimeException} for an internal error.
+ /** Create an {@link RuntimeException} for an internal error.
* @param cause underlying cause
- * @return an {@link java.lang.RuntimeException} for an internal error
+ * @return an {@link RuntimeException} for an internal error
*/
public static RuntimeException createInternalError(final Throwable cause) {
return new OpenEJBRuntimeException("internal error, please fill a bug report at https://issues.apache.org/jira/browse/MATH", cause);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java Tue Nov 19 02:43:41 2013
@@ -48,7 +48,7 @@ import java.util.Arrays;
* in the dataset.
*
* <p>Note: this class is not threadsafe. Use
- * {@link org.apache.openejb.math.stat.descriptive.SynchronizedDescriptiveStatistics} if concurrent access from multiple
+ * {@link SynchronizedDescriptiveStatistics} if concurrent access from multiple
* threads is required.</p>
*
* @version $Revision: 885278 $ $Date: 2009-11-29 13:47:51 -0800 (Sun, 29 Nov 2009) $
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java Tue Nov 19 02:43:41 2013
@@ -31,7 +31,7 @@ import java.io.Serializable;
* <p>
* Let <ul>
* <li> dev = (current obs - previous mean) </li>
- * <li> m2 = previous value of {@link org.apache.openejb.math.stat.descriptive.moment.SecondMoment} </li>
+ * <li> m2 = previous value of {@link SecondMoment} </li>
* <li> m2 = previous value of {@link ThirdMoment} </li>
* <li> n = number of observations (including current obs) </li>
* </ul>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java Tue Nov 19 02:43:41 2013
@@ -20,6 +20,7 @@ import org.apache.openejb.math.MathRunti
import org.apache.openejb.math.stat.descriptive.AbstractUnivariateStatistic;
import java.io.Serializable;
+import java.lang.Double;
import java.util.Arrays;
/**
@@ -46,9 +47,9 @@ import java.util.Arrays;
* </ol></p>
* <p>
* To compute percentiles, the data must be (totally) ordered. Input arrays
- * are copied and then sorted using {@link java.util.Arrays#sort(double[])}.
+ * are copied and then sorted using {@link Arrays#sort(double[])}.
* The ordering used by <code>Arrays.sort(double[])</code> is the one determined
- * by {@link java.lang.Double#compareTo(Double)}. This ordering makes
+ * by {@link Double#compareTo(Double)}. This ordering makes
* <code>Double.NaN</code> larger than any other value (including
* <code>Double.POSITIVE_INFINITY</code>). Therefore, for example, the median
* (50th percentile) of
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java Tue Nov 19 02:43:41 2013
@@ -19,11 +19,12 @@ package org.apache.openejb.math.stat.des
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
import java.io.Serializable;
+import java.lang.Math;
/**
* Returns the sum of the natural logs for this collection of values.
* <p>
- * Uses {@link java.lang.Math#log(double)} to compute the logs. Therefore,
+ * Uses {@link Math#log(double)} to compute the logs. Therefore,
* <ul>
* <li>If any of values are < 0, the result is <code>NaN.</code></li>
* <li>If all values are non-negative and less than
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java Tue Nov 19 02:43:41 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.osgi.client;
import org.apache.openejb.core.LocalInitialContext;
import javax.naming.Context;
+import javax.naming.NamingException;
import java.util.Hashtable;
/**
@@ -27,7 +28,7 @@ import java.util.Hashtable;
public class LocalInitialContextFactory extends org.apache.openejb.core.LocalInitialContextFactory {
@Override
- public Context getInitialContext(final Hashtable env) throws javax.naming.NamingException {
+ public Context getInitialContext(final Hashtable env) throws NamingException {
init(env);
return new LocalInitialContext(env, this);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java Tue Nov 19 02:43:41 2013
@@ -19,11 +19,13 @@ package org.apache.openejb.resource.acti
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerFactoryHandler;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.ra.ActiveMQResourceAdapter;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
import org.apache.openejb.util.URLs;
import javax.naming.Context;
@@ -51,7 +53,7 @@ public class ActiveMQ5Factory implements
@Override
public synchronized BrokerService createBroker(final URI brokerURI) throws Exception {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).getChildLogger("service").info("ActiveMQ5Factory creating broker");
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).getChildLogger("service").info("ActiveMQ5Factory creating broker");
BrokerService broker = brokers.get(brokerURI);
@@ -119,7 +121,7 @@ public class ActiveMQ5Factory implements
disableScheduler(broker);
//Notify when an error occurs on shutdown.
- broker.setUseLoggingForShutdownErrors(org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).isErrorEnabled());
+ broker.setUseLoggingForShutdownErrors(Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).isErrorEnabled());
}
//We must close the broker
@@ -135,15 +137,12 @@ public class ActiveMQ5Factory implements
@Override
public void run() {
- Thread.currentThread().setContextClassLoader(org.apache.activemq.ra.ActiveMQResourceAdapter.class.getClassLoader());
+ Thread.currentThread().setContextClassLoader(ActiveMQResourceAdapter.class.getClassLoader());
try {
//Start before returning - this is known to be safe.
if (!bs.isStarted()) {
- org.apache
- .openejb
- .util
- .Logger
+ Logger
.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class)
.getChildLogger("service")
.info("Starting ActiveMQ BrokerService");
@@ -153,10 +152,7 @@ public class ActiveMQ5Factory implements
bs.waitUntilStarted();
//Force a checkpoint to initialize pools
- org.apache
- .openejb
- .util
- .Logger
+ Logger
.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class)
.getChildLogger("service")
.info("Starting ActiveMQ checkpoint");
@@ -187,10 +183,7 @@ public class ActiveMQ5Factory implements
try {
timeout = Integer.parseInt(properties.getProperty("startuptimeout", "30000"));
- org.apache
- .openejb
- .util
- .Logger
+ Logger
.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class)
.getChildLogger("service")
.info("Using ActiveMQ startup timeout of " + timeout + "ms");
@@ -208,15 +201,12 @@ public class ActiveMQ5Factory implements
}
if (null != throwable) {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).getChildLogger("service").error("ActiveMQ failed to start broker",
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).getChildLogger("service").error("ActiveMQ failed to start broker",
throwable);
} else if (started.get()) {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).getChildLogger("service").info("ActiveMQ broker started");
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class).getChildLogger("service").info("ActiveMQ broker started");
} else {
- org.apache
- .openejb
- .util
- .Logger
+ Logger
.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQ5Factory.class)
.getChildLogger("service")
.warning("ActiveMQ failed to start broker within " + timeout + " seconds - It may be unusable");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java Tue Nov 19 02:43:41 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.resource.acti
import org.apache.activemq.broker.BrokerService;
import org.apache.openejb.OpenEJBRuntimeException;
+import java.lang.Throwable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
@@ -46,11 +47,11 @@ public class ActiveMQFactory {
try {
tmp = Class.forName("org.apache.openejb.resource.activemq.ActiveMQ5Factory");
brokerPrefix = "amq5factory:";
- } catch (java.lang.Throwable t1) {
+ } catch (Throwable t1) {
try {
tmp = Class.forName("org.apache.openejb.resource.activemq.ActiveMQ4Factory");
brokerPrefix = "amq4factory:";
- } catch (java.lang.Throwable t2) {
+ } catch (Throwable t2) {
throw new OpenEJBRuntimeException("Unable to load ActiveMQFactory: Check ActiveMQ jar files are on classpath", t1);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java Tue Nov 19 02:43:41 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.resource.acti
import org.apache.activemq.broker.BrokerService;
import org.apache.openejb.util.Duration;
import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
import org.apache.openejb.util.URISupport;
import org.apache.openejb.util.URLs;
@@ -129,7 +130,7 @@ public class ActiveMQResourceAdapter ext
//We do not need to track the instance as the factory takes care of this.
ActiveMQFactory.createBroker(URLs.uri(getBrokerXmlConfig())).start();
} catch (Exception e) {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").fatal("Failed to start ActiveMQ", e);
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").fatal("Failed to start ActiveMQ", e);
} finally {
ActiveMQFactory.setThreadProperties(null);
@@ -148,7 +149,7 @@ public class ActiveMQResourceAdapter ext
@Override
public void stop() {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").info("Stopping ActiveMQ");
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").info("Stopping ActiveMQ");
final Thread stopThread = new Thread("ActiveMQResourceAdapter stop") {
@@ -157,7 +158,7 @@ public class ActiveMQResourceAdapter ext
try {
stopImpl();
} catch (Throwable t) {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").error("ActiveMQ shutdown failed", t);
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").error("ActiveMQ shutdown failed", t);
}
}
};
@@ -177,7 +178,7 @@ public class ActiveMQResourceAdapter ext
//Block for a maximum of timeout milliseconds waiting for this thread to die.
stopThread.join(timeout);
} catch (InterruptedException ex) {
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").warning("Gave up on ActiveMQ shutdown after " + timeout + "ms", ex);
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").warning("Gave up on ActiveMQ shutdown after " + timeout + "ms", ex);
}
}
@@ -210,7 +211,7 @@ public class ActiveMQResourceAdapter ext
stopScheduler();
- org.apache.openejb.util.Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").info("Stopped ActiveMQ broker");
+ Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").info("Stopped ActiveMQ broker");
}
private static void stopScheduler() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java Tue Nov 19 02:43:41 2013
@@ -87,7 +87,7 @@ public final class BasicDataSourceUtil {
}
/**
- * Create a {@link org.apache.openejb.resource.jdbc.cipher.PasswordCipher} instance from the
+ * Create a {@link PasswordCipher} instance from the
* passwordCipher class name.
*
* @param passwordCipherClass the password cipher to look for
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/PlainTextPasswordCipher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/PlainTextPasswordCipher.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/PlainTextPasswordCipher.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/PlainTextPasswordCipher.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.resource.jdbc.cipher;
+import java.lang.String;
+
/**
* This {@link PlainTextPasswordCipher} is an {@link PasswordCipher}
* implementation that does not use any encryption/decryption algorithm at all.
@@ -45,7 +47,7 @@ public class PlainTextPasswordCipher imp
* the plain-text password
* @return the plain-text password as character array
*
- * @see PasswordCipher#encrypt(java.lang.String)
+ * @see PasswordCipher#encrypt(String)
*/
public char[] encrypt(String plainPassword) {
if (null == plainPassword) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java Tue Nov 19 02:43:41 2013
@@ -21,6 +21,7 @@ import org.apache.openejb.util.Base64;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
+import java.lang.String;
/**
* This {@link PasswordCipher} implementation uses a the Triple-DES encryption
@@ -43,7 +44,7 @@ public class StaticDESPasswordCipher imp
private static final String TRANSFORMATION = new String("DESede");
/**
- * @see PasswordCipher#encrypt(java.lang.String)
+ * @see PasswordCipher#encrypt(String)
* @throws RuntimeException
* in any case of error.
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java Tue Nov 19 02:43:41 2013
@@ -24,6 +24,7 @@ import org.apache.openejb.loader.SystemI
import org.apache.openejb.resource.jdbc.BasicDataSourceUtil;
import org.apache.openejb.resource.jdbc.IsolationLevels;
import org.apache.openejb.resource.jdbc.cipher.PasswordCipher;
+import org.apache.openejb.resource.jdbc.cipher.PlainTextPasswordCipher;
import org.apache.openejb.resource.jdbc.plugin.DataSourcePlugin;
import org.apache.openejb.util.reflection.Reflections;
@@ -49,7 +50,7 @@ public class BasicDataSource extends org
* ciphered value.
* <p/>
* <em>The default is no codec.</em>. In other words, it means password is
- * not ciphered. The {@link org.apache.openejb.resource.jdbc.cipher.PlainTextPasswordCipher} can also be used.
+ * not ciphered. The {@link PlainTextPasswordCipher} can also be used.
*/
private String passwordCipher = null;
private JMXBasicDataSource jmxDs = null;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java Tue Nov 19 02:43:41 2013
@@ -22,6 +22,7 @@ import org.apache.openejb.loader.SystemI
import org.apache.openejb.resource.jdbc.BasicDataSourceUtil;
import org.apache.openejb.resource.jdbc.IsolationLevels;
import org.apache.openejb.resource.jdbc.cipher.PasswordCipher;
+import org.apache.openejb.resource.jdbc.cipher.PlainTextPasswordCipher;
import org.apache.openejb.resource.jdbc.plugin.DataSourcePlugin;
import org.apache.openejb.resource.jdbc.pool.XADataSourceResource;
@@ -45,7 +46,7 @@ public class BasicManagedDataSource exte
* ciphered value.
* <p/>
* <em>The default is no codec.</em>. In other words, it means password is
- * not ciphered. The {@link org.apache.openejb.resource.jdbc.cipher.PlainTextPasswordCipher} can also be used.
+ * not ciphered. The {@link PlainTextPasswordCipher} can also be used.
*/
private String passwordCipher = null;
private JMXBasicDataSource jmxDs = null;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.resource.jdbc.dbcp;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.openejb.api.internal.Internal;
import org.apache.openejb.api.jmx.Description;
import org.apache.openejb.api.jmx.ManagedAttribute;
@@ -35,11 +36,11 @@ import java.sql.Statement;
@SuppressWarnings("UnusedDeclaration")
@Description("describe a datasource pool")
public class JMXBasicDataSource {
- private transient final org.apache.commons.dbcp.BasicDataSource ds;
+ private transient final BasicDataSource ds;
private transient ObjectName objectName;
- public JMXBasicDataSource(final String name, final org.apache.commons.dbcp.BasicDataSource ds) {
+ public JMXBasicDataSource(final String name, final BasicDataSource ds) {
this.ds = ds;
if (LocalMBeanServer.isJMXActive()) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java Tue Nov 19 02:43:41 2013
@@ -27,7 +27,7 @@ public final class XADataSourceResource
private static final Class<?>[] XA_DATASOURCE_API = new Class<?>[]{ XADataSource.class };
public static XADataSource proxy(final ClassLoader loader, final String xaDataSource) {
- return javax.sql.XADataSource.class.cast(Proxy.newProxyInstance(loader, XA_DATASOURCE_API, new LazyXADataSourceHandler(xaDataSource)));
+ return XADataSource.class.cast(Proxy.newProxyInstance(loader, XA_DATASOURCE_API, new LazyXADataSourceHandler(xaDataSource)));
}
private static class LazyXADataSourceHandler implements InvocationHandler {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/Router.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/Router.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/Router.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/Router.java Tue Nov 19 02:43:41 2013
@@ -16,17 +16,19 @@
*/
package org.apache.openejb.resource.jdbc.router;
+import org.apache.openejb.resource.jdbc.RoutedDataSource;
+
import javax.sql.DataSource;
/**
- * The Router interface is responsible for providing the target data source to the ${@link org.apache.openejb.resource.jdbc.RoutedDataSource}}.
+ * The Router interface is responsible for providing the target data source to the ${@link RoutedDataSource}}.
*
* $Rev:$
*/
public interface Router {
/**
- * Used by ${@link org.apache.openejb.resource.jdbc.RoutedDataSource} to get the active data source.
+ * Used by ${@link RoutedDataSource} to get the active data source.
* @return the data source to delegate to
*/
DataSource getDataSource();