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 [2/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/config/Undeploy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java Tue Nov 19 02:43:41 2013
@@ -33,6 +33,8 @@ import org.apache.openejb.util.OpenEjbVe
import javax.naming.Context;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.ServiceUnavailableException;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
@@ -91,11 +93,11 @@ public class Undeploy {
try {
InitialContext ctx = new InitialContext(p);
deployer = (Deployer) ctx.lookup("openejb/DeployerBusinessRemote");
- } catch (javax.naming.ServiceUnavailableException e) {
+ } catch (ServiceUnavailableException e) {
System.out.println(e.getCause().getMessage());
System.out.println(Undeploy.messages.format("cmd.deploy.serverOffline"));
throw new SystemExitException(-1);
- } catch (javax.naming.NamingException e) {
+ } catch (NamingException e) {
System.out.println("DeployerEjb does not exist in server '" + serverUrl + "', check the server logs to ensure it exists and has not been removed.");
throw new SystemExitException(-2);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java Tue Nov 19 02:43:41 2013
@@ -18,7 +18,9 @@ package org.apache.openejb.config;
import org.apache.openejb.util.Messages;
-public class ValidationException extends java.lang.Exception {
+import java.lang.Exception;
+
+public class ValidationException extends Exception {
protected static final Messages messages = new Messages("org.apache.openejb.config.rules");
protected Object[] details;
protected String message;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java Tue Nov 19 02:43:41 2013
@@ -42,6 +42,7 @@ import org.xml.sax.InputSource;
import javax.jws.HandlerChain;
import javax.wsdl.Definition;
import javax.wsdl.Port;
+import javax.wsdl.Service;
import javax.wsdl.extensions.http.HTTPAddress;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.factory.WSDLFactory;
@@ -429,7 +430,7 @@ public class WsDeployer implements Dynam
if (definition == null) return null;
try {
- javax.wsdl.Service service = definition.getService(portComponent.getWsdlService());
+ Service service = definition.getService(portComponent.getWsdlService());
if (service == null) return null;
Port port = service.getPort(portComponent.getWsdlPort().getLocalPart());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java Tue Nov 19 02:43:41 2013
@@ -30,12 +30,30 @@ import org.apache.openejb.util.Strings;
import org.apache.openejb.util.proxy.DynamicProxyImplFactory;
import org.apache.xbean.finder.ClassFinder;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import javax.annotation.Resources;
+import javax.annotation.security.DeclareRoles;
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+import javax.annotation.security.RunAs;
+import javax.ejb.EJB;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
+import javax.ejb.EJBs;
+import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
import javax.ejb.Remote;
+import javax.ejb.Remove;
+import javax.ejb.Timeout;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionManagement;
import javax.jws.WebService;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -52,25 +70,25 @@ public class CheckClasses extends Valida
private static final List<Class<? extends Annotation>> beanOnlyAnnotations = new ArrayList<Class<? extends Annotation>>();
static {
- beanOnlyAnnotations.add(javax.annotation.PostConstruct.class);
- beanOnlyAnnotations.add(javax.annotation.PreDestroy.class);
- beanOnlyAnnotations.add(javax.annotation.Resource.class);
- beanOnlyAnnotations.add(javax.annotation.Resources.class);
- beanOnlyAnnotations.add(javax.annotation.security.DeclareRoles.class);
- beanOnlyAnnotations.add(javax.annotation.security.DenyAll.class);
- beanOnlyAnnotations.add(javax.annotation.security.PermitAll.class);
- beanOnlyAnnotations.add(javax.annotation.security.RolesAllowed.class);
- beanOnlyAnnotations.add(javax.annotation.security.RunAs.class);
-
- beanOnlyAnnotations.add(javax.ejb.EJB.class);
- beanOnlyAnnotations.add(javax.ejb.EJBs.class);
- beanOnlyAnnotations.add(javax.ejb.Init.class);
- beanOnlyAnnotations.add(javax.ejb.PostActivate.class);
- beanOnlyAnnotations.add(javax.ejb.PrePassivate.class);
- beanOnlyAnnotations.add(javax.ejb.Remove.class);
- beanOnlyAnnotations.add(javax.ejb.Timeout.class);
- beanOnlyAnnotations.add(javax.ejb.TransactionAttribute.class);
- beanOnlyAnnotations.add(javax.ejb.TransactionManagement.class);
+ beanOnlyAnnotations.add(PostConstruct.class);
+ beanOnlyAnnotations.add(PreDestroy.class);
+ beanOnlyAnnotations.add(Resource.class);
+ beanOnlyAnnotations.add(Resources.class);
+ beanOnlyAnnotations.add(DeclareRoles.class);
+ beanOnlyAnnotations.add(DenyAll.class);
+ beanOnlyAnnotations.add(PermitAll.class);
+ beanOnlyAnnotations.add(RolesAllowed.class);
+ beanOnlyAnnotations.add(RunAs.class);
+
+ beanOnlyAnnotations.add(EJB.class);
+ beanOnlyAnnotations.add(EJBs.class);
+ beanOnlyAnnotations.add(Init.class);
+ beanOnlyAnnotations.add(PostActivate.class);
+ beanOnlyAnnotations.add(PrePassivate.class);
+ beanOnlyAnnotations.add(Remove.class);
+ beanOnlyAnnotations.add(Timeout.class);
+ beanOnlyAnnotations.add(TransactionAttribute.class);
+ beanOnlyAnnotations.add(TransactionManagement.class);
}
public void validate(EjbModule ejbModule) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java Tue Nov 19 02:43:41 2013
@@ -141,7 +141,7 @@ public class CheckMethods extends Valida
Method[] interfaceMethods = intrface.getMethods();
for (int i = 0; i < interfaceMethods.length; i++) {
- if (interfaceMethods[i].getDeclaringClass() == javax.ejb.EJBObject.class) continue;
+ if (interfaceMethods[i].getDeclaringClass() == EJBObject.class) continue;
String name = interfaceMethods[i].getName();
try {
Class[] params = interfaceMethods[i].getParameterTypes();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java Tue Nov 19 02:43:41 2013
@@ -43,63 +43,63 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.Container }
+ * Create an instance of {@link Container }
*/
public Container createContainer() {
return new Container();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.ConnectionManager }
+ * Create an instance of {@link ConnectionManager }
*/
public ConnectionManager createConnectionManager() {
return new ConnectionManager();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.Resource }
+ * Create an instance of {@link Resource }
*/
public Resource createResource() {
return new Resource();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.SecurityService }
+ * Create an instance of {@link SecurityService }
*/
public SecurityService createSecurityService() {
return new SecurityService();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.JndiProvider }
+ * Create an instance of {@link JndiProvider }
*/
public JndiProvider createJndiProvider() {
return new JndiProvider();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.Deployments }
+ * Create an instance of {@link Deployments }
*/
public Deployments createDeployments() {
return new Deployments();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.Connector }
+ * Create an instance of {@link Connector }
*/
public Connector createConnector() {
return new Connector();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.ProxyFactory }
+ * Create an instance of {@link ProxyFactory }
*/
public ProxyFactory createProxyFactory() {
return new ProxyFactory();
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.Openejb }
+ * Create an instance of {@link Openejb }
*/
public Openejb createOpenejb() {
return new Openejb();
@@ -110,7 +110,7 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link org.apache.openejb.config.sys.TransactionManager }
+ * Create an instance of {@link TransactionManager }
*/
public TransactionManager createTransactionManager() {
return new TransactionManager();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java Tue Nov 19 02:43:41 2013
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.net.URI;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -36,12 +37,12 @@ public class ActiveMQResourceAdapterBuil
@XmlAttribute
private String brokerXmlConfig = "broker:(tcp://localhost:61616)?useJmx=false";
@XmlAttribute
- private java.net.URI serverUrl = java.net.URI.create("vm://localhost?waitForStart=20000&async=true");
+ private URI serverUrl = URI.create("vm://localhost?waitForStart=20000&async=true");
@XmlAttribute
private String dataSource = "Default Unmanaged JDBC Database";
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration startupTimeout = org.apache.openejb.util.Duration.parse("10 seconds");
+ private Duration startupTimeout = Duration.parse("10 seconds");
public ActiveMQResourceAdapterBuilder() {
setClassName("org.apache.openejb.resource.activemq.ActiveMQResourceAdapter");
@@ -68,16 +69,16 @@ public class ActiveMQResourceAdapterBuil
return brokerXmlConfig;
}
- public ActiveMQResourceAdapterBuilder withServerUrl(java.net.URI serverUrl) {
+ public ActiveMQResourceAdapterBuilder withServerUrl(URI serverUrl) {
this.serverUrl = serverUrl;
return this;
}
- public void setServerUrl(java.net.URI serverUrl) {
+ public void setServerUrl(URI serverUrl) {
this.serverUrl = serverUrl;
}
- public java.net.URI getServerUrl() {
+ public URI getServerUrl() {
return serverUrl;
}
@@ -94,16 +95,16 @@ public class ActiveMQResourceAdapterBuil
return dataSource;
}
- public ActiveMQResourceAdapterBuilder withStartupTimeout(org.apache.openejb.util.Duration startupTimeout) {
+ public ActiveMQResourceAdapterBuilder withStartupTimeout(Duration startupTimeout) {
this.startupTimeout = startupTimeout;
return this;
}
- public void setStartupTimeout(org.apache.openejb.util.Duration startupTimeout) {
+ public void setStartupTimeout(Duration startupTimeout) {
this.startupTimeout = startupTimeout;
}
- public org.apache.openejb.util.Duration getStartupTimeout() {
+ public Duration getStartupTimeout() {
return startupTimeout;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java Tue Nov 19 02:43:41 2013
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.net.URI;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -42,7 +43,7 @@ public class DataSourceBuilder extends R
@XmlAttribute
private String jdbcDriver = "org.hsqldb.jdbcDriver";
@XmlAttribute
- private java.net.URI jdbcUrl = java.net.URI.create("jdbc:hsqldb:mem:hsqldb");
+ private URI jdbcUrl = URI.create("jdbc:hsqldb:mem:hsqldb");
@XmlAttribute
private String userName = "sa";
@XmlAttribute
@@ -65,7 +66,7 @@ public class DataSourceBuilder extends R
private int minIdle = 0;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration maxWaitTime = org.apache.openejb.util.Duration.parse("-1 millisecond");
+ private Duration maxWaitTime = Duration.parse("-1 millisecond");
@XmlAttribute
private String validationQuery = null;
@XmlAttribute
@@ -76,12 +77,12 @@ public class DataSourceBuilder extends R
private boolean testWhileIdle = false;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration timeBetweenEvictionRuns = org.apache.openejb.util.Duration.parse("-1 millisecond");
+ private Duration timeBetweenEvictionRuns = Duration.parse("-1 millisecond");
@XmlAttribute
private int numTestsPerEvictionRun = 3;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration minEvictableIdleTime = org.apache.openejb.util.Duration.parse("30 minutes");
+ private Duration minEvictableIdleTime = Duration.parse("30 minutes");
@XmlAttribute
private boolean poolPreparedStatements = false;
@XmlAttribute
@@ -159,16 +160,16 @@ public class DataSourceBuilder extends R
return jdbcDriver;
}
- public DataSourceBuilder withJdbcUrl(java.net.URI jdbcUrl) {
+ public DataSourceBuilder withJdbcUrl(URI jdbcUrl) {
this.jdbcUrl = jdbcUrl;
return this;
}
- public void setJdbcUrl(java.net.URI jdbcUrl) {
+ public void setJdbcUrl(URI jdbcUrl) {
this.jdbcUrl = jdbcUrl;
}
- public java.net.URI getJdbcUrl() {
+ public URI getJdbcUrl() {
return jdbcUrl;
}
@@ -302,16 +303,16 @@ public class DataSourceBuilder extends R
return minIdle;
}
- public DataSourceBuilder withMaxWaitTime(org.apache.openejb.util.Duration maxWaitTime) {
+ public DataSourceBuilder withMaxWaitTime(Duration maxWaitTime) {
this.maxWaitTime = maxWaitTime;
return this;
}
- public void setMaxWaitTime(org.apache.openejb.util.Duration maxWaitTime) {
+ public void setMaxWaitTime(Duration maxWaitTime) {
this.maxWaitTime = maxWaitTime;
}
- public org.apache.openejb.util.Duration getMaxWaitTime() {
+ public Duration getMaxWaitTime() {
return maxWaitTime;
}
@@ -375,16 +376,16 @@ public class DataSourceBuilder extends R
return testWhileIdle;
}
- public DataSourceBuilder withTimeBetweenEvictionRuns(org.apache.openejb.util.Duration timeBetweenEvictionRuns) {
+ public DataSourceBuilder withTimeBetweenEvictionRuns(Duration timeBetweenEvictionRuns) {
this.timeBetweenEvictionRuns = timeBetweenEvictionRuns;
return this;
}
- public void setTimeBetweenEvictionRuns(org.apache.openejb.util.Duration timeBetweenEvictionRuns) {
+ public void setTimeBetweenEvictionRuns(Duration timeBetweenEvictionRuns) {
this.timeBetweenEvictionRuns = timeBetweenEvictionRuns;
}
- public org.apache.openejb.util.Duration getTimeBetweenEvictionRuns() {
+ public Duration getTimeBetweenEvictionRuns() {
return timeBetweenEvictionRuns;
}
@@ -409,16 +410,16 @@ public class DataSourceBuilder extends R
return numTestsPerEvictionRun;
}
- public DataSourceBuilder withMinEvictableIdleTime(org.apache.openejb.util.Duration minEvictableIdleTime) {
+ public DataSourceBuilder withMinEvictableIdleTime(Duration minEvictableIdleTime) {
this.minEvictableIdleTime = minEvictableIdleTime;
return this;
}
- public void setMinEvictableIdleTime(org.apache.openejb.util.Duration minEvictableIdleTime) {
+ public void setMinEvictableIdleTime(Duration minEvictableIdleTime) {
this.minEvictableIdleTime = minEvictableIdleTime;
}
- public org.apache.openejb.util.Duration getMinEvictableIdleTime() {
+ public Duration getMinEvictableIdleTime() {
return minEvictableIdleTime;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java Tue Nov 19 02:43:41 2013
@@ -43,10 +43,10 @@ public class JmsConnectionFactoryBuilder
private int poolMinSize = 0;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration connectionMaxWaitTime = org.apache.openejb.util.Duration.parse("5 seconds");
+ private Duration connectionMaxWaitTime = Duration.parse("5 seconds");
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration connectionMaxIdleTime = org.apache.openejb.util.Duration.parse("15 Minutes");
+ private Duration connectionMaxIdleTime = Duration.parse("15 Minutes");
public JmsConnectionFactoryBuilder() {
setClassName("org.apache.activemq.ra.ActiveMQManagedConnectionFactory");
@@ -112,16 +112,16 @@ public class JmsConnectionFactoryBuilder
return poolMinSize;
}
- public JmsConnectionFactoryBuilder withConnectionMaxWaitTime(org.apache.openejb.util.Duration connectionMaxWaitTime) {
+ public JmsConnectionFactoryBuilder withConnectionMaxWaitTime(Duration connectionMaxWaitTime) {
this.connectionMaxWaitTime = connectionMaxWaitTime;
return this;
}
- public void setConnectionMaxWaitTime(org.apache.openejb.util.Duration connectionMaxWaitTime) {
+ public void setConnectionMaxWaitTime(Duration connectionMaxWaitTime) {
this.connectionMaxWaitTime = connectionMaxWaitTime;
}
- public org.apache.openejb.util.Duration getConnectionMaxWaitTime() {
+ public Duration getConnectionMaxWaitTime() {
return connectionMaxWaitTime;
}
@@ -133,16 +133,16 @@ public class JmsConnectionFactoryBuilder
setConnectionMaxWaitTime(new Duration(time, unit));
}
- public JmsConnectionFactoryBuilder withConnectionMaxIdleTime(org.apache.openejb.util.Duration connectionMaxIdleTime) {
+ public JmsConnectionFactoryBuilder withConnectionMaxIdleTime(Duration connectionMaxIdleTime) {
this.connectionMaxIdleTime = connectionMaxIdleTime;
return this;
}
- public void setConnectionMaxIdleTime(org.apache.openejb.util.Duration connectionMaxIdleTime) {
+ public void setConnectionMaxIdleTime(Duration connectionMaxIdleTime) {
this.connectionMaxIdleTime = connectionMaxIdleTime;
}
- public org.apache.openejb.util.Duration getConnectionMaxIdleTime() {
+ public Duration getConnectionMaxIdleTime() {
return connectionMaxIdleTime;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java Tue Nov 19 02:43:41 2013
@@ -35,7 +35,7 @@ public class SingletonContainerBuilder e
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration accessTimeout = org.apache.openejb.util.Duration.parse("30 seconds");
+ private Duration accessTimeout = Duration.parse("30 seconds");
public SingletonContainerBuilder() {
setClassName("org.apache.openejb.core.singleton.SingletonContainer");
@@ -51,16 +51,16 @@ public class SingletonContainerBuilder e
return this;
}
- public SingletonContainerBuilder withAccessTimeout(org.apache.openejb.util.Duration accessTimeout) {
+ public SingletonContainerBuilder withAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
return this;
}
- public void setAccessTimeout(org.apache.openejb.util.Duration accessTimeout) {
+ public void setAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
}
- public org.apache.openejb.util.Duration getAccessTimeout() {
+ public Duration getAccessTimeout() {
return accessTimeout;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java Tue Nov 19 02:43:41 2013
@@ -35,14 +35,14 @@ public class StatefulContainerBuilder ex
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration accessTimeout = org.apache.openejb.util.Duration.parse("30 seconds");
+ private Duration accessTimeout = Duration.parse("30 seconds");
@XmlAttribute
private String cache = "org.apache.openejb.core.stateful.SimpleCache";
@XmlAttribute
private String passivator = "org.apache.openejb.core.stateful.SimplePassivater";
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration timeOut = org.apache.openejb.util.Duration.parse("20");
+ private Duration timeOut = Duration.parse("20");
@XmlAttribute
private int frequency = 60;
@XmlAttribute
@@ -64,16 +64,16 @@ public class StatefulContainerBuilder ex
return this;
}
- public StatefulContainerBuilder withAccessTimeout(org.apache.openejb.util.Duration accessTimeout) {
+ public StatefulContainerBuilder withAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
return this;
}
- public void setAccessTimeout(org.apache.openejb.util.Duration accessTimeout) {
+ public void setAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
}
- public org.apache.openejb.util.Duration getAccessTimeout() {
+ public Duration getAccessTimeout() {
return accessTimeout;
}
@@ -111,16 +111,16 @@ public class StatefulContainerBuilder ex
return passivator;
}
- public StatefulContainerBuilder withTimeOut(org.apache.openejb.util.Duration timeOut) {
+ public StatefulContainerBuilder withTimeOut(Duration timeOut) {
this.timeOut = timeOut;
return this;
}
- public void setTimeOut(org.apache.openejb.util.Duration timeOut) {
+ public void setTimeOut(Duration timeOut) {
this.timeOut = timeOut;
}
- public org.apache.openejb.util.Duration getTimeOut() {
+ public Duration getTimeOut() {
return timeOut;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java Tue Nov 19 02:43:41 2013
@@ -35,7 +35,7 @@ public class StatelessContainerBuilder e
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration accessTimeout = org.apache.openejb.util.Duration.parse("30 seconds");
+ private Duration accessTimeout = Duration.parse("30 seconds");
@XmlAttribute
private int maxSize = 10;
@XmlAttribute
@@ -44,7 +44,7 @@ public class StatelessContainerBuilder e
private boolean strictPooling = true;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration maxAge = org.apache.openejb.util.Duration.parse("0 hours");
+ private Duration maxAge = Duration.parse("0 hours");
@XmlAttribute
private boolean replaceAged = true;
@XmlAttribute
@@ -53,17 +53,17 @@ public class StatelessContainerBuilder e
private int maxAgeOffset = -1;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration idleTimeout = org.apache.openejb.util.Duration.parse("0 minutes");
+ private Duration idleTimeout = Duration.parse("0 minutes");
@XmlAttribute
private boolean garbageCollection = false;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration sweepInterval = org.apache.openejb.util.Duration.parse("5 minutes");
+ private Duration sweepInterval = Duration.parse("5 minutes");
@XmlAttribute
private int callbackThreads = 5;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration closeTimeout = org.apache.openejb.util.Duration.parse("5 minutes");
+ private Duration closeTimeout = Duration.parse("5 minutes");
public StatelessContainerBuilder() {
setClassName("org.apache.openejb.core.stateless.StatelessContainerFactory");
@@ -79,16 +79,16 @@ public class StatelessContainerBuilder e
return this;
}
- public StatelessContainerBuilder withAccessTimeout(org.apache.openejb.util.Duration accessTimeout) {
+ public StatelessContainerBuilder withAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
return this;
}
- public void setAccessTimeout(org.apache.openejb.util.Duration accessTimeout) {
+ public void setAccessTimeout(Duration accessTimeout) {
this.accessTimeout = accessTimeout;
}
- public org.apache.openejb.util.Duration getAccessTimeout() {
+ public Duration getAccessTimeout() {
return accessTimeout;
}
@@ -139,16 +139,16 @@ public class StatelessContainerBuilder e
return strictPooling;
}
- public StatelessContainerBuilder withMaxAge(org.apache.openejb.util.Duration maxAge) {
+ public StatelessContainerBuilder withMaxAge(Duration maxAge) {
this.maxAge = maxAge;
return this;
}
- public void setMaxAge(org.apache.openejb.util.Duration maxAge) {
+ public void setMaxAge(Duration maxAge) {
this.maxAge = maxAge;
}
- public org.apache.openejb.util.Duration getMaxAge() {
+ public Duration getMaxAge() {
return maxAge;
}
@@ -199,16 +199,16 @@ public class StatelessContainerBuilder e
return maxAgeOffset;
}
- public StatelessContainerBuilder withIdleTimeout(org.apache.openejb.util.Duration idleTimeout) {
+ public StatelessContainerBuilder withIdleTimeout(Duration idleTimeout) {
this.idleTimeout = idleTimeout;
return this;
}
- public void setIdleTimeout(org.apache.openejb.util.Duration idleTimeout) {
+ public void setIdleTimeout(Duration idleTimeout) {
this.idleTimeout = idleTimeout;
}
- public org.apache.openejb.util.Duration getIdleTimeout() {
+ public Duration getIdleTimeout() {
return idleTimeout;
}
@@ -233,16 +233,16 @@ public class StatelessContainerBuilder e
return garbageCollection;
}
- public StatelessContainerBuilder withSweepInterval(org.apache.openejb.util.Duration sweepInterval) {
+ public StatelessContainerBuilder withSweepInterval(Duration sweepInterval) {
this.sweepInterval = sweepInterval;
return this;
}
- public void setSweepInterval(org.apache.openejb.util.Duration sweepInterval) {
+ public void setSweepInterval(Duration sweepInterval) {
this.sweepInterval = sweepInterval;
}
- public org.apache.openejb.util.Duration getSweepInterval() {
+ public Duration getSweepInterval() {
return sweepInterval;
}
@@ -267,16 +267,16 @@ public class StatelessContainerBuilder e
return callbackThreads;
}
- public StatelessContainerBuilder withCloseTimeout(org.apache.openejb.util.Duration closeTimeout) {
+ public StatelessContainerBuilder withCloseTimeout(Duration closeTimeout) {
this.closeTimeout = closeTimeout;
return this;
}
- public void setCloseTimeout(org.apache.openejb.util.Duration closeTimeout) {
+ public void setCloseTimeout(Duration closeTimeout) {
this.closeTimeout = closeTimeout;
}
- public org.apache.openejb.util.Duration getCloseTimeout() {
+ public Duration getCloseTimeout() {
return closeTimeout;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java Tue Nov 19 02:43:41 2013
@@ -35,7 +35,7 @@ public class TransactionManagerBuilder e
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration defaultTransactionTimeout = org.apache.openejb.util.Duration.parse("10 minutes");
+ private Duration defaultTransactionTimeout = Duration.parse("10 minutes");
@XmlAttribute
private boolean txRecovery = false;
@XmlAttribute
@@ -46,7 +46,7 @@ public class TransactionManagerBuilder e
private boolean adler32Checksum = true;
@XmlJavaTypeAdapter(DurationAdapter.class)
@XmlAttribute
- private org.apache.openejb.util.Duration flushSleepTime = org.apache.openejb.util.Duration.parse("50 Milliseconds");
+ private Duration flushSleepTime = Duration.parse("50 Milliseconds");
@XmlAttribute
private String logFileDir = "txlog";
@XmlAttribute
@@ -80,16 +80,16 @@ public class TransactionManagerBuilder e
return this;
}
- public TransactionManagerBuilder withDefaultTransactionTimeout(org.apache.openejb.util.Duration defaultTransactionTimeout) {
+ public TransactionManagerBuilder withDefaultTransactionTimeout(Duration defaultTransactionTimeout) {
this.defaultTransactionTimeout = defaultTransactionTimeout;
return this;
}
- public void setDefaultTransactionTimeout(org.apache.openejb.util.Duration defaultTransactionTimeout) {
+ public void setDefaultTransactionTimeout(Duration defaultTransactionTimeout) {
this.defaultTransactionTimeout = defaultTransactionTimeout;
}
- public org.apache.openejb.util.Duration getDefaultTransactionTimeout() {
+ public Duration getDefaultTransactionTimeout() {
return defaultTransactionTimeout;
}
@@ -153,16 +153,16 @@ public class TransactionManagerBuilder e
return adler32Checksum;
}
- public TransactionManagerBuilder withFlushSleepTime(org.apache.openejb.util.Duration flushSleepTime) {
+ public TransactionManagerBuilder withFlushSleepTime(Duration flushSleepTime) {
this.flushSleepTime = flushSleepTime;
return this;
}
- public void setFlushSleepTime(org.apache.openejb.util.Duration flushSleepTime) {
+ public void setFlushSleepTime(Duration flushSleepTime) {
this.flushSleepTime = flushSleepTime;
}
- public org.apache.openejb.util.Duration getFlushSleepTime() {
+ public Duration getFlushSleepTime() {
return flushSleepTime;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/DurationAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/DurationAdapter.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/DurationAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/DurationAdapter.java Tue Nov 19 02:43:41 2013
@@ -18,7 +18,10 @@ package org.apache.openejb.config.typed.
import org.apache.openejb.util.Duration;
-public class DurationAdapter extends javax.xml.bind.annotation.adapters.XmlAdapter<java.lang.String, Duration> {
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+import java.lang.String;
+
+public class DurationAdapter extends XmlAdapter<String, Duration> {
@Override
public Duration unmarshal(String v) throws Exception {
return Duration.parse(v);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java Tue Nov 19 02:43:41 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.core;
import org.apache.openejb.core.ivm.naming.Reference;
import javax.naming.NamingException;
+import javax.resource.ResourceException;
import javax.resource.spi.ConnectionManager;
import javax.resource.spi.ManagedConnectionFactory;
/*
@@ -47,8 +48,8 @@ public class ConnectorReference extends
try {
Object connection = mngedConFactory.createConnectionFactory(conMngr);
return connection;
- } catch (javax.resource.ResourceException re) {
- throw (javax.naming.NamingException) new NamingException("Could not create ConnectionFactory from " + mngedConFactory.getClass()).initCause(re);
+ } catch (ResourceException re) {
+ throw (NamingException) new NamingException("Could not create ConnectionFactory from " + mngedConFactory.getClass()).initCause(re);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java Tue Nov 19 02:43:41 2013
@@ -21,8 +21,10 @@ import org.apache.openejb.BeanContext;
import org.apache.openejb.Container;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
import javax.naming.Context;
+import javax.naming.NamingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -31,7 +33,7 @@ import java.util.concurrent.ConcurrentHa
/**
* @org.apache.xbean.XBean element="containerSystem"
*/
-public class CoreContainerSystem implements org.apache.openejb.spi.ContainerSystem {
+public class CoreContainerSystem implements ContainerSystem {
private final Map<Object, AppContext> apps = new ConcurrentHashMap<Object, AppContext>();
private final Map<Object, BeanContext> deployments = new ConcurrentHashMap<Object, BeanContext>();
@@ -65,7 +67,7 @@ public class CoreContainerSystem impleme
|| !(jndiContext.lookup("openejb/global") instanceof Context)) {
throw new OpenEJBRuntimeException("core openejb naming context not properly initialized. It must have subcontexts for openejb/local, openejb/remote, openejb/client, and openejb/Deployment already present");
}
- } catch (javax.naming.NamingException exception) {
+ } catch (NamingException exception) {
throw new OpenEJBRuntimeException("core openejb naming context not properly initialized. It must have subcontexts for openejb/local, openejb/remote, openejb/client, and openejb/Deployment already present", exception);
}
SystemInstance.get().setComponent(JndiFactory.class, jndiFactory);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -26,11 +27,13 @@ import javax.transaction.RollbackExcepti
import javax.transaction.Status;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import java.io.Serializable;
/**
* @org.apache.xbean.XBean element="userTransaction"
*/
-public class CoreUserTransaction implements javax.transaction.UserTransaction, java.io.Serializable {
+public class CoreUserTransaction implements UserTransaction, Serializable {
private static final long serialVersionUID = 9203248912222645965L;
private static transient final Logger transactionLogger = Logger.getInstance(LogCategory.TRANSACTION, "org.apache.openejb.util.resources");
private transient TransactionManager transactionManager;
@@ -41,7 +44,7 @@ public class CoreUserTransaction impleme
private TransactionManager transactionManager() {
if (transactionManager == null) {
- transactionManager = org.apache.openejb.OpenEJB.getTransactionManager();
+ transactionManager = OpenEJB.getTransactionManager();
}
return transactionManager;
}
@@ -81,7 +84,7 @@ public class CoreUserTransaction impleme
}
@Override
- public void setRollbackOnly() throws javax.transaction.SystemException {
+ public void setRollbackOnly() throws SystemException {
if (transactionLogger.isDebugEnabled()) {
transactionLogger.debug("Marking user transaction for rollback: " + transactionManager().getTransaction());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java Tue Nov 19 02:43:41 2013
@@ -22,6 +22,7 @@ import org.apache.openejb.util.OptionsLo
import javax.naming.Context;
import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Hashtable;
@@ -32,7 +33,7 @@ import java.util.concurrent.locks.Reentr
* @version $Rev$ $Date$
*/
@SuppressWarnings("UseOfObsoleteCollectionType")
-public class LocalInitialContextFactory implements javax.naming.spi.InitialContextFactory {
+public class LocalInitialContextFactory implements InitialContextFactory {
private static final ReentrantLock lock = new ReentrantLock();
private static OpenEJBInstance openejb = null;
@@ -40,12 +41,12 @@ public class LocalInitialContextFactory
private boolean bootedOpenEJB;
@Override
- public Context getInitialContext(final Hashtable env) throws javax.naming.NamingException {
+ public Context getInitialContext(final Hashtable env) throws NamingException {
init(env);
return getLocalInitialContext(env);
}
- protected void init(final Hashtable env) throws javax.naming.NamingException {
+ protected void init(final Hashtable env) throws NamingException {
final ReentrantLock l = lock;
l.lock();
@@ -107,7 +108,7 @@ public class LocalInitialContextFactory
}
}
- private Context getLocalInitialContext(final Hashtable env) throws javax.naming.NamingException {
+ private Context getLocalInitialContext(final Hashtable env) throws NamingException {
final Context context;
try {
final ClassLoader cl = SystemInstance.get().getClassLoader();
@@ -128,7 +129,7 @@ public class LocalInitialContextFactory
if (e instanceof NamingException) {
throw (NamingException) e;
}
- throw (NamingException) new javax.naming.NamingException("Cannot instantiate a LocalInitialContext. Exception: "
+ throw (NamingException) new NamingException("Cannot instantiate a LocalInitialContext. Exception: "
+ e.getClass().getName() + " " + e.getMessage()).initCause(e);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Tue Nov 19 02:43:41 2013
@@ -635,7 +635,7 @@ public class CmpContainer implements Rpc
// create a new ProxyInfo based on the deployment info and primary key
return new ProxyInfo(beanContext, primaryKey);
- } catch (javax.ejb.FinderException fe) {
+ } catch (FinderException fe) {
handleApplicationException(txPolicy, fe, false);
} catch (Throwable e) {// handle reflection exception
handleSystemException(txPolicy, e, callContext);
@@ -693,7 +693,7 @@ public class CmpContainer implements Rpc
return new ProxyInfo(beanContext, primaryKey);
}
}
- } catch (javax.ejb.FinderException fe) {
+ } catch (FinderException fe) {
handleApplicationException(txPolicy, fe, false);
} catch (Throwable e) {// handle reflection exception
handleSystemException(txPolicy, e, callContext);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java Tue Nov 19 02:43:41 2013
@@ -31,7 +31,7 @@ public class ComplexKeyGenerator extends
public ComplexKeyGenerator(Class entityBeanClass, Class pkClass) throws OpenEJBException {
this.pkClass = pkClass;
- List<org.apache.openejb.core.cmp.ComplexKeyGenerator.PkField> fields = new ArrayList<PkField>();
+ List<ComplexKeyGenerator.PkField> fields = new ArrayList<PkField>();
for (Field pkObjectField : pkClass.getFields()) {
if (isValidPkField(pkObjectField)) {
Field entityBeanField = getField(entityBeanClass, pkObjectField.getName());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/KeyGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/KeyGenerator.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/KeyGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/KeyGenerator.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.core.cmp;
+import javax.ejb.EntityBean;
+
public interface KeyGenerator {
- Object getPrimaryKey(javax.ejb.EntityBean bean);
+ Object getPrimaryKey(EntityBean bean);
}
\ No newline at end of file
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java Tue Nov 19 02:43:41 2013
@@ -33,6 +33,7 @@ import org.apache.openejb.core.transacti
import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.util.ArrayEnumeration;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -146,7 +147,7 @@ public class EntityContainer implements
try {
boolean authorized = type == InterfaceType.TIMEOUT || getSecurityService().isCallerAuthorized(callMethod, type);
if (!authorized)
- throw new org.apache.openejb.ApplicationException(new EJBAccessException("Unauthorized Access by Principal Denied"));
+ throw new ApplicationException(new EJBAccessException("Unauthorized Access by Principal Denied"));
Class declaringClass = callMethod.getDeclaringClass();
String methodName = callMethod.getName();
@@ -360,7 +361,7 @@ public class EntityContainer implements
* Find operations return either a single primary key or a collection of primary keys.
* The primary keys are converted to ProxyInfo objects.
*/
- if (returnValue instanceof java.util.Collection) {
+ if (returnValue instanceof Collection) {
Iterator keys = ((Collection) returnValue).iterator();
Vector<ProxyInfo> proxies = new Vector<ProxyInfo>();
while (keys.hasNext()) {
@@ -368,14 +369,14 @@ public class EntityContainer implements
proxies.addElement(new ProxyInfo(beanContext, primaryKey));
}
returnValue = proxies;
- } else if (returnValue instanceof java.util.Enumeration) {
+ } else if (returnValue instanceof Enumeration) {
Enumeration keys = (Enumeration) returnValue;
Vector<ProxyInfo> proxies = new Vector<ProxyInfo>();
while (keys.hasMoreElements()) {
Object primaryKey = keys.nextElement();
proxies.addElement(new ProxyInfo(beanContext, primaryKey));
}
- returnValue = new org.apache.openejb.util.ArrayEnumeration(proxies);
+ returnValue = new ArrayEnumeration(proxies);
} else
returnValue = new ProxyInfo(beanContext, returnValue);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java Tue Nov 19 02:43:41 2013
@@ -22,12 +22,16 @@ import org.apache.openejb.OpenEJBExcepti
import org.apache.openejb.ProxyInfo;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import org.apache.openejb.util.ArrayEnumeration;
import org.apache.openejb.util.proxy.ProxyManager;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
import javax.ejb.RemoveException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
import java.util.List;
import java.util.Vector;
@@ -63,32 +67,32 @@ public class EntityEjbHomeHandler extend
throw e;
}
- if (retValue instanceof java.util.Collection) {
- Object [] proxyInfos = ((java.util.Collection) retValue).toArray();
+ if (retValue instanceof Collection) {
+ Object [] proxyInfos = ((Collection) retValue).toArray();
Vector proxies = new Vector();
for (int i = 0; i < proxyInfos.length; i++) {
ProxyInfo proxyInfo = (ProxyInfo) proxyInfos[i];
proxies.addElement(createProxy(proxyInfo.getPrimaryKey(), getMainInterface()));
}
return proxies;
- } else if (retValue instanceof org.apache.openejb.util.ArrayEnumeration) {
- org.apache.openejb.util.ArrayEnumeration enumeration = (org.apache.openejb.util.ArrayEnumeration) retValue;
+ } else if (retValue instanceof ArrayEnumeration) {
+ ArrayEnumeration enumeration = (ArrayEnumeration) retValue;
for (int i = enumeration.size() - 1; i >= 0; --i) {
ProxyInfo proxyInfo = (ProxyInfo) enumeration.get(i);
enumeration.set(i, createProxy(proxyInfo.getPrimaryKey(), getMainInterface()));
}
return enumeration;
- } else if (retValue instanceof java.util.Enumeration) {
- java.util.Enumeration enumeration = (java.util.Enumeration) retValue;
+ } else if (retValue instanceof Enumeration) {
+ Enumeration enumeration = (Enumeration) retValue;
- java.util.List proxies = new java.util.ArrayList();
+ List proxies = new ArrayList();
while (enumeration.hasMoreElements()) {
ProxyInfo proxyInfo = (ProxyInfo) enumeration.nextElement();
proxies.add(createProxy(proxyInfo.getPrimaryKey(), getMainInterface()));
}
- return new org.apache.openejb.util.ArrayEnumeration(proxies);
+ return new ArrayEnumeration(proxies);
} else {
- org.apache.openejb.ProxyInfo proxyInfo = (org.apache.openejb.ProxyInfo) retValue;
+ ProxyInfo proxyInfo = (ProxyInfo) retValue;
return createProxy(proxyInfo.getPrimaryKey(), getMainInterface());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java Tue Nov 19 02:43:41 2013
@@ -29,6 +29,7 @@ import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.interceptor.AroundInvoke;
import javax.interceptor.AroundTimeout;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
@@ -174,7 +175,7 @@ public class InterceptorData {
return data;
}
- private static void add(ClassFinder finder, Set<Method> methods, Class<? extends java.lang.annotation.Annotation> annotation) {
+ private static void add(ClassFinder finder, Set<Method> methods, Class<? extends Annotation> annotation) {
final List<Method> annotatedMethods = finder.findAnnotatedMethods(annotation);
for (Method method : annotatedMethods) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java Tue Nov 19 02:43:41 2013
@@ -27,7 +27,7 @@ import java.util.Map;
* @version $Rev$ $Date$
*/
public class JaxWsInvocationContext extends ReflectionInvocationContext {
- private final javax.xml.ws.handler.MessageContext messageContext;
+ private final MessageContext messageContext;
public JaxWsInvocationContext(Operation operation, List<Interceptor> interceptors, Object target, Method method, MessageContext messageContext, Object... parameters) {
super(operation, interceptors, target, method, parameters);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java Tue Nov 19 02:43:41 2013
@@ -19,6 +19,8 @@ package org.apache.openejb.core.ivm;
import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.ProxyInfo;
import org.apache.openejb.RpcContainer;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.loader.SystemInstance;
@@ -50,6 +52,7 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.rmi.AccessException;
import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -222,7 +225,7 @@ public abstract class BaseEjbProxyHandle
}
}
- protected void checkAuthorization(final Method method) throws org.apache.openejb.OpenEJBException {
+ protected void checkAuthorization(final Method method) throws OpenEJBException {
}
public void setIntraVmCopyMode(final boolean on) {
@@ -338,7 +341,7 @@ public abstract class BaseEjbProxyHandle
if (isInvalidReference) {
if (interfaceType.isComponent() && interfaceType.isLocal()) {
throw new NoSuchObjectLocalException("reference is invalid");
- } else if (interfaceType.isComponent() || java.rmi.Remote.class.isAssignableFrom(method.getDeclaringClass())) {
+ } else if (interfaceType.isComponent() || Remote.class.isAssignableFrom(method.getDeclaringClass())) {
throw new NoSuchObjectException("reference is invalid");
} else {
throw new NoSuchEJBException("reference is invalid for " + deploymentID);
@@ -361,7 +364,7 @@ public abstract class BaseEjbProxyHandle
* @param interfce Class
*/
protected Throwable convertException(Throwable e, final Method method, final Class interfce) {
- final boolean rmiRemote = java.rmi.Remote.class.isAssignableFrom(interfce);
+ final boolean rmiRemote = Remote.class.isAssignableFrom(interfce);
if (e instanceof TransactionRequiredException) {
if (!rmiRemote && interfaceType.isBusiness()) {
return new EJBTransactionRequiredException(e.getMessage()).initCause(getCause(e));
@@ -602,7 +605,7 @@ public abstract class BaseEjbProxyHandle
}
}
- public abstract org.apache.openejb.ProxyInfo getProxyInfo();
+ public abstract ProxyInfo getProxyInfo();
public BeanContext getBeanContext() {
final BeanContext beanContext = beanContextRef.get();
@@ -627,14 +630,14 @@ public abstract class BaseEjbProxyHandle
return proxyRegistry.liveHandleRegistry;
}
- private void writeObject(final java.io.ObjectOutputStream out) throws IOException {
+ private void writeObject(final ObjectOutputStream out) throws IOException {
out.defaultWriteObject();
out.writeObject(getInterfaces());
out.writeObject(getMainInterface());
}
- private void readObject(final java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
in.defaultReadObject();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java Tue Nov 19 02:43:41 2013
@@ -16,11 +16,15 @@
*/
package org.apache.openejb.core.ivm;
+import org.apache.openejb.ApplicationException;
import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.SystemException;
import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.core.entity.EntityEjbHomeHandler;
import org.apache.openejb.core.managed.ManagedHomeHandler;
@@ -37,8 +41,10 @@ import javax.ejb.AccessLocalException;
import javax.ejb.EJBAccessException;
import javax.ejb.EJBException;
import javax.ejb.EJBHome;
+import javax.ejb.Handle;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import java.lang.Object;
import java.lang.reflect.Method;
import java.rmi.AccessException;
import java.rmi.RemoteException;
@@ -177,7 +183,7 @@ public abstract class EjbHomeProxyHandle
final String methodName = method.getName();
try {
- final java.lang.Object retValue;
+ final Object retValue;
final MethodType operation = dispatchTable.get(methodName);
if (operation == null) {
@@ -204,7 +210,7 @@ public abstract class EjbHomeProxyHandle
final Class type = method.getParameterTypes()[0];
/*-- HANDLE ------- EJBHome.remove(Handle handle) ---*/
- if (javax.ejb.Handle.class.isAssignableFrom(type)) {
+ if (Handle.class.isAssignableFrom(type)) {
retValue = removeWithHandle(interfce, method, args, proxy);
} else {
/*-- PRIMARY KEY ----- EJBHome.remove(Object key) ---*/
@@ -234,7 +240,7 @@ public abstract class EjbHomeProxyHandle
throw re;
}
- } catch (org.apache.openejb.InvalidateReferenceException ire) {
+ } catch (InvalidateReferenceException ire) {
Throwable cause = ire.getRootCause();
if (cause instanceof RemoteException && interfaceType.isLocal()) {
final RemoteException re = (RemoteException) cause;
@@ -246,7 +252,7 @@ public abstract class EjbHomeProxyHandle
* Application exceptions must be reported dirctly to the client. They
* do not impact the viability of the proxy.
*/
- } catch (org.apache.openejb.ApplicationException ae) {
+ } catch (ApplicationException ae) {
final Throwable exc = ae.getRootCause() != null ? ae.getRootCause() : ae;
if (exc instanceof EJBAccessException) {
if (interfaceType.isBusiness()) {
@@ -271,13 +277,13 @@ public abstract class EjbHomeProxyHandle
* A system exception would be highly unusual and would indicate a sever
* problem with the container system.
*/
- } catch (org.apache.openejb.SystemException se) {
+ } catch (SystemException se) {
if (interfaceType.isLocal()) {
throw new EJBException("Container has suffered a SystemException").initCause(se.getRootCause());
} else {
throw new RemoteException("Container has suffered a SystemException", se.getRootCause());
}
- } catch (org.apache.openejb.OpenEJBException oe) {
+ } catch (OpenEJBException oe) {
if (interfaceType.isLocal()) {
throw new EJBException("Unknown Container Exception").initCause(oe.getRootCause());
} else {
@@ -333,11 +339,11 @@ public abstract class EjbHomeProxyHandle
}
@Override
- public org.apache.openejb.ProxyInfo getProxyInfo() {
+ public ProxyInfo getProxyInfo() {
if (getMainInterface() == null) {
throw new IllegalStateException("no main interface");
}
- return new org.apache.openejb.ProxyInfo(getBeanContext(), null, getBeanContext().getInterfaces(interfaceType), interfaceType, getMainInterface());
+ return new ProxyInfo(getBeanContext(), null, getBeanContext().getInterfaces(interfaceType), interfaceType, getMainInterface());
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java Tue Nov 19 02:43:41 2013
@@ -16,10 +16,14 @@
*/
package org.apache.openejb.core.ivm;
+import org.apache.openejb.ApplicationException;
import org.apache.openejb.BeanContext;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.SystemException;
import org.apache.openejb.async.AsynchronousPool;
import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.core.ThreadContext;
@@ -34,6 +38,8 @@ import javax.ejb.EJBAccessException;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
import java.io.ObjectStreamException;
+import java.lang.Object;
+import java.lang.Throwable;
import java.lang.reflect.Method;
import java.rmi.AccessException;
import java.rmi.RemoteException;
@@ -65,8 +71,8 @@ public abstract class EjbObjectProxyHand
@Override
public Object _invoke(final Object p, final Class interfce, final Method m, final Object[] a) throws Throwable {
- java.lang.Object retValue = null;
- java.lang.Throwable exc = null;
+ Object retValue = null;
+ Throwable exc = null;
try {
if (logger.isDebugEnabled()) {
@@ -115,7 +121,7 @@ public abstract class EjbObjectProxyHand
* The ire is thrown by the container system and propagated by
* the server to the stub.
*/
- } catch (org.apache.openejb.InvalidateReferenceException ire) {
+ } catch (InvalidateReferenceException ire) {
invalidateAllHandlers(getRegistryId());
exc = ire.getRootCause() != null ? ire.getRootCause() : new RemoteException("InvalidateReferenceException: " + ire);
throw exc;
@@ -123,7 +129,7 @@ public abstract class EjbObjectProxyHand
* Application exceptions must be reported dirctly to the client. They
* do not impact the viability of the proxy.
*/
- } catch (org.apache.openejb.ApplicationException ae) {
+ } catch (ApplicationException ae) {
exc = ae.getRootCause() != null ? ae.getRootCause() : ae;
if (exc instanceof EJBAccessException) {
if (interfaceType.isBusiness()) {
@@ -143,12 +149,12 @@ public abstract class EjbObjectProxyHand
* A system exception would be highly unusual and would indicate a sever
* problem with the container system.
*/
- } catch (org.apache.openejb.SystemException se) {
+ } catch (SystemException se) {
invalidateReference();
exc = se.getRootCause() != null ? se.getRootCause() : se;
logger.debug("The container received an unexpected exception: ", exc);
throw new RemoteException("Container has suffered a SystemException", exc);
- } catch (org.apache.openejb.OpenEJBException oe) {
+ } catch (OpenEJBException oe) {
exc = oe.getRootCause() != null ? oe.getRootCause() : oe;
logger.debug("The container received an unexpected exception: ", exc);
throw new RemoteException("Unknown Container Exception", oe.getRootCause());
@@ -185,8 +191,8 @@ public abstract class EjbObjectProxyHand
}
@Override
- public org.apache.openejb.ProxyInfo getProxyInfo() {
- return new org.apache.openejb.ProxyInfo(getBeanContext(), primaryKey, getInterfaces(), interfaceType, getMainInterface());
+ public ProxyInfo getProxyInfo() {
+ return new ProxyInfo(getBeanContext(), primaryKey, getInterfaces(), interfaceType, getMainInterface());
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java Tue Nov 19 02:43:41 2013
@@ -23,9 +23,12 @@ import org.apache.openejb.util.proxy.Pro
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+import javax.ejb.HomeHandle;
import java.io.ObjectStreamException;
+import java.io.Serializable;
-public class IntraVmHandle implements java.io.Serializable, javax.ejb.HomeHandle, javax.ejb.Handle {
+public class IntraVmHandle implements Serializable, HomeHandle, Handle {
protected Object theProxy;
public IntraVmHandle(Object proxy) {
@@ -41,7 +44,7 @@ public class IntraVmHandle implements ja
}
public Object getPrimaryKey() {
- return ((BaseEjbProxyHandler) org.apache.openejb.util.proxy.ProxyManager.getInvocationHandler(theProxy)).primaryKey;
+ return ((BaseEjbProxyHandler) ProxyManager.getInvocationHandler(theProxy)).primaryKey;
}
protected Object writeReplace() throws ObjectStreamException {
@@ -69,10 +72,10 @@ public class IntraVmHandle implements ja
*/
} else {
BaseEjbProxyHandler handler = (BaseEjbProxyHandler) ProxyManager.getInvocationHandler(theProxy);
- if (theProxy instanceof javax.ejb.EJBObject) {
+ if (theProxy instanceof EJBObject) {
ApplicationServer applicationServer = ServerFederation.getApplicationServer();
return applicationServer.getHandle(handler.getProxyInfo());
- } else if (theProxy instanceof javax.ejb.EJBHome) {
+ } else if (theProxy instanceof EJBHome) {
ApplicationServer applicationServer = ServerFederation.getApplicationServer();
return applicationServer.getHomeHandle(handler.getProxyInfo());
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java Tue Nov 19 02:43:41 2013
@@ -22,9 +22,11 @@ import org.apache.openejb.spi.Applicatio
import org.apache.openejb.util.proxy.ProxyManager;
import javax.ejb.EJBHome;
+import javax.ejb.EJBMetaData;
import java.io.ObjectStreamException;
+import java.io.Serializable;
-public class IntraVmMetaData implements javax.ejb.EJBMetaData, java.io.Serializable {
+public class IntraVmMetaData implements EJBMetaData, Serializable {
protected Class homeClass;
@@ -93,7 +95,7 @@ public class IntraVmMetaData implements
homeStub = home;
}
- public javax.ejb.EJBHome getEJBHome() {
+ public EJBHome getEJBHome() {
return homeStub;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java Tue Nov 19 02:43:41 2013
@@ -17,8 +17,9 @@
package org.apache.openejb.core.ivm;
import java.io.ObjectStreamException;
+import java.io.Serializable;
-public interface IntraVmProxy extends java.io.Serializable {
+public interface IntraVmProxy extends Serializable {
Object writeReplace() throws ObjectStreamException;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,7 @@ package org.apache.openejb.core.ivm;
import org.apache.openejb.BeanContext;
import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.spi.ApplicationServer;
import javax.ejb.EJBHome;
import javax.ejb.EJBMetaData;
@@ -25,7 +26,7 @@ import javax.ejb.EJBObject;
import javax.ejb.Handle;
import javax.ejb.HomeHandle;
-public class IntraVmServer implements org.apache.openejb.spi.ApplicationServer {
+public class IntraVmServer implements ApplicationServer {
public EJBMetaData getEJBMetaData(ProxyInfo pi) {
BeanContext beanContext = pi.getBeanContext();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,8 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.BeanContext;
+import javax.naming.NamingException;
+
/**
* @version $Rev$ $Date$
*/
@@ -29,7 +31,7 @@ public class BusinessLocalBeanReference
this.businessHome = localBeanHome;
}
- public Object getObject() throws javax.naming.NamingException {
+ public Object getObject() throws NamingException {
return businessHome.create();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,8 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.BeanContext;
+import javax.naming.NamingException;
+
/**
* @version $Rev$ $Date$
*/
@@ -29,7 +31,7 @@ public class BusinessLocalReference exte
this.businessHome = businessHome;
}
- public Object getObject() throws javax.naming.NamingException {
+ public Object getObject() throws NamingException {
return businessHome.create();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,8 @@ package org.apache.openejb.core.ivm.nami
import org.apache.openejb.BeanContext;
+import javax.naming.NamingException;
+
/**
* @version $Rev$ $Date$
*/
@@ -29,7 +31,7 @@ public class BusinessRemoteReference ext
this.businessHome = businessHome;
}
- public Object getObject() throws javax.naming.NamingException {
+ public Object getObject() throws NamingException {
return businessHome.create();
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java Tue Nov 19 02:43:41 2013
@@ -17,12 +17,15 @@
package org.apache.openejb.core.ivm.naming;
import org.apache.openejb.EnvProps;
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.spi.SecurityService;
import javax.naming.AuthenticationException;
import javax.naming.Context;
+import javax.naming.spi.InitialContextFactory;
import javax.security.auth.login.LoginException;
import java.util.Hashtable;
import java.util.Properties;
@@ -30,10 +33,10 @@ import java.util.Properties;
/**
* @deprecated Use org.apache.openejb.core.LocalInitialContextFactory
*/
-public class InitContextFactory implements javax.naming.spi.InitialContextFactory {
+public class InitContextFactory implements InitialContextFactory {
public Context getInitialContext(Hashtable env) throws javax.naming.NamingException {
- if (!org.apache.openejb.OpenEJB.isInitialized()) {
+ if (!OpenEJB.isInitialized()) {
initializeOpenEJB(env);
}
@@ -80,10 +83,10 @@ public class InitContextFactory implemen
props.putAll(env);
- org.apache.openejb.OpenEJB.init(props);
+ OpenEJB.init(props);
}
- catch (org.apache.openejb.OpenEJBException e) {
+ catch (OpenEJBException e) {
throw new NamingException("Cannot initailize OpenEJB", e);
}
catch (Exception e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java Tue Nov 19 02:43:41 2013
@@ -29,6 +29,7 @@ import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.LinkRef;
import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
import javax.naming.NameClassPair;
import javax.naming.NameNotFoundException;
import javax.naming.NameParser;
@@ -155,7 +156,7 @@ public class IvmContext implements Conte
}
if (obj == null){
- throw new javax.naming.NameNotFoundException("Name \"" + compositName + "\" not found.");
+ throw new NameNotFoundException("Name \"" + compositName + "\" not found.");
}
if (obj.getClass() == IvmContext.class)
@@ -191,7 +192,7 @@ public class IvmContext implements Conte
}
}
- throw new javax.naming.NameNotFoundException("Name \"" + compositName + "\" not found.");
+ throw new NameNotFoundException("Name \"" + compositName + "\" not found.");
}
static ObjectFactory [] federatedFactories = null;
@@ -291,7 +292,7 @@ public class IvmContext implements Conte
name = name.substring(indx + 1);
}
if (fastCache.containsKey(name))
- throw new javax.naming.NameAlreadyBoundException();
+ throw new NameAlreadyBoundException();
else {
ParsedName parsedName = new ParsedName(name);
mynode.bind(parsedName, obj);
@@ -344,7 +345,7 @@ public class IvmContext implements Conte
}
public void rename(String oldname, String newname) throws NamingException {
- throw new javax.naming.OperationNotSupportedException();
+ throw new OperationNotSupportedException();
}
public void rename(Name oldname, Name newname) throws NamingException {
@@ -378,7 +379,7 @@ public class IvmContext implements Conte
}
public void destroySubcontext(String name) throws NamingException {
- throw new javax.naming.OperationNotSupportedException();
+ throw new OperationNotSupportedException();
}
public void destroySubcontext(Name name) throws NamingException {
@@ -396,7 +397,7 @@ public class IvmContext implements Conte
name = name.substring(indx + 1);
}
if (fastCache.containsKey(name))
- throw new javax.naming.NameAlreadyBoundException();
+ throw new NameAlreadyBoundException();
else
return mynode.createSubcontext(new ParsedName(name));
}