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 [1/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...
Author: tveronezi
Date: Tue Nov 19 02:43:41 2013
New Revision: 1543294
URL: http://svn.apache.org/r1543294
Log:
Unnecessary fully qualified name
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/EndpointReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/WebServiceFeature.java
tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ManagedSecurityService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Undeploy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ValidationException.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/ActiveMQResourceAdapterBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/DataSourceBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/JmsConnectionFactoryBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/SingletonContainerBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatefulContainerBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/StatelessContainerBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/TransactionManagerBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/DurationAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ConnectorReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContextFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/ComplexKeyGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/KeyGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/InterceptorData.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxWsInvocationContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbObjectProxyHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmHandle.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmMetaData.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmProxy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmServer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalBeanReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessLocalReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/BusinessRemoteReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IvmJndiFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiEncArtifact.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JndiUrlReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/ParsedName.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/PersistenceContextReference.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/RAFPassivater.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimpleCache.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/managed/SimplePassivater.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/EjbWsContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonInstanceManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimplePassivater.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/AbstractDelegatingLogger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/osgi/client/LocalInitialContextFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSourceUtil.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/PlainTextPasswordCipher.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/XADataSourceResource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/Router.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/quartz/QuartzResourceAdapter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalHttpServletRequest.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletRequest.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/CallerPrincipal.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DurationEditor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/LinkedListStack.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStream.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/References.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SafeToolkit.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Stack.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/ProxyManager.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/EndpointReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/EndpointReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/EndpointReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/EndpointReference.java Tue Nov 19 02:43:41 2013
@@ -16,17 +16,20 @@
*/
package javax.xml.ws;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+
/**
* This class is only provided so JaxWS code can be compiled under Java6 update 4 which
* uses JaxWS 2.1. All of the methods throw UnsupportedOperationException.
*/
@SuppressWarnings({"UnusedDeclaration"})
public abstract class EndpointReference {
- public static EndpointReference readFrom(javax.xml.transform.Source eprInfoset) {
+ public static EndpointReference readFrom(Source eprInfoset) {
throw new UnsupportedOperationException("JaxWS 2.1 APIs are not supported");
}
- public abstract void writeTo(javax.xml.transform.Result result);
+ public abstract void writeTo(Result result);
public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) {
throw new UnsupportedOperationException("JaxWS 2.1 APIs are not supported");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/WebServiceFeature.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/WebServiceFeature.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/WebServiceFeature.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/WebServiceFeature.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,8 @@
*/
package javax.xml.ws;
+import java.lang.String;
+
/**
* This class is only provided so JaxWS code can be compiled under Java6 update 4 which
* uses JaxWS 2.1.
@@ -23,7 +25,7 @@ package javax.xml.ws;
public abstract class WebServiceFeature {
protected boolean enabled;
- public abstract java.lang.String getID();
+ public abstract String getID();
public boolean isEnabled() {
return enabled;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java Tue Nov 19 02:43:41 2013
@@ -19,6 +19,7 @@ package javax.xml.ws.wsaddressing;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.ws.EndpointReference;
+import java.lang.String;
/**
* This class is only provided so JaxWS code can be compiled under Java6 update 4 which
@@ -26,7 +27,7 @@ import javax.xml.ws.EndpointReference;
*/
@SuppressWarnings({"UnusedDeclaration"})
public final class W3CEndpointReference extends EndpointReference {
- protected static final java.lang.String NS = "http://www.w3.org/2005/08/addressing";
+ protected static final String NS = "http://www.w3.org/2005/08/addressing";
protected W3CEndpointReference() {
throw new UnsupportedOperationException("JaxWS 2.1 APIs are not supported");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java Tue Nov 19 02:43:41 2013
@@ -58,9 +58,12 @@ import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
import javax.ejb.EJBLocalObject;
import javax.ejb.EJBObject;
+import javax.ejb.EntityBean;
+import javax.ejb.Handle;
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.MessageDrivenBean;
+import javax.ejb.SessionBean;
import javax.ejb.TimedObject;
import javax.ejb.Timer;
import javax.enterprise.context.ConversationScoped;
@@ -69,6 +72,8 @@ import javax.enterprise.inject.spi.Decor
import javax.enterprise.inject.spi.Interceptor;
import javax.naming.Context;
import javax.persistence.EntityManagerFactory;
+import java.lang.NoSuchMethodException;
+import java.lang.Object;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -149,17 +154,17 @@ public class BeanContext extends Deploym
Collection.class.cast(Reflections.get(info, "cdiInterceptors")).clear();
}
- public interface BusinessLocalHome extends javax.ejb.EJBLocalHome {
+ public interface BusinessLocalHome extends EJBLocalHome {
Object create();
}
- public interface BusinessLocalBeanHome extends javax.ejb.EJBLocalHome {
+ public interface BusinessLocalBeanHome extends EJBLocalHome {
Object create();
}
- public interface BusinessRemoteHome extends javax.ejb.EJBHome {
+ public interface BusinessRemoteHome extends EJBHome {
Object create();
}
@@ -296,13 +301,13 @@ public class BeanContext extends Deploym
if (type != null)
return type;
- if (javax.ejb.EJBLocalHome.class.isAssignableFrom(clazz))
+ if (EJBLocalHome.class.isAssignableFrom(clazz))
return InterfaceType.EJB_LOCAL_HOME;
- if (javax.ejb.EJBLocalObject.class.isAssignableFrom(clazz))
+ if (EJBLocalObject.class.isAssignableFrom(clazz))
return InterfaceType.EJB_LOCAL;
- if (javax.ejb.EJBHome.class.isAssignableFrom(clazz))
+ if (EJBHome.class.isAssignableFrom(clazz))
return InterfaceType.EJB_HOME;
- if (javax.ejb.EJBObject.class.isAssignableFrom(clazz))
+ if (EJBObject.class.isAssignableFrom(clazz))
return InterfaceType.EJB_OBJECT;
for (final Entry<Class, InterfaceType> entry : interfaces.entrySet()) { // for @Remote case where the loaded interface can be different from the stored one
@@ -405,11 +410,11 @@ public class BeanContext extends Deploym
addInterface(getServiceEndpointInterface(), InterfaceType.SERVICE_ENDPOINT);
- addInterface(javax.ejb.EJBHome.class, InterfaceType.EJB_HOME);
- addInterface(javax.ejb.EJBObject.class, InterfaceType.EJB_OBJECT);
+ addInterface(EJBHome.class, InterfaceType.EJB_HOME);
+ addInterface(EJBObject.class, InterfaceType.EJB_OBJECT);
- addInterface(javax.ejb.EJBLocalHome.class, InterfaceType.EJB_LOCAL_HOME);
- addInterface(javax.ejb.EJBLocalObject.class, InterfaceType.EJB_LOCAL);
+ addInterface(EJBLocalHome.class, InterfaceType.EJB_LOCAL_HOME);
+ addInterface(EJBLocalObject.class, InterfaceType.EJB_LOCAL);
addInterface(getHomeInterface(), InterfaceType.EJB_HOME);
addInterface(getRemoteInterface(), InterfaceType.EJB_OBJECT);
@@ -1070,7 +1075,7 @@ public class BeanContext extends Deploym
this.instanceScopedInterceptors.addAll(interceptors);
}
- public void createMethodMap() throws org.apache.openejb.SystemException {
+ public void createMethodMap() throws SystemException {
if (getRemoteInterface() != null) {
mapObjectInterface(getLegacyView().remoteInterface);
mapHomeInterface(getLegacyView().homeInterface);
@@ -1108,8 +1113,8 @@ public class BeanContext extends Deploym
if (componentType == BeanType.STATEFUL || componentType == BeanType.MANAGED) {
Method beanMethod = null;
- if (javax.ejb.SessionBean.class.isAssignableFrom(beanClass)) {
- beanMethod = javax.ejb.SessionBean.class.getDeclaredMethod("ejbRemove");
+ if (SessionBean.class.isAssignableFrom(beanClass)) {
+ beanMethod = SessionBean.class.getDeclaredMethod("ejbRemove");
} else {
for (final Method method : getRemoveMethods()) {
if (method.getParameterTypes().length == 0) {
@@ -1122,27 +1127,27 @@ public class BeanContext extends Deploym
}
}
- Method clientMethod = EJBHome.class.getDeclaredMethod("remove", javax.ejb.Handle.class);
+ Method clientMethod = EJBHome.class.getDeclaredMethod("remove", Handle.class);
mapMethods(clientMethod, beanMethod);
- clientMethod = EJBHome.class.getDeclaredMethod("remove", java.lang.Object.class);
+ clientMethod = EJBHome.class.getDeclaredMethod("remove", Object.class);
mapMethods(clientMethod, beanMethod);
- clientMethod = javax.ejb.EJBObject.class.getDeclaredMethod("remove");
+ clientMethod = EJBObject.class.getDeclaredMethod("remove");
mapMethods(clientMethod, beanMethod);
- clientMethod = javax.ejb.EJBLocalObject.class.getDeclaredMethod("remove");
+ clientMethod = EJBLocalObject.class.getDeclaredMethod("remove");
mapMethods(clientMethod, beanMethod);
} else if (componentType == BeanType.BMP_ENTITY || componentType == BeanType.CMP_ENTITY) {
- final Method beanMethod = javax.ejb.EntityBean.class.getDeclaredMethod("ejbRemove");
- Method clientMethod = EJBHome.class.getDeclaredMethod("remove", javax.ejb.Handle.class);
+ final Method beanMethod = EntityBean.class.getDeclaredMethod("ejbRemove");
+ Method clientMethod = EJBHome.class.getDeclaredMethod("remove", Handle.class);
mapMethods(clientMethod, beanMethod);
- clientMethod = EJBHome.class.getDeclaredMethod("remove", java.lang.Object.class);
+ clientMethod = EJBHome.class.getDeclaredMethod("remove", Object.class);
mapMethods(clientMethod, beanMethod);
- clientMethod = javax.ejb.EJBObject.class.getDeclaredMethod("remove");
+ clientMethod = EJBObject.class.getDeclaredMethod("remove");
mapMethods(clientMethod, beanMethod);
- clientMethod = javax.ejb.EJBLocalObject.class.getDeclaredMethod("remove");
+ clientMethod = EJBLocalObject.class.getDeclaredMethod("remove");
mapMethods(clientMethod, beanMethod);
}
- } catch (java.lang.NoSuchMethodException nsme) {
- throw new org.apache.openejb.SystemException(nsme);
+ } catch (NoSuchMethodException nsme) {
+ throw new SystemException(nsme);
}
if (mdb != null && mdb.mdbInterface != null) {
@@ -1491,7 +1496,7 @@ public class BeanContext extends Deploym
}
// Create interceptors
- final Map<String, Object> interceptorInstances = new LinkedHashMap<String, java.lang.Object>();
+ final Map<String, Object> interceptorInstances = new LinkedHashMap<String, Object>();
// Add the stats interceptor instance and other already created interceptor instances
for (final InterceptorInstance interceptorInstance : this.getUserAndSystemInterceptors()) {
@@ -1523,7 +1528,7 @@ public class BeanContext extends Deploym
iInstance = clazz.newInstance();
}
- final InjectionProcessor interceptorInjector = new InjectionProcessor(iInstance, this.getInjections(), org.apache.openejb.InjectionProcessor.unwrap(ctx));
+ final InjectionProcessor interceptorInjector = new InjectionProcessor(iInstance, this.getInjections(), InjectionProcessor.unwrap(ctx));
try {
final Object interceptorInstance = interceptorInjector.createInstance();
if (webBeansContext != null) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java Tue Nov 19 02:43:41 2013
@@ -49,6 +49,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
+import java.util.jar.JarFile;
import java.util.zip.ZipFile;
/**
@@ -167,24 +168,24 @@ public class ClassLoaderUtil {
if (null != cl && cl instanceof URLClassLoader) {
final URLClassLoader ucl = (URLClassLoader) cl;
- final Class clazz = java.net.URLClassLoader.class;
+ final Class clazz = URLClassLoader.class;
try {
- final java.lang.reflect.Field ucp = clazz.getDeclaredField("ucp");
+ final Field ucp = clazz.getDeclaredField("ucp");
ucp.setAccessible(true);
final Object cp = ucp.get(ucl);
- final java.lang.reflect.Field loaders = cp.getClass().getDeclaredField("loaders");
+ final Field loaders = cp.getClass().getDeclaredField("loaders");
loaders.setAccessible(true);
- final java.util.Collection c = (java.util.Collection) loaders.get(cp);
- java.lang.reflect.Field loader;
- java.util.jar.JarFile jf;
+ final Collection c = (Collection) loaders.get(cp);
+ Field loader;
+ JarFile jf;
for (final Object jl : c.toArray()) {
try {
loader = jl.getClass().getDeclaredField("jar");
loader.setAccessible(true);
- jf = (java.util.jar.JarFile) loader.get(jl);
+ jf = (JarFile) loader.get(jl);
files.add(jf.getName());
jf.close();
} catch (Throwable t) {
@@ -204,7 +205,7 @@ public class ClassLoaderUtil {
boolean res = false;
final Class classClassLoader = ClassLoader.class;
- java.lang.reflect.Field nativeLibraries = null;
+ Field nativeLibraries = null;
try {
nativeLibraries = classClassLoader.getDeclaredField("nativeLibraries");
@@ -231,7 +232,7 @@ public class ClassLoaderUtil {
res = true;
final Vector java_lang_ClassLoader_NativeLibrary = (Vector) obj;
- java.lang.reflect.Method finalize;
+ Method finalize;
for (final Object lib : java_lang_ClassLoader_NativeLibrary) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Tue Nov 19 02:43:41 2013
@@ -18,6 +18,7 @@ package org.apache.openejb;
import org.apache.openejb.assembler.classic.DeploymentExceptionManager;
import org.apache.openejb.cdi.CdiBuilder;
+import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ApplicationServer;
import org.apache.openejb.spi.Assembler;
@@ -62,7 +63,7 @@ public final class OpenEJB {
* org.apache.openejb.core.ivm.naming.InitContextFactory
*/
public Instance(final Properties props) throws OpenEJBException {
- this(props, new org.apache.openejb.core.ServerFederation());
+ this(props, new ServerFederation());
}
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Tue Nov 19 02:43:41 2013
@@ -42,6 +42,7 @@ import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
import javax.enterprise.inject.Alternative;
+import javax.validation.ValidationException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -250,13 +251,13 @@ public class DeployerEjb implements Depl
LOGGER.error("Can't deploy " + inLocation, e);
- if (e instanceof javax.validation.ValidationException) {
- throw (javax.validation.ValidationException) e;
+ if (e instanceof ValidationException) {
+ throw (ValidationException) e;
}
if (e instanceof OpenEJBException) {
- if (e.getCause() instanceof javax.validation.ValidationException) {
- throw (javax.validation.ValidationException) e.getCause();
+ if (e.getCause() instanceof ValidationException) {
+ throw (ValidationException) e.getCause();
}
throw (OpenEJBException) e;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue Nov 19 02:43:41 2013
@@ -67,6 +67,7 @@ import org.apache.openejb.core.CoreConta
import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.JndiFactory;
import org.apache.openejb.core.ParentClassLoaderFinder;
+import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.core.SimpleTransactionSynchronizationRegistry;
import org.apache.openejb.core.TransactionSynchronizationRegistryWrapper;
import org.apache.openejb.core.WebContext;
@@ -234,7 +235,7 @@ public class Assembler extends Assembler
private final RemoteResourceMonitor remoteResourceMonitor = new RemoteResourceMonitor();
@Override
- public org.apache.openejb.spi.ContainerSystem getContainerSystem() {
+ public ContainerSystem getContainerSystem() {
return containerSystem;
}
@@ -301,7 +302,7 @@ public class Assembler extends Assembler
final ApplicationServer appServer = system.getComponent(ApplicationServer.class);
if (appServer == null) {
- system.setComponent(ApplicationServer.class, new org.apache.openejb.core.ServerFederation());
+ system.setComponent(ApplicationServer.class, new ServerFederation());
}
system.setComponent(EjbResolver.class, new EjbResolver(null, EjbResolver.Scope.GLOBAL));
@@ -445,7 +446,7 @@ public class Assembler extends Assembler
* This method leverage the other assemble and apply methods which
* can be used independently.
* <p/>
- * Assembles and returns the {@link org.apache.openejb.core.CoreContainerSystem} using the
+ * Assembles and returns the {@link CoreContainerSystem} using the
* information from the {@link OpenEjbConfiguration} object passed in.
* <pre>
* This method performs the following actions(in order):
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AssemblerTool.java Tue Nov 19 02:43:41 2013
@@ -16,11 +16,16 @@
*/
package org.apache.openejb.assembler.classic;
+import org.apache.openejb.Container;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.Messages;
import org.apache.openejb.util.SafeToolkit;
import org.apache.openejb.util.proxy.ProxyFactory;
+import javax.resource.spi.ConnectionManager;
+import javax.resource.spi.ManagedConnectionFactory;
+import javax.resource.spi.ResourceAdapter;
import javax.transaction.TransactionManager;
import java.util.HashMap;
import java.util.Map;
@@ -31,12 +36,12 @@ public class AssemblerTool {
public static final Map<String, Class> serviceInterfaces = new HashMap<String, Class>();
static {
serviceInterfaces.put("ProxyFactory", ProxyFactory.class);
- serviceInterfaces.put("SecurityService", org.apache.openejb.spi.SecurityService.class);
+ serviceInterfaces.put("SecurityService", SecurityService.class);
serviceInterfaces.put("TransactionManager", TransactionManager.class);
- serviceInterfaces.put("ConnectionManager", javax.resource.spi.ConnectionManager.class);
- serviceInterfaces.put("Connector", javax.resource.spi.ManagedConnectionFactory.class);
- serviceInterfaces.put("Resource", javax.resource.spi.ResourceAdapter.class);
- serviceInterfaces.put("Container", org.apache.openejb.Container.class);
+ serviceInterfaces.put("ConnectionManager", ConnectionManager.class);
+ serviceInterfaces.put("Connector", ManagedConnectionFactory.class);
+ serviceInterfaces.put("Resource", ResourceAdapter.class);
+ serviceInterfaces.put("Container", Container.class);
}
protected static final Messages messages = new Messages("org.apache.openejb.util.resources");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java Tue Nov 19 02:43:41 2013
@@ -289,12 +289,12 @@ public class JaccPermissionsBuilder {
* @param methodInterface the EJB method interface
* @param clazz clazz
*
- * @throws org.apache.openejb.OpenEJBException
+ * @throws OpenEJBException
* in case a class could not be found
*/
public void addPossibleEjbMethodPermissions(PermissionCollection permissions, String ejbName, String methodInterface, Class clazz) throws OpenEJBException {
if (clazz == null) return;
- for (java.lang.reflect.Method method : clazz.getMethods()) {
+ for (Method method : clazz.getMethods()) {
String methodIface = "LocalBean".equals(methodInterface) || "LocalBeanHome".equals(methodInterface) ? null : methodInterface;
permissions.add(new EJBMethodPermission(ejbName, methodIface, method));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Tue Nov 19 02:43:41 2013
@@ -40,7 +40,9 @@ import javax.naming.Context;
import javax.naming.NameAlreadyBoundException;
import javax.naming.NamingException;
import javax.naming.Reference;
+import java.lang.Class;
import java.lang.reflect.Constructor;
+import java.rmi.Remote;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
@@ -181,7 +183,7 @@ public class JndiBuilder {
public static class TemplatedStrategy implements JndiNameStrategy {
private static final String JNDINAME_FORMAT = "openejb.jndiname.format";
private static final String KEYS = "default,local,global,app";
- private org.apache.openejb.util.StringTemplate template;
+ private StringTemplate template;
private HashMap<String, EnterpriseBeanInfo> beanInfos;
// Set in begin()
@@ -727,9 +729,9 @@ public class JndiBuilder {
public static class RemoteInterfaceComparator implements Comparator<Class> {
- public int compare(java.lang.Class a, java.lang.Class b) {
- boolean aIsRmote = java.rmi.Remote.class.isAssignableFrom(a);
- boolean bIsRmote = java.rmi.Remote.class.isAssignableFrom(b);
+ public int compare(Class a, Class b) {
+ boolean aIsRmote = Remote.class.isAssignableFrom(a);
+ boolean bIsRmote = Remote.class.isAssignableFrom(b);
if (aIsRmote == bIsRmote) return 0;
return aIsRmote ? 1 : -1;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ProxyInterfaceResolver.java Tue Nov 19 02:43:41 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.assembler.classic;
import java.lang.reflect.Method;
+import java.rmi.Remote;
import java.util.ArrayList;
import java.util.List;
@@ -71,7 +72,7 @@ public class ProxyInterfaceResolver {
List<Class> remotes = new ArrayList<Class>();
List<Class> nonremotes = new ArrayList<Class>();
for (Class interfce : valid) {
- if (java.rmi.Remote.class.isAssignableFrom(interfce)){
+ if (Remote.class.isAssignableFrom(interfce)){
remotes.add(interfce);
} else {
nonremotes.add(interfce);
@@ -100,7 +101,7 @@ public class ProxyInterfaceResolver {
// Show affinity for the remote interfaces if the main
// interface is a java.rmi.Remote
- if (java.rmi.Remote.class.isAssignableFrom(mainInterface)){
+ if (Remote.class.isAssignableFrom(mainInterface)){
for (Class interfce : remotes) {
addIfNotConflicting(interfce, valid, proxySignatures);
}
@@ -189,8 +190,8 @@ public class ProxyInterfaceResolver {
if (!sig.equals(signature.sig)) return false;
- boolean aIsRemote = java.rmi.Remote.class.isAssignableFrom(clazz);
- boolean bIsRemote = java.rmi.Remote.class.isAssignableFrom(signature.clazz);
+ boolean aIsRemote = Remote.class.isAssignableFrom(clazz);
+ boolean bIsRemote = Remote.class.isAssignableFrom(signature.clazz);
return !(aIsRemote == bIsRemote);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java Tue Nov 19 02:43:41 2013
@@ -51,6 +51,7 @@ import javax.persistence.SharedCacheMode
import javax.persistence.ValidationMode;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.metamodel.Metamodel;
+import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
@@ -404,7 +405,7 @@ public class ReloadableEntityManagerFact
entityManagerFactoryCallable.getUnitInfo().getManagedClassNames().remove(clazz);
}
- public javax.persistence.spi.PersistenceUnitInfo info() {
+ public PersistenceUnitInfo info() {
return entityManagerFactoryCallable.getUnitInfo();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceReferenceInfo.java Tue Nov 19 02:43:41 2013
@@ -16,11 +16,13 @@
*/
package org.apache.openejb.assembler.classic;
+import java.util.Properties;
+
public class ResourceReferenceInfo extends InjectableInfo {
public String referenceType;
public String referenceAuth;
public String resourceID;
- public java.util.Properties properties;
+ public Properties properties;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java Tue Nov 19 02:43:41 2013
@@ -34,7 +34,10 @@ import org.apache.openejb.util.URISuppor
import javax.naming.Context;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.ServiceUnavailableException;
import java.io.File;
+import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -89,11 +92,11 @@ public class Info2Properties {
try {
final InitialContext ctx = new InitialContext(p);
configInfo = (ConfigurationInfo) ctx.lookup("openejb/ConfigurationInfoBusinessRemote");
- } catch (javax.naming.ServiceUnavailableException e) {
+ } catch (ServiceUnavailableException e) {
System.out.println(e.getCause().getMessage());
System.out.println(messages.format("cmd.deploy.serverOffline"));
System.exit(1);
- } catch (javax.naming.NamingException e) {
+ } catch (NamingException e) {
System.out.println("ConfigurationInfo does not exist in server '" + serverUrl + "', check the server logs to ensure it exists and has not been removed.");
System.exit(2);
}
@@ -292,7 +295,7 @@ public class Info2Properties {
// Filter out the stupid date comment the Properties.store() method
// adds seemingly no matter what.
- static class Filter extends java.io.FilterOutputStream {
+ static class Filter extends FilterOutputStream {
private boolean pastFirstLine;
public Filter(final OutputStream out) {
@@ -306,7 +309,7 @@ public class Info2Properties {
}
- static class CommentsFilter extends java.io.FilterOutputStream {
+ static class CommentsFilter extends FilterOutputStream {
public CommentsFilter(final OutputStream out) {
super(out);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ManagedSecurityService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ManagedSecurityService.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ManagedSecurityService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ManagedSecurityService.java Tue Nov 19 02:43:41 2013
@@ -32,7 +32,7 @@ public class ManagedSecurityService impl
@Override
public Principal getCurrentPrincipal() {
- final SecurityService<?> service = SystemInstance.get().getComponent(org.apache.openejb.spi.SecurityService.class);
+ final SecurityService<?> service = SystemInstance.get().getComponent(SecurityService.class);
if(service != null) {
return service.getCallerPrincipal();
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Tue Nov 19 02:43:41 2013
@@ -24,6 +24,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import org.apache.webbeans.config.BeansDeployer;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
@@ -72,7 +73,7 @@ public class OpenEJBLifecycle implements
private final boolean skipClassNotFoundError;
/**Deploy discovered beans*/
- private final org.apache.webbeans.config.BeansDeployer deployer;
+ private final BeansDeployer deployer;
/**XML discovery. */
//XML discovery is removed from the specification. It is here for next revisions of spec.
@@ -94,7 +95,7 @@ public class OpenEJBLifecycle implements
this.beanManager = webBeansContext.getBeanManagerImpl();
this.xmlDeployer = new WebBeansXMLConfigurator();
- this.deployer = new org.apache.webbeans.config.BeansDeployer(this.xmlDeployer, webBeansContext);
+ this.deployer = new BeansDeployer(this.xmlDeployer, webBeansContext);
this.jndiService = webBeansContext.getService(JNDIService.class);
this.beanManager.setXMLConfigurator(this.xmlDeployer);
this.scannerService = webBeansContext.getScannerService();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java Tue Nov 19 02:43:41 2013
@@ -227,7 +227,7 @@ public class WebappBeanManager extends B
}
@Override
- public ExpressionFactory wrapExpressionFactory(javax.el.ExpressionFactory expressionFactory) {
+ public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory) {
return super.wrapExpressionFactory(expressionFactory);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java Tue Nov 19 02:43:41 2013
@@ -17,6 +17,8 @@
package org.apache.openejb.client;
+import org.apache.openejb.core.LocalInitialContextFactory;
+
import javax.naming.NamingException;
import java.util.Hashtable;
@@ -24,7 +26,7 @@ import java.util.Hashtable;
* @deprecated use org.apache.openejb.core.LocalInitialContext
*/
public class LocalInitialContext extends org.apache.openejb.core.LocalInitialContext {
- public LocalInitialContext(Hashtable env, org.apache.openejb.core.LocalInitialContextFactory factory) throws NamingException {
+ public LocalInitialContext(Hashtable env, LocalInitialContextFactory factory) throws NamingException {
super(env, factory);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Tue Nov 19 02:43:41 2013
@@ -96,6 +96,7 @@ import org.apache.openejb.jee.SecurityId
import org.apache.openejb.jee.SecurityRoleRef;
import org.apache.openejb.jee.ServiceRef;
import org.apache.openejb.jee.Servlet;
+import org.apache.openejb.jee.Session;
import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.SingletonBean;
@@ -142,6 +143,7 @@ import javax.annotation.security.RunAs;
import javax.annotation.sql.DataSourceDefinition;
import javax.annotation.sql.DataSourceDefinitions;
import javax.ejb.AccessTimeout;
+import javax.ejb.ActivationConfigProperty;
import javax.ejb.AfterBegin;
import javax.ejb.AfterCompletion;
import javax.ejb.ApplicationException;
@@ -167,6 +169,8 @@ import javax.ejb.PrePassivate;
import javax.ejb.Remote;
import javax.ejb.RemoteHome;
import javax.ejb.Remove;
+import javax.ejb.Schedule;
+import javax.ejb.Schedules;
import javax.ejb.Singleton;
import javax.ejb.Startup;
import javax.ejb.Stateful;
@@ -215,6 +219,8 @@ import java.beans.PropertyDescriptor;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
+import java.lang.NoClassDefFoundError;
+import java.lang.Object;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -1296,7 +1302,7 @@ public class AnnotationDeployer implemen
managedClasses.add(className);
} catch (final ClassNotFoundException e) {
notLoadedClasses.add(rawClassName);
- } catch (final java.lang.NoClassDefFoundError e) {
+ } catch (final NoClassDefFoundError e) {
// no-op
}
}
@@ -2639,14 +2645,14 @@ public class AnnotationDeployer implemen
activationConfig.addProperty("destination", messageDriven.mappedName());
}
- javax.ejb.ActivationConfigProperty[] configProperties = messageDriven.activationConfig();
+ ActivationConfigProperty[] configProperties = messageDriven.activationConfig();
if (configProperties != null) {
if (mdb.getActivationConfig() == null) {
mdb.setActivationConfig(activationConfig);
}
Properties properties = activationConfig.toProperties();
- for (javax.ejb.ActivationConfigProperty property : configProperties) {
+ for (ActivationConfigProperty property : configProperties) {
if (!properties.containsKey(property.propertyName())) {
activationConfig.addProperty(property.propertyName(), property.propertyValue());
}
@@ -3369,8 +3375,8 @@ public class AnnotationDeployer implemen
}
TimerConsumer timerConsumer = (TimerConsumer)bean;
Set<Annotated<Method>> scheduleMethods = new HashSet<Annotated<Method>>();
- scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Schedules.class));
- scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(javax.ejb.Schedule.class));
+ scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(Schedules.class));
+ scheduleMethods.addAll(annotationFinder.findMetaAnnotatedMethods(Schedule.class));
List<Timer> timers = timerConsumer.getTimer();
@@ -3389,19 +3395,19 @@ public class AnnotationDeployer implemen
continue;
}
- List<javax.ejb.Schedule> scheduleAnnotationList = new ArrayList<javax.ejb.Schedule>();
+ List<Schedule> scheduleAnnotationList = new ArrayList<Schedule>();
- javax.ejb.Schedules schedulesAnnotation = method.getAnnotation(javax.ejb.Schedules.class);
+ Schedules schedulesAnnotation = method.getAnnotation(Schedules.class);
if (schedulesAnnotation != null) {
scheduleAnnotationList.addAll(asList(schedulesAnnotation.value()));
}
- javax.ejb.Schedule scheduleAnnotation = method.getAnnotation(javax.ejb.Schedule.class);
+ Schedule scheduleAnnotation = method.getAnnotation(Schedule.class);
if (scheduleAnnotation != null) {
scheduleAnnotationList.add(scheduleAnnotation);
}
- for (javax.ejb.Schedule schedule : scheduleAnnotationList) {
+ for (Schedule schedule : scheduleAnnotationList) {
Timer timer = new Timer();
timer.setPersistent(schedule.persistent());
timer.setInfo(schedule.info() == null || schedule.info().isEmpty() ? null : schedule.info());
@@ -3484,8 +3490,8 @@ public class AnnotationDeployer implemen
}
}
- if (bean instanceof org.apache.openejb.jee.Session) {
- org.apache.openejb.jee.Session session = (org.apache.openejb.jee.Session) bean;
+ if (bean instanceof Session) {
+ Session session = (Session) bean;
/*
* @AfterBegin
@@ -4438,7 +4444,7 @@ public class AnnotationDeployer implemen
}
private void buildDataSourceDefinition(JndiConsumer consumer, DataSourceDefinition d) {
- final org.apache.openejb.jee.DataSource dataSource = new org.apache.openejb.jee.DataSource();
+ final DataSource dataSource = new DataSource();
dataSource.setName(d.name());
dataSource.setClassName(d.className());
@@ -4549,7 +4555,7 @@ public class AnnotationDeployer implemen
// reference type
if (serviceRef.getServiceRefType() == null || "".equals(serviceRef.getServiceRefType())) {
- if (webService.type() != java.lang.Object.class) {
+ if (webService.type() != Object.class) {
serviceRef.setServiceRefType(webService.type().getName());
} else {
serviceRef.setServiceRefType(member.getType().getName());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Tue Nov 19 02:43:41 2013
@@ -43,6 +43,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.config.sys.Container;
import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.sys.Service;
import org.apache.openejb.config.sys.ServiceProvider;
import org.apache.openejb.jee.AdminObject;
import org.apache.openejb.jee.ApplicationClient;
@@ -314,8 +315,8 @@ class AppInfoBuilder {
}
private void buildAppServices(final AppModule appModule, final AppInfo appInfo) throws OpenEJBException {
- final Collection<org.apache.openejb.config.sys.Service> services = appModule.getServices();
- for (final org.apache.openejb.config.sys.Service service : services) {
+ final Collection<Service> services = appModule.getServices();
+ for (final Service service : services) {
final ServiceInfo info = this.configFactory.configureService(service, ServiceInfo.class);
appInfo.services.add(info);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java Tue Nov 19 02:43:41 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.config.sys.Service;
import org.apache.openejb.core.ParentClassLoaderFinder;
import org.apache.openejb.jee.Application;
import org.apache.openejb.jee.jpa.EntityMappings;
@@ -58,7 +59,7 @@ public class AppModule implements Deploy
private final Map<String, TransactionType> txTypeByUnit = new HashMap<String, TransactionType>();
// TODO We could turn this into the Resources JAXB object and support containers and other things as well
private final Collection<Resource> resources = new HashSet<Resource>();
- private final Collection<org.apache.openejb.config.sys.Service> services = new HashSet<org.apache.openejb.config.sys.Service>();
+ private final Collection<Service> services = new HashSet<Service>();
private final ClassLoader classLoader;
private EntityMappings cmpMappings;
private final Map<String, Object> altDDs = new HashMap<String, Object>();
@@ -334,7 +335,7 @@ public class AppModule implements Deploy
return resources;
}
- public Collection<org.apache.openejb.config.sys.Service> getServices() {
+ public Collection<Service> getServices() {
return services;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Tue Nov 19 02:43:41 2013
@@ -28,6 +28,7 @@ import org.apache.openejb.jee.AssemblyDe
import org.apache.openejb.jee.ConnectionDefinition;
import org.apache.openejb.jee.Connector;
import org.apache.openejb.jee.EnterpriseBean;
+import org.apache.openejb.jee.EntityBean;
import org.apache.openejb.jee.InboundResourceadapter;
import org.apache.openejb.jee.InjectionTarget;
import org.apache.openejb.jee.JndiConsumer;
@@ -42,6 +43,7 @@ import org.apache.openejb.jee.Persistenc
import org.apache.openejb.jee.PersistenceType;
import org.apache.openejb.jee.ResourceAdapter;
import org.apache.openejb.jee.ResourceRef;
+import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.jpa.unit.Persistence;
import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
@@ -1261,23 +1263,23 @@ public class AutoConfig implements Dynam
}
private static String getType(final EnterpriseBean enterpriseBean) throws OpenEJBException {
- if (enterpriseBean instanceof org.apache.openejb.jee.EntityBean) {
- if (((org.apache.openejb.jee.EntityBean) enterpriseBean).getPersistenceType() == PersistenceType.CONTAINER) {
+ if (enterpriseBean instanceof EntityBean) {
+ if (((EntityBean) enterpriseBean).getPersistenceType() == PersistenceType.CONTAINER) {
return BeanTypes.CMP_ENTITY;
} else {
return BeanTypes.BMP_ENTITY;
}
- } else if (enterpriseBean instanceof org.apache.openejb.jee.SessionBean) {
- if (((org.apache.openejb.jee.SessionBean) enterpriseBean).getSessionType() == SessionType.STATEFUL) {
+ } else if (enterpriseBean instanceof SessionBean) {
+ if (((SessionBean) enterpriseBean).getSessionType() == SessionType.STATEFUL) {
return BeanTypes.STATEFUL;
- } else if (((org.apache.openejb.jee.SessionBean) enterpriseBean).getSessionType() == SessionType.SINGLETON) {
+ } else if (((SessionBean) enterpriseBean).getSessionType() == SessionType.SINGLETON) {
return BeanTypes.SINGLETON;
- } else if (((org.apache.openejb.jee.SessionBean) enterpriseBean).getSessionType() == SessionType.MANAGED) {
+ } else if (((SessionBean) enterpriseBean).getSessionType() == SessionType.MANAGED) {
return BeanTypes.MANAGED;
} else {
return BeanTypes.STATELESS;
}
- } else if (enterpriseBean instanceof org.apache.openejb.jee.MessageDrivenBean) {
+ } else if (enterpriseBean instanceof MessageDrivenBean) {
return BeanTypes.MESSAGE;
}
throw new OpenEJBException("Unknown enterprise bean type " + enterpriseBean.getClass().getName());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java Tue Nov 19 02:43:41 2013
@@ -25,6 +25,10 @@ import org.apache.openejb.jee.JndiRefere
import org.apache.openejb.jee.ResourceEnvRef;
import javax.enterprise.inject.spi.BeanManager;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
import java.util.Map;
public class BuiltInEnvironmentEntries implements DynamicDeployer {
@@ -65,10 +69,10 @@ public class BuiltInEnvironmentEntries i
// Standard References to built-in objects
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/BeanManager").type(BeanManager.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/Validator").type(javax.validation.Validator.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/ValidatorFactory").type(javax.validation.ValidatorFactory.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/TransactionManager").type(javax.transaction.TransactionManager.class));
- add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/TransactionSynchronizationRegistry").type(javax.transaction.TransactionSynchronizationRegistry.class));
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/Validator").type(Validator.class));
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/ValidatorFactory").type(ValidatorFactory.class));
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/TransactionManager").type(TransactionManager.class));
+ add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/TransactionSynchronizationRegistry").type(TransactionSynchronizationRegistry.class));
// OpenEJB specific feature
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Cipher.java Tue Nov 19 02:43:41 2013
@@ -35,7 +35,7 @@ import java.sql.SQLException;
import java.util.Map;
/**
- * Command line tool on top of the {@link org.apache.openejb.resource.jdbc.cipher.PasswordCipher} interface. Basically,
+ * Command line tool on top of the {@link PasswordCipher} interface. Basically,
* it allows end user to encrypt/decrypt a string (ie. a password) using a cipher
* implementation.
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java Tue Nov 19 02:43:41 2013
@@ -62,6 +62,7 @@ import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Strings;
import javax.ejb.EJBLocalObject;
+import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
@@ -766,7 +767,7 @@ public class CmpJpaConversion implements
MappedSuperclass idclass = null;
// now validate the primary class fields against the bean cmp fields
// to make sure everything maps correctly.
- for (java.lang.reflect.Field pkField : pkClass.getFields()) {
+ for (Field pkField : pkClass.getFields()) {
String pkFieldName = pkField.getName();
int modifiers = pkField.getModifiers();
if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers) && allFields.contains(pkFieldName)) {
@@ -885,7 +886,7 @@ public class CmpJpaConversion implements
pkClass = classLoader.loadClass(bean.getPrimKeyClass());
MappedSuperclass superclass = null;
MappedSuperclass idclass = null;
- for (java.lang.reflect.Field pkField : pkClass.getFields()) {
+ for (Field pkField : pkClass.getFields()) {
String fieldName = pkField.getName();
int modifiers = pkField.getModifiers();
// the primary key fields must be public, non-static, must be defined as a CMP field,
@@ -1019,7 +1020,7 @@ public class CmpJpaConversion implements
// This is a single target for the relationship mapping for each
// class in the hierarchy.
MappedSuperclass superclass = new MappedSuperclass(clazz.getName());
- for (java.lang.reflect.Field field : clazz.getDeclaredFields()) {
+ for (Field field : clazz.getDeclaredFields()) {
if (!field.isSynthetic()) {
String fieldName = field.getName();
// if this is one of bean's persistence fields, create the mapping
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java Tue Nov 19 02:43:41 2013
@@ -142,7 +142,7 @@ public class ConfigUtils {
}
}
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
throw new OpenEJBException("Could not locate config file: ", e);
}
@@ -157,7 +157,7 @@ public class ConfigUtils {
return new String[] { path };
}
- public static File createConfig(File config) throws java.io.IOException {
+ public static File createConfig(File config) throws IOException {
ResourceFinder finder = new ResourceFinder("");
URL defaultConfig = finder.find("default.openejb.conf");
@@ -181,7 +181,7 @@ public class ConfigUtils {
* to add it to the config or go any futher.
*/
if (jar.equals(target)) return false;
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
/* No handling needed. If there is a problem
* resolving a config file path, it is better to
* just add this jars path explicitly.
@@ -199,7 +199,7 @@ public class ConfigUtils {
* any futher.
*/
if (jarDir != null && jarDir.equals(target)) return false;
- } catch (java.io.IOException e) {
+ } catch (IOException e) {
/* No handling needed. If there is a problem
* resolving a config file path, it is better to
* just add this jars path explicitly.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Tue Nov 19 02:43:41 2013
@@ -1264,7 +1264,7 @@ public class ConfigurationFactory implem
* @param providerId String
* @param serviceType String
* @return ServiceInfo T
- * @throws org.apache.openejb.OpenEJBException
+ * @throws OpenEJBException
*
*/
public <T extends ServiceInfo> T configureService(final Class<? extends T> type, final String serviceId, final Properties declaredProperties, final String providerId, final String serviceType) throws OpenEJBException {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/Deploy.java Tue Nov 19 02:43:41 2013
@@ -45,6 +45,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.List;
@@ -141,11 +143,11 @@ public class Deploy {
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(messages.format("cmd.deploy.serverOffline"));
throw new SystemExitException(-1);
- } catch (javax.naming.NamingException e) {
+ } catch (NamingException e) {
System.out.println("openejb/DeployerBusinessRemote 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/DeploymentModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java Tue Nov 19 02:43:41 2013
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
/**
@@ -54,7 +55,7 @@ public interface DeploymentModule {
void setStandaloneModule(boolean isStandalone);
- java.util.Properties getProperties();
+ Properties getProperties();
AppModule appModule();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Tue Nov 19 02:43:41 2013
@@ -149,7 +149,7 @@ public class DeploymentsResolver impleme
Files.dir(dir);
Files.notHidden(dir);
- final Map<String, File> files = new LinkedHashMap<String, java.io.File>();
+ final Map<String, File> files = new LinkedHashMap<String, File>();
final File[] list = dir.listFiles(new FileFilter() {
@Override
public boolean accept(final File f) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java Tue Nov 19 02:43:41 2013
@@ -157,11 +157,11 @@ public class EjbJarInfoBuilder {
for (EnterpriseBean bean : jar.getEjbJar().getEnterpriseBeans()) {
EnterpriseBeanInfo beanInfo;
- if (bean instanceof org.apache.openejb.jee.SessionBean) {
+ if (bean instanceof SessionBean) {
beanInfo = initSessionBean((SessionBean) bean, ejbJar, ejbds);
- } else if (bean instanceof org.apache.openejb.jee.EntityBean) {
+ } else if (bean instanceof EntityBean) {
beanInfo = initEntityBean((EntityBean) bean, ejbds);
- } else if (bean instanceof org.apache.openejb.jee.MessageDrivenBean) {
+ } else if (bean instanceof MessageDrivenBean) {
beanInfo = initMessageBean((MessageDrivenBean) bean, ejbds);
} else {
throw new OpenEJBException("Unknown bean type: "+bean.getClass().getName());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java Tue Nov 19 02:43:41 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.api.jmx.MBean;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.xbean.finder.Annotated;
@@ -50,7 +51,7 @@ public class MBeanDeployer implements Dy
}
final Collection<Class<? extends Annotation>> mbeanClasses = new ArrayList<Class<? extends Annotation>>(2);
- mbeanClasses.add(org.apache.openejb.api.jmx.MBean.class);
+ mbeanClasses.add(MBean.class);
try { // for OSGi environment, javax.management is imported by the JRE
mbeanClasses.add((Class<? extends Annotation>) cl.loadClass("javax.management.MBean"));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceEndpoint.java Tue Nov 19 02:43:41 2013
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.config;
+import java.lang.Class;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -26,5 +27,5 @@ import java.lang.annotation.RetentionPol
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface ServiceEndpoint {
- java.lang.Class[] value() default {};
+ Class[] value() default {};
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?rev=1543294&r1=1543293&r2=1543294&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java Tue Nov 19 02:43:41 2013
@@ -484,7 +484,7 @@ public class SunConversion implements Dy
}
// map ejb-refs
- Map<String,org.apache.openejb.jee.JndiReference> refMap = new TreeMap<String,org.apache.openejb.jee.JndiReference>();
+ Map<String,JndiReference> refMap = new TreeMap<String,JndiReference>();
refMap.putAll(webApp.getEjbRefMap());
refMap.putAll(webApp.getEjbLocalRefMap());
@@ -492,7 +492,7 @@ public class SunConversion implements Dy
for (EjbRef ref : sunWebApp.getEjbRef()) {
if (ref.getJndiName() != null) {
String refName = ref.getEjbRefName();
- org.apache.openejb.jee.JndiReference ejbRef = refMap.get(refName);
+ JndiReference ejbRef = refMap.get(refName);
if (ejbRef == null) {
ejbRef = new org.apache.openejb.jee.EjbRef();
ejbRef.setName(refName);
@@ -816,7 +816,7 @@ public class SunConversion implements Dy
// skip all non-CMP beans
EnterpriseBean enterpriseBean = ejbJar.getEnterpriseBean(ejb.getEjbName());
- if (!(enterpriseBean instanceof org.apache.openejb.jee.EntityBean) ||
+ if (!(enterpriseBean instanceof EntityBean) ||
((EntityBean) enterpriseBean).getPersistenceType() != PersistenceType.CONTAINER) {
continue;
}