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/27 21:09:07 UTC
svn commit: r1546177 - in /tomee/tomee/trunk/container/openejb-core: ./
src/main/java/javax/xml/ws/wsaddressing/
src/main/java/org/apache/openejb/assembler/classic/
src/main/java/org/apache/openejb/cdi/
src/main/java/org/apache/openejb/config/ src/main...
Author: tveronezi
Date: Wed Nov 27 20:09:06 2013
New Revision: 1546177
URL: http://svn.apache.org/r1546177
Log:
https://issues.apache.org/jira/browse/OPENEJB-2054
PMD unusedcode.xml rule.
Removed:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DatabaseTimerStore.java
Modified:
tomee/tomee/trunk/container/openejb-core/pom.xml
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/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.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/cdi/CustomELAdapter.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/ThreadSingletonServiceImpl.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/AppValidator.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/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/EjbJarInfoBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.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/WikiGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.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/mdb/MdbInstanceFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.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/util/ConfUtils.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/urlhandler/resource/Handler.java
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Wed Nov 27 20:09:06 2013
@@ -258,6 +258,7 @@
<ruleset>${project.basedir}/src/main/config/pmd/openejb-empty.xml</ruleset>
<ruleset>rulesets/java/finalizers.xml</ruleset>
<ruleset>rulesets/java/imports.xml</ruleset>
+ <ruleset>rulesets/java/unusedcode.xml</ruleset>
</rulesets>
</configuration>
<executions>
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -24,7 +24,7 @@ import javax.xml.ws.EndpointReference;
* 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"})
+@SuppressWarnings({"UnusedDeclaration", "PMD"})
public final class W3CEndpointReference extends EndpointReference {
protected static final String NS = "http://www.w3.org/2005/08/addressing";
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -109,7 +109,6 @@ import org.apache.openejb.spi.SecuritySe
import org.apache.openejb.util.Contexts;
import org.apache.openejb.util.DaemonThreadFactory;
import org.apache.openejb.util.EventHelper;
-import org.apache.openejb.util.JndiTreeBrowser;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -1535,11 +1534,7 @@ public class Assembler extends Assembler
Thread.currentThread().setContextClassLoader(old);
}
}
-
final Map<String, Object> cb = appContext.getBindings();
-
- // dumpJndiTree(globalContext, "\n\nJndi Tree Before unbinds:\n===================\n\n");
-
for (final Entry<String, Object> value : cb.entrySet()) {
String path = value.getKey();
if (path.startsWith("global")) {
@@ -1553,13 +1548,10 @@ public class Assembler extends Assembler
unbind(globalContext, "openejb/global/" + path.substring("java:".length()));
unbind(globalContext, path.substring("java:global".length()));
}
-
if (appInfo.appId != null && !appInfo.appId.isEmpty() && !"openejb".equals(appInfo.appId)) {
unbind(globalContext, "global/" + appInfo.appId);
unbind(globalContext, appInfo.appId);
}
-
- // dumpJndiTree(globalContext, "\n\nJndi Tree After unbinds:\n======================\n\n");
}
final EjbResolver globalResolver = new EjbResolver(null, EjbResolver.Scope.GLOBAL);
@@ -1694,9 +1686,6 @@ public class Assembler extends Assembler
}
}
moduleIds.clear();
-
- // dumpJndiTree(globalContext, "-->");
-
try {
if (globalContext instanceof IvmContext) {
final IvmContext ivmContext = (IvmContext) globalContext;
@@ -1835,16 +1824,6 @@ public class Assembler extends Assembler
}
}
- @SuppressWarnings("UseOfSystemOutOrSystemErr")
- private void dumpJndiTree(final Context containerSystemContext, final String message) {
- System.out.println(message);
- try {
- JndiTreeBrowser.log(containerSystemContext);
- } catch (NamingException e) {
- // no-op
- }
- }
-
public ClassLoader createAppClassLoader(final AppInfo appInfo) throws OpenEJBException, IOException {
final Set<URL> jars = new HashSet<URL>();
for (final EjbJarInfo info : appInfo.ejbJars) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Wed Nov 27 20:09:06 2013
@@ -223,13 +223,9 @@ class EnterpriseBeanBuilder {
}
- String moduleId = moduleContext.getId();
Map<EntityManagerFactory, Map> extendedEntityManagerFactories = new HashMap<EntityManagerFactory, Map>();
for (PersistenceContextReferenceInfo info : statefulBeanInfo.jndiEnc.persistenceContextRefs) {
if (info.extended) {
-// EntityManagerFactory entityManagerFactory = emfLinkResolver.resolveLink(info.persistenceUnitName, moduleId);
-// extendedEntityManagerFactories.put(entityManagerFactory, info.properties);
-
try {
ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
Object o = containerSystem.getJNDIContext().lookup(PersistenceBuilder.getOpenEJBJndiName(info.unitId));
@@ -347,30 +343,6 @@ class EnterpriseBeanBuilder {
return warnings;
}
- private Method getCallback(Class ejbClass, List<CallbackInfo> callbackInfos) {
- Method callback = null;
- for (CallbackInfo info : callbackInfos) {
- try {
- if (ejbClass.getName().equals(info.className)) {
- if (callback != null) {
- throw new IllegalStateException("Spec requirements only allow one callback method of a given type per class. The following callback will be ignored: " + info.className + "." + info.method);
- }
- try {
- callback = ejbClass.getMethod(info.method);
- } catch (NoSuchMethodException e) {
- throw (IllegalStateException) new IllegalStateException("Callback method does not exist: " + info.className + "." + info.method).initCause(e);
- }
-
- } else {
- throw new UnsupportedOperationException("Callback: " + info.className + "." + info.method + " -- We currently do not support callbacks where the callback class is not the bean class. If you need this feature, please let us know and we will complete it asap.");
- }
- } catch (Exception e) {
- warnings.add(e);
- }
- }
- return callback;
- }
-
private Method getTimeout(Class ejbClass, NamedMethodInfo info) {
Method timeout = null;
try {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java Wed Nov 27 20:09:06 2013
@@ -51,12 +51,10 @@ public class InterceptorBindingBuilder {
ADDITION_OR_LOWER_EXCLUSION, SAME_LEVEL_EXCLUSION, SAME_AND_LOWER_EXCLUSION, EXPLICIT_ORDERING
}
- private final EjbJarInfo ejbJarInfo;
private final ArrayList<InterceptorBindingInfo> bindings;
private final Map<String, InterceptorData> interceptors = new HashMap<String, InterceptorData>();
public InterceptorBindingBuilder(ClassLoader cl, EjbJarInfo ejbJarInfo) throws OpenEJBException {
- this.ejbJarInfo = ejbJarInfo;
bindings = new ArrayList<InterceptorBindingInfo>(ejbJarInfo.interceptorBindings);
Collections.sort(bindings, new IntercpetorBindingComparator());
Collections.reverse(bindings);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java Wed Nov 27 20:09:06 2013
@@ -68,17 +68,6 @@ public class MethodTransactionBuilder {
}
}
- private static String getMethodInterface(MethodTransactionInfo value) {
- // We can only do this because we have previously processed all the
- // MethodTransactionInfo objects so there is one per method
- // It makes code like this easier to handle
- for (MethodInfo methodInfo : value.methods) {
- return methodInfo.methodIntf;
- }
-
- return null;
- }
-
/**
* This method splits the MethodTransactionInfo objects so that there is
* exactly one MethodInfo per MethodTransactionInfo. A single MethodTransactionInfo
@@ -87,7 +76,6 @@ public class MethodTransactionBuilder {
*
* The MethodTransactionInfo list is then sorted from least to most specific.
*
- * @param infos
* @return a normalized list of new MethodTransactionInfo objects
*/
public static List<MethodTransactionInfo> normalize(List<MethodTransactionInfo> infos){
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -594,7 +594,6 @@ public class ReloadableEntityManagerFact
@Description("get all mapping files")
public TabularData getMappingFiles() {
return buildTabularData("mappingfile", "mapping file type",
- "Mapping file of " + reloadableEntityManagerFactory.getPUname(),
reloadableEntityManagerFactory.getMappingFiles(), Info.FILE);
}
@@ -602,7 +601,6 @@ public class ReloadableEntityManagerFact
@Description("get all jar files")
public TabularData getJarFiles() {
return buildTabularData("jarfile", "jar file type",
- "Jar file of " + reloadableEntityManagerFactory.getPUname(),
reloadableEntityManagerFactory.getJarFileUrls(), Info.URL);
}
@@ -610,11 +608,10 @@ public class ReloadableEntityManagerFact
@Description("get all managed classes")
public TabularData getManagedClasses() {
return buildTabularData("managedclass", "managed class type",
- "Managed class of " + reloadableEntityManagerFactory.getPUname(),
reloadableEntityManagerFactory.getManagedClasses(), Info.CLASS);
}
- private TabularData buildTabularData(String typeName, String typeDescription, String description, List<?> list, Info info) {
+ private TabularData buildTabularData(String typeName, String typeDescription, List<?> list, Info info) {
String[] names = new String[list.size()];
Object[] values = new Object[names.length];
int i = 0;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CustomELAdapter.java Wed Nov 27 20:09:06 2013
@@ -17,7 +17,6 @@
package org.apache.openejb.cdi;
import org.apache.openejb.AppContext;
-import org.apache.openejb.core.WebContext;
import org.apache.webbeans.el22.WebBeansELResolver;
import org.apache.webbeans.el22.WrappedExpressionFactory;
import org.apache.webbeans.spi.adaptor.ELAdaptor;
@@ -31,15 +30,9 @@ import javax.el.ExpressionFactory;
public class CustomELAdapter implements ELAdaptor {
private final AppContext appContext;
- private final WebContext webContext;
public CustomELAdapter(AppContext appContext) {
- this(appContext, null);
- }
-
- public CustomELAdapter(AppContext appContext, WebContext webContext) {
this.appContext = appContext;
- this.webContext = webContext;
}
@Override
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -21,7 +21,6 @@ import org.apache.openejb.BeanContext;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.webbeans.config.BeansDeployer;
@@ -70,8 +69,6 @@ public class OpenEJBLifecycle implements
protected final ContextsService contextsService;
- private final boolean skipClassNotFoundError;
-
/**Deploy discovered beans*/
private final BeansDeployer deployer;
@@ -101,8 +98,6 @@ public class OpenEJBLifecycle implements
this.scannerService = webBeansContext.getScannerService();
this.contextsService = webBeansContext.getContextsService();
- this.skipClassNotFoundError = SystemInstance.get().getOptions().get(OPENEJB_CDI_SKIP_CLASS_NOT_FOUND, false);
-
initApplication(null);
}
@@ -217,18 +212,6 @@ public class OpenEJBLifecycle implements
logger.info("OpenWebBeans Container has started, it took {0} ms.", Long.toString(System.currentTimeMillis() - begin));
}
- private static boolean rootCauseIsClassNotFound(final RuntimeException re) {
- Throwable e = re;
- e.getStackTrace();
- while (e != null) {
- if (e instanceof ClassNotFoundException) {
- return true;
- }
- e = e.getCause();
- }
- return false;
- }
-
@Override
public void stopApplication(Object endObject)
{
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java Wed Nov 27 20:09:06 2013
@@ -122,11 +122,7 @@ public class ThreadSingletonServiceImpl
services.put(AppContext.class, appContext);
services.put(JNDIService.class, new OpenEJBJndiService());
services.put(TransactionService.class, new OpenEJBTransactionService());
- if (startupObject.getWebContext() == null) {
- services.put(ELAdaptor.class, new CustomELAdapter(appContext));
- } else {
- services.put(ELAdaptor.class, new CustomELAdapter(appContext, startupObject.getWebContext()));
- }
+ services.put(ELAdaptor.class, new CustomELAdapter(appContext));
services.put(ScannerService.class, new CdiScanner());
services.put(LoaderService.class, new OptimizedLoaderService());
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -2198,8 +2198,6 @@ public class AnnotationDeployer implemen
} catch (ClassNotFoundException e) {
continue;
}
-
- final List<Annotated<Class<?>>> found;
if (clazz.isAnnotation()) {
classes.addAll(metaToClass(finder.findMetaAnnotatedClasses(clazz)));
} else if (Modifier.isAbstract(clazz.getModifiers())) {
@@ -2208,7 +2206,6 @@ public class AnnotationDeployer implemen
classes.addAll(finder.findImplementations(clazz));
}
}
-
}
AnnotationFinder annotationFinder = createFinder(classes.toArray(new Class<?>[classes.size()]));
@@ -3158,37 +3155,16 @@ public class AnnotationDeployer implemen
if (beanClass.isAnnotationPresent(ManagedBean.class)){
sessionBean.setLocalBean(new Empty());
}
-
-
- /**
- * Track any interfaces we didn't use
- */
- all.unspecified.addAll(interfaces);
}
// Finally, add all the business interfaces we found
for (Class interfce : all.local) sessionBean.addBusinessLocal(interfce);
for (Class interfce : all.remote) sessionBean.addBusinessRemote(interfce);
-
- // Anything unspecified? Let's throw it in as local.
- //
- // This covers the required case where a bean is declared implementing
- // one interface and does not use @Local or @Remote anywhere nor does
- // it specify the business-local or business-remote elements in the ejb-jar.xml
- //
- // It goes a little beyond that, but no one has ever complained about having
- // more local interfaces.
-
- // TODO allow to be re-enabled with a flag
- //for (Class interfce : all.unspecified) sessionBean.addBusinessLocal(interfce);
-
-
}
private static class BusinessInterfaces {
private Set<Class> local = new LinkedHashSet<Class>();
private Set<Class> remote = new LinkedHashSet<Class>();
- private Set<Class> unspecified = new LinkedHashSet<Class>();
public void addLocals(Collection<String> names, ClassLoader loader){
add(loader, names, local);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java Wed Nov 27 20:09:06 2013
@@ -304,10 +304,6 @@ public class AppValidator {
return OptionBuilder.withLongOpt(longOpt).withDescription(AppValidator.i18n(description)).create(shortOpt);
}
- private static Option option(String shortOpt, String longOpt, String argName, String description) {
- return OptionBuilder.withLongOpt(longOpt).withArgName(argName).hasArg().withDescription(AppValidator.i18n(description)).create(shortOpt);
- }
-
private static String i18n(String key) {
return AppValidator._messages.format(key);
}
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -192,15 +192,14 @@ public class AutoConfig implements Dynam
for (final ClientModule clientModule : appModule.getClientModules()) {
deploy(clientModule, appResources);
}
- for (final ConnectorModule connectorModule : appModule.getConnectorModules()) {
- deploy(connectorModule);
- }
for (final WebModule webModule : appModule.getWebModules()) {
deploy(webModule, appResources);
}
for (final PersistenceModule persistenceModule : appModule.getPersistenceModules()) {
deploy(appModule, persistenceModule);
}
+ // Note that there is nothing to process for resource modules.
+ // We dont need to loop over "appModule.getConnectorModules()".
return appModule;
}
@@ -239,21 +238,17 @@ public class AutoConfig implements Dynam
final String componentName = component.getJndiConsumerName();
final ValidationContext validation = module.getValidation();
- final AppModule appModule = module.appModule();
-
for (final PersistenceRef ref : component.getPersistenceUnitRef()) {
- processPersistenceRef(appModule, persistenceUnits, ref, moduleURI, componentName, validation);
+ processPersistenceRef(persistenceUnits, ref, moduleURI, componentName, validation);
}
-
for (final PersistenceRef ref : component.getPersistenceContextRef()) {
- processPersistenceRef(appModule, persistenceUnits, ref, moduleURI, componentName, validation);
+ processPersistenceRef(persistenceUnits, ref, moduleURI, componentName, validation);
}
}
- private PersistenceUnit processPersistenceRef(final AppModule appModule,
- final LinkResolver<PersistenceUnit> persistenceUnits,
+ private PersistenceUnit processPersistenceRef(final LinkResolver<PersistenceUnit> persistenceUnits,
final PersistenceRef ref,
final URI moduleURI,
final String componentName,
@@ -716,11 +711,6 @@ public class AutoConfig implements Dynam
processJndiRefs(clientModule.getModuleId(), clientModule.getApplicationClient(), appResources, clientModule.getClassLoader());
}
- @SuppressWarnings({"UnusedDeclaration"})
- private void deploy(final ConnectorModule connectorModule) throws OpenEJBException {
- // Nothing to process for resource modules
- }
-
private void deploy(final WebModule webModule, final AppResources appResources) throws OpenEJBException {
processJndiRefs(webModule.getModuleId(), webModule.getWebApp(), appResources, webModule.getClassLoader());
}
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -33,7 +33,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Properties;
public class ConfigUtils {
@@ -42,16 +41,11 @@ public class ConfigUtils {
/**
* TODO: It should always be assumed that the path input param is a URL or URL-convertible
- *
- * @param path
- * @param props
- * @return
- * @throws OpenEJBException
*/
- public static String searchForConfiguration(String path, Properties props) throws OpenEJBException {
- File file = null;
- if (path != null) {
- for (final String p : deducePaths(path)) {
+ public static String searchForConfiguration(String rawPath) throws OpenEJBException {
+ File file;
+ if (rawPath != null) {
+ for (final String path : deducePaths(rawPath)) {
/*
* [1] Try finding the file relative to the current working
* directory
@@ -102,7 +96,7 @@ public class ConfigUtils {
}
}
- logger.warning("Cannot find the configuration file [" + path + "], Trying conf/openejb.xml instead.");
+ logger.warning("Cannot find the configuration file [" + rawPath + "], Trying conf/openejb.xml instead.");
}
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -405,7 +405,7 @@ public class ConfigurationFactory implem
configLocation = props.getProperty(CONFIGURATION_PROPERTY);
}
- configLocation = ConfigUtils.searchForConfiguration(configLocation, props);
+ configLocation = ConfigUtils.searchForConfiguration(configLocation);
if (configLocation != null) {
logger.info("openejb configuration file is '" + configLocation + "'");
props.setProperty(CONFIGURATION_PROPERTY, configLocation);
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -63,8 +63,6 @@ public class Deploy {
private static Messages messages = new Messages(Deploy.class);
private static final String defaultServerUrl = "ejbd://localhost:4201";
- private static final int BUF_SIZE = 8192;
-
public static void main(String... args) throws SystemExitException {
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -194,11 +194,11 @@ public class EjbJarInfoBuilder {
}
}
- initJndiNames(ejbds, bean, beanInfo);
+ initJndiNames(ejbds, beanInfo);
}
if (jar.getEjbJar().getAssemblyDescriptor() != null) {
- initInterceptors(jar, ejbJar, infos);
+ initInterceptors(jar, ejbJar);
initSecurityRoles(jar, ejbJar);
initMethodPermissions(jar, ejbds, ejbJar);
initExcludesList(jar, ejbds, ejbJar);
@@ -207,7 +207,7 @@ public class EjbJarInfoBuilder {
initApplicationExceptions(jar, ejbJar);
for (EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
- resolveRoleLinks(jar, bean, items.get(bean.ejbName));
+ resolveRoleLinks(bean, items.get(bean.ejbName));
}
}
@@ -233,7 +233,7 @@ public class EjbJarInfoBuilder {
return ejbJar;
}
- private void initJndiNames(Map<String, EjbDeployment> ejbds, EnterpriseBean bean, EnterpriseBeanInfo info) {
+ private void initJndiNames(Map<String, EjbDeployment> ejbds, EnterpriseBeanInfo info) {
EjbDeployment deployment = ejbds.get(info.ejbName);
if (deployment != null) for (Jndi jndi : deployment.getJndi()) {
JndiNameInfo jndiNameInfo = new JndiNameInfo();
@@ -317,7 +317,7 @@ public class EjbJarInfoBuilder {
return cmrFieldInfo;
}
- private void initInterceptors(EjbModule jar, EjbJarInfo ejbJar, Map<String, EnterpriseBeanInfo> beanInfos) throws OpenEJBException {
+ private void initInterceptors(EjbModule jar, EjbJarInfo ejbJar) throws OpenEJBException {
if (jar.getEjbJar().getInterceptors().length == 0) return;
if (jar.getEjbJar().getAssemblyDescriptor() == null) return;
if (jar.getEjbJar().getAssemblyDescriptor().getInterceptorBinding() == null) return;
@@ -499,7 +499,7 @@ public class EjbJarInfoBuilder {
}
}
- private void resolveRoleLinks(EjbModule jar, EnterpriseBeanInfo bean, JndiConsumer item) {
+ private void resolveRoleLinks(EnterpriseBeanInfo bean, JndiConsumer item) {
if (!(item instanceof RemoteBean)) {
return;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java Wed Nov 27 20:09:06 2013
@@ -169,10 +169,6 @@ public class InitEjbDeployments implemen
}
}
- private String get(String s) {
- return isDefined(s) ? s : null;
- }
-
private boolean isDefined(String s) {
return s != null && !"".equals(s);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java Wed Nov 27 20:09:06 2013
@@ -416,9 +416,6 @@ public class NewLoaderLogic {
timer.event("urlset");
final Set<RequireDescriptors> requireDescriptors = options.getAll(DeploymentFilterable.CLASSPATH_REQUIRE_DESCRIPTOR, RequireDescriptors.CLIENT);
- final boolean filterDescriptors = options.get(DeploymentFilterable.CLASSPATH_FILTER_DESCRIPTORS, false);
- final boolean filterSystemApps = options.get(DeploymentFilterable.CLASSPATH_FILTER_SYSTEMAPPS, true);
-
try {
UrlSet urlSet = new UrlSet(classLoader);
@@ -443,8 +440,6 @@ public class NewLoaderLogic {
for (final URL url : beforeFiltering) {
logger.info(String.format(" %s", url.toExternalForm()));
}
- // throw new IllegalStateException(message);
-
}
// If they are the same size, than nothing was filtered
@@ -467,31 +462,7 @@ public class NewLoaderLogic {
timer.event("process urls");
- // we should exclude system apps before and apply user properties after
- // if (filterSystemApps){
- // urlSet = urlSet.exclude(".*/openejb-[^/]+(.(jar|ear|war)(!/)?|/target/(test-)?classes/?)");
- // }
-
final List<URL> urls = urlSet.getUrls();
- final int size = urls.size();
- // if (size == 0) {
- // logger.warning("No classpath URLs matched. Current settings: " + CLASSPATH_EXCLUDE + "='" + exclude + "', " + CLASSPATH_INCLUDE + "='" + include + "'");
- // return;
- // } else if (size == 0 && (!filterDescriptors && prefiltered.getUrls().size() == 0)) {
- // return;
- // } else if (size < 20) {
- // logger.debug("Inspecting classpath for applications: " + urls.size() + " urls.");
- // } else {
- // // Has the user allowed some module types to be discoverable via scraping?
- // boolean willScrape = requireDescriptors.size() < RequireDescriptors.values().length;
- //
- // if (size < 50 && willScrape) {
- // logger.info("Inspecting classpath for applications: " + urls.size() + " urls. Consider adjusting your exclude/include. Current settings: " + CLASSPATH_EXCLUDE + "='" + exclude + "', " + CLASSPATH_INCLUDE + "='" + include + "'");
- // } else if (willScrape) {
- // logger.warning("Inspecting classpath for applications: " + urls.size() + " urls.");
- // logger.warning("ADJUST THE EXCLUDE/INCLUDE!!!. Current settings: " + CLASSPATH_EXCLUDE + "='" + exclude + "', " + CLASSPATH_INCLUDE + "='" + include + "'");
- // }
- // }
final long begin = System.currentTimeMillis();
DeploymentsResolver.processUrls("NewLoaderLogic2", urls, classLoader, requireDescriptors, base, jarList);
@@ -501,13 +472,7 @@ public class NewLoaderLogic {
timer.stop(System.out);
final UrlSet unchecked = new UrlSet();
- // if (!filterDescriptors){
- // unchecked = prefiltered.exclude(urlSet);
- // if (filterSystemApps){
- // unchecked = unchecked.exclude(".*/openejb-[^/]+(.(jar|ear|war)(./)?|/target/classes/?)");
- // }
DeploymentsResolver.processUrls("NewLoaderLogic3", unchecked.getUrls(), classLoader, EnumSet.allOf(RequireDescriptors.class), base, jarList);
- // }
if (logger.isDebugEnabled()) {
final int urlCount = urlSet.getUrls().size() + unchecked.getUrls().size();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Wed Nov 27 20:09:06 2013
@@ -99,7 +99,7 @@ public class ReadDescriptors implements
}
if (ejbModule.getBeans() == null) {
- readBeans(ejbModule, appModule);
+ readBeans(ejbModule);
}
readValidationConfigType(ejbModule);
@@ -241,38 +241,6 @@ public class ReadDescriptors implements
}
- private static URL getUrl(final Module module, final String name) {
- URL url = (URL) module.getAltDDs().get(name);
- if (url == null && module.getClassLoader() != null) {
- url = module.getClassLoader().getResource("META-INF/" + name);
- if (url != null) {
- module.getAltDDs().put(name, url);
- }
- }
- return url;
- }
-
- /**
- * All the readFooXml(URL) methods could simply use this method
- *
- * @param module
- * @param name
- * @return
- */
- private static Source getSource(final Module module, final String name) {
- final Object o = module.getAltDDs().get(name);
- if (o != null) return getSource(o);
-
- if (module.getClassLoader() != null) {
- final URL url = module.getClassLoader().getResource("META-INF/" + name);
- if (url != null) {
- module.getAltDDs().put(name, url);
- return new UrlSource(url);
- }
- }
- return null;
- }
-
public static void readResourcesXml(final Module module) {
{ // xml
final Source url = getSource(module.getAltDDs().get("resources.xml"));
@@ -478,7 +446,7 @@ public class ReadDescriptors implements
checkDuplicatedByBeansXml(beans.getInterceptors(), complete.getDuplicatedInterceptors());
}
- private void readBeans(final EjbModule ejbModule, final AppModule appModule) throws OpenEJBException {
+ private void readBeans(final EjbModule ejbModule) throws OpenEJBException {
if (ejbModule.getBeans() != null) return;
final Object raw = ejbModule.getAltDDs().get("beans.xml");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Wed Nov 27 20:09:06 2013
@@ -339,7 +339,7 @@ public class RemoteServer {
}
// debugging method (mainly for buildbot), don't let it activated when all is fine
- private void kill3UNIXDebug() {
+ private void kill3UNIXDebug() { //NOPMD
final Thread t = new Thread() {
@Override
public void run() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WlsConversion.java Wed Nov 27 20:09:06 2013
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.config;
-import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.jpa.EntityMappings;
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.Jndi;
@@ -72,7 +71,6 @@ public class WlsConversion implements Dy
}
private void mergeEjbConfig(EjbModule ejbModule, WeblogicEjbJar weblogicEjbJar) {
- EjbJar ejbJar = ejbModule.getEjbJar();
OpenejbJar openejbJar = ejbModule.getOpenejbJar();
if (openejbJar == null) return;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java Wed Nov 27 20:09:06 2013
@@ -26,13 +26,11 @@ import org.apache.openejb.jee.InitMethod
import org.apache.openejb.jee.Interceptor;
import org.apache.openejb.jee.Invokable;
import org.apache.openejb.jee.LifecycleCallback;
-import org.apache.openejb.jee.NamedMethod;
import org.apache.openejb.jee.RemoveMethod;
import org.apache.openejb.jee.Session;
import org.apache.openejb.jee.SessionBean;
import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.Timer;
-import org.apache.openejb.util.Join;
import org.apache.xbean.finder.ClassFinder;
import javax.ejb.AfterBegin;
@@ -309,7 +307,6 @@ public class CheckCallbacks extends Vali
}
Method method = getMethod(delcaringClass, callback.getMethodName(), parameterTypes);
if (implementsSessionBean(delcaringClass)) {
- SessionBean sb = (SessionBean) bean;
if ("PreDestroy".equals(type)) {
if (!callback.getMethodName().equals("ejbRemove"))
fail(bean.getEjbName(), "callback.sessionbean.invalidusage", type, callback.getMethodName(), ejbClass);
@@ -408,41 +405,6 @@ public class CheckCallbacks extends Vali
}
}
- private void checkTimeOut(Class<?> ejbClass, NamedMethod timeout, EnterpriseBean bean) {
- if (timeout == null) return;
- try {
- Class<?>[] parameterClasses;
- if (timeout.getMethodParams() == null) {
- parameterClasses = new Class[0];
- } else {
- List<String> methodParams = timeout.getMethodParams().getMethodParam();
- parameterClasses = new Class[methodParams.size()];
- for (int i = 0; i < methodParams.size(); i++) {
- parameterClasses[i] = loadClass(methodParams.get(i));
- }
- }
- Method method = getMethod(ejbClass, timeout.getMethodName(), parameterClasses);
- Class<?>[] parameterTypes = method.getParameterTypes();
- if (parameterTypes.length != 0 && (parameterTypes.length != 1 || parameterTypes[0] != javax.ejb.Timer.class)) {
- fail(bean, "timeout.invalidArguments", timeout.getMethodName(), Join.join(",", Join.CLASS_CALLBACK, parameterClasses));
- }
- Class<?> returnType = method.getReturnType();
- if (!returnType.equals(Void.TYPE)) {
- fail(bean, "timeout.badReturnType", timeout.getMethodName(), returnType.getName());
- }
- } catch (NoSuchMethodException e) {
- List<Method> possibleMethods = getMethods(ejbClass, timeout.getMethodName());
-
- if (possibleMethods.size() == 0) {
- fail(bean, "timeout.missing", timeout.getMethodName());
- } else {
- fail(bean, "timeout.missing.possibleTypo", timeout.getMethodName(), possibleMethods.size());
- }
- } catch(OpenEJBException e){
- //ignore ? Could not load the class of the parameter
- }
- }
-
private Method getMethod(Class clazz, String methodName, Class... parameterTypes) throws NoSuchMethodException {
NoSuchMethodException original = null;
while (clazz != null){
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDependsOn.java Wed Nov 27 20:09:06 2013
@@ -57,7 +57,6 @@ public class CheckDependsOn extends Vali
}
- boolean missingBeans = false;
for (Bean bean : app.values()) {
EnterpriseBean enterpriseBean = bean.bean;
@@ -71,15 +70,12 @@ public class CheckDependsOn extends Vali
Bean referee = bean.resolveLink(ejbName);
if (referee == null) {
bean.module.getValidation().fail(enterpriseBean.getEjbName(), "dependsOn.noSuchEjb", ejbName);
- missingBeans = true;
} else {
bean.dependsOn.add(referee);
}
}
}
- // if (missingBeans) return;
-
try {
References.sort(new ArrayList<Bean>(app.values()), new References.Visitor<Bean>() {
public String getName(Bean t) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckDescriptorLocation.java Wed Nov 27 20:09:06 2013
@@ -59,7 +59,6 @@ public class CheckDescriptorLocation ext
}
private void validateWebModule(DeploymentModule webModule) {
- URL baseUrl = null;
this.module= webModule;
List<String> descriptorsToSearch = Arrays.asList("beans.xml","ejb-jar.xml","faces-config.xml");
File file = webModule.getFile();
@@ -67,8 +66,7 @@ public class CheckDescriptorLocation ext
try {
URL rootOfArchive=file.toURI().toURL();
URL metaInf=new URL(rootOfArchive.toExternalForm()+"META-INF/");
- Map<String, URL> incorrectlyLocatedDescriptors
- = retrieveDescriptors(file, descriptorsToSearch, rootOfArchive, metaInf);
+ Map<String, URL> incorrectlyLocatedDescriptors = retrieveDescriptors(descriptorsToSearch, rootOfArchive, metaInf);
warnIncorrectLocationOfDescriptors(incorrectlyLocatedDescriptors,"WEB-INF");
} catch (MalformedURLException ignored) {
//ignored
@@ -78,7 +76,6 @@ public class CheckDescriptorLocation ext
}
public void validateEjbModule(DeploymentModule deploymentModule) {
- URL baseUrl = null;
this.module= deploymentModule;
List<String> descriptorsToSearch = Arrays.asList("beans.xml","ejb-jar.xml","openejb-jar.xml","env-entries.properties");
File file = deploymentModule.getFile();
@@ -86,7 +83,7 @@ public class CheckDescriptorLocation ext
try {
URL rootOfArchive=file.toURI().toURL();
Map<String, URL> incorrectlyLocatedDescriptors
- = retrieveDescriptors(file, descriptorsToSearch, rootOfArchive);
+ = retrieveDescriptors(descriptorsToSearch, rootOfArchive);
warnIncorrectLocationOfDescriptors(incorrectlyLocatedDescriptors,"META-INF");
} catch (MalformedURLException ignored) {
//ignored
@@ -95,10 +92,8 @@ public class CheckDescriptorLocation ext
}
- private static Map<String,URL> retrieveDescriptors(File file, List<String> descriptorsToSearch, URL... locationsToSearch ){
+ private static Map<String,URL> retrieveDescriptors(List<String> descriptorsToSearch, URL... locationsToSearch ){
final Map<String,URL> descriptorAndWrongLocation = new HashMap<String,URL>();
-
-
ResourceFinder finder = new ResourceFinder(locationsToSearch);
for(String descriptor:descriptorsToSearch)
{
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=1546177&r1=1546176&r2=1546177&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 Wed Nov 27 20:09:06 2013
@@ -96,7 +96,7 @@ public class CheckMethods extends Valida
String name = interfaceMethods[i].getName();
try {
Class[] params = interfaceMethods[i].getParameterTypes();
- Method beanMethod = beanClass.getMethod(name, params);
+ beanClass.getMethod(name, params);
} catch (NoSuchMethodException nsme) {
List<Method> differentArgs = new ArrayList<Method>();
List<Method> differentCase = new ArrayList<Method>();
@@ -145,7 +145,7 @@ public class CheckMethods extends Valida
String name = interfaceMethods[i].getName();
try {
Class[] params = interfaceMethods[i].getParameterTypes();
- Method beanMethod = beanClass.getMethod(name, params);
+ beanClass.getMethod(name, params);
} catch (NoSuchMethodException nsme) {
List<Method> differentArgs = new ArrayList<Method>();
List<Method> differentCase = new ArrayList<Method>();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java Wed Nov 27 20:09:06 2013
@@ -98,26 +98,6 @@ public class WikiGenerator {
out.flush();
}
- private void header(String... items) {
- out.print("<tr>");
- for (String item : items) {
- out.print("<th>");
- out.print(item);
- out.print("</th>");
- }
- out.println("</tr>");
- }
-
- private void row(String... items) {
- out.print("<tr>");
- for (String item : items) {
- out.print("<td>");
- out.print(item);
- out.print("</td>");
- }
- out.println("</tr>");
- }
-
private void generateService(ServiceProvider provider, String serviceType) {
String type = provider.getTypes().get(0);
out.println("# " + type + " <small>" + serviceType + " </small>");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpUtil.java Wed Nov 27 20:09:06 2013
@@ -20,8 +20,7 @@ public class CmpUtil {
public static String getCmpImplClassName(String abstractSchemaName, String ejbClass) {
// locate the end of the package portion
int packageEnd = ejbClass.lastIndexOf('.');
- String cmpImplClass;
- // we have a package, pull that out and add "openejb." in front of the package
+ // we have a package, pull that out and add "openejb." in front of the package
if (packageEnd != -1) {
return "openejb." + ejbClass.substring(0, packageEnd + 1) + abstractSchemaName;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NamingException.java Wed Nov 27 20:09:06 2013
@@ -25,7 +25,7 @@ public class NamingException extends jav
private OpenEJBException delegate;
public NamingException(String message, OpenEJBException delegateArg) {
- super();
+ super(message);
delegate = delegateArg;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceFactory.java Wed Nov 27 20:09:06 2013
@@ -55,7 +55,6 @@ public class MdbInstanceFactory {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
private final BeanContext beanContext;
- private final SecurityService securityService;
private final int instanceLimit;
private int instanceCount;
private final MdbContext mdbContext;
@@ -69,7 +68,6 @@ public class MdbInstanceFactory {
*/
public MdbInstanceFactory(BeanContext beanContext, SecurityService securityService, int instanceLimit) throws OpenEJBException {
this.beanContext = beanContext;
- this.securityService = securityService;
this.instanceLimit = instanceLimit;
mdbContext = new MdbContext(securityService);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java Wed Nov 27 20:09:06 2013
@@ -19,7 +19,6 @@ package org.apache.openejb.core.security
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.SecurityService;
-import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -60,7 +59,6 @@ public class ConnectorCallbackHandler im
groupsArray = ((GroupPrincipalCallback) callback).getGroups();
} else if (callback instanceof PasswordValidationCallback) {
PasswordValidationCallback passwordValidationCallback = (PasswordValidationCallback) callback;
- Subject subject = passwordValidationCallback.getSubject();
final String userName = passwordValidationCallback.getUsername();
final char[] password = passwordValidationCallback.getPassword();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java Wed Nov 27 20:09:06 2013
@@ -184,33 +184,19 @@ public class ActiveMQResourceAdapter ext
private void stopImpl() throws Exception {
super.stop();
-
- final ActiveMQResourceAdapter ra = this;
- stopImpl(ra);
- }
-
- private static void stopImpl(final org.apache.activemq.ra.ActiveMQResourceAdapter instance) throws Exception {
-
final Collection<BrokerService> brokers = ActiveMQFactory.getBrokers();
-
final Iterator<BrokerService> it = brokers.iterator();
-
while (it.hasNext()) {
-
final BrokerService bs = it.next();
-
try {
bs.stop();
bs.waitUntilStopped();
} catch (Throwable t) {
//Ignore
}
-
it.remove();
}
-
stopScheduler();
-
Logger.getInstance(LogCategory.OPENEJB_STARTUP, ActiveMQResourceAdapter.class).getChildLogger("service").info("Stopped ActiveMQ broker");
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java Wed Nov 27 20:09:06 2013
@@ -17,7 +17,6 @@
package org.apache.openejb.util;
import org.apache.openejb.EnvProps;
-import org.apache.openejb.loader.FileUtils;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
@@ -89,20 +88,19 @@ public class ConfUtils {
}
public static File install(URL resource, String name, boolean overwrite) throws IOException {
- if (resource == null) return null;
-
- SystemInstance system = SystemInstance.get();
- FileUtils base = system.getBase();
- File conf = system.getConf(null);
-
- if (conf != null && !conf.exists()) return null;
-
- File file = new File(conf, name);
-
- if (file.exists() && !overwrite) return file;
-
+ if (resource == null) {
+ return null;
+ }
+ final SystemInstance system = SystemInstance.get();
+ final File conf = system.getConf(null);
+ if (conf != null && !conf.exists()) {
+ return null;
+ }
+ final File file = new File(conf, name);
+ if (file.exists() && !overwrite) {
+ return file;
+ }
IO.copy(IO.read(resource), file);
-
return file;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java Wed Nov 27 20:09:06 2013
@@ -920,6 +920,7 @@ public class Pool<T> {
}
}
+ @SuppressWarnings("PMD.UnusedPrivateField")
@Managed
private class Stats {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java?rev=1546177&r1=1546176&r2=1546177&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/urlhandler/resource/Handler.java Wed Nov 27 20:09:06 2013
@@ -28,35 +28,27 @@ import java.security.PrivilegedAction;
public class Handler extends URLStreamHandler {
protected URLConnection openConnection(URL url) throws IOException {
- String cln = url.getHost();
-
- String resrce = url.getFile().substring(1);
-
- URL realURL;
-
+ final String cln = url.getHost();
+ final String resrce = url.getFile().substring(1);
+ final URL realURL;
if (cln != null && cln.length() != 0) {
- Class clz;
- ClassLoader cl = getContextClassLoader();
-
+ final ClassLoader cl = getContextClassLoader();
try {
-
- clz = Class.forName(cln, true, cl);
+ Class.forName(cln, true, cl);
} catch (ClassNotFoundException ex) {
- throw (IOException)new MalformedURLException("Class " + cln + " cannot be found (" + ex + ")").initCause(ex);
+ throw (IOException) new MalformedURLException("Class " + cln + " cannot be found (" + ex + ")").initCause(ex);
}
-
realURL = cl.getResource(resrce);
-
- if (realURL == null)
+ if (realURL == null) {
throw new FileNotFoundException("Class resource " + resrce + " of class " + cln + " cannot be found");
+ }
} else {
- ClassLoader cl = getContextClassLoader();
+ final ClassLoader cl = getContextClassLoader();
realURL = cl.getResource(resrce);
-
- if (realURL == null)
+ if (realURL == null) {
throw new FileNotFoundException("System resource " + resrce + " cannot be found");
+ }
}
-
return realURL.openConnection();
}