You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/06/05 06:08:16 UTC
svn commit: r1131648 - in /geronimo/server/trunk/plugins:
openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
openejb/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/
wink/geronimo-wink-b...
Author: genspring
Date: Sun Jun 5 04:08:16 2011
New Revision: 1131648
URL: http://svn.apache.org/viewvc?rev=1131648&view=rev
Log:
Just use wink and openejb-builder as an exercise to use findbug in my IDE.
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/SchemaConversionTest.java
geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java?rev=1131648&r1=1131647&r2=1131648&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java Sun Jun 5 04:08:16 2011
@@ -144,7 +144,7 @@ public class EjbModule extends EJBModule
return ejb;
}
- class Ejb extends Module<EnterpriseBean, XmlObject> {
+ static class Ejb extends Module<EnterpriseBean, XmlObject> {
protected Ejb(boolean standAlone, AbstractName moduleName, String name, Environment environment, JarFile moduleFile, String targetPath, EnterpriseBean specDD, XmlObject vendorDD, String originalSpecDD, String namespace, Map<JndiKey, Map<String, Object>> jndiContext, Module<?, ?> parentModule) {
super(standAlone, moduleName, name, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, namespace, jndiContext, parentModule);
}
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=1131648&r1=1131647&r2=1131648&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Sun Jun 5 04:08:16 2011
@@ -247,13 +247,12 @@ public class EjbRefBuilder extends Abstr
valueToConvert = createClientRef(valueToConvert);
name = "java:" + name;
- if (value instanceof Serializable) {
- List<InjectionTarget> injections = injectionsMap.get(name);
- if (injections == null) {
- injections = Collections.emptyList();
- }
- put(name, valueToConvert, moduleJndiContext, injections, sharedContext);
+
+ List<InjectionTarget> injections = injectionsMap.get(name);
+ if (injections == null) {
+ injections = Collections.emptyList();
}
+ put(name, valueToConvert, moduleJndiContext, injections, sharedContext);
}
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/SchemaConversionTest.java?rev=1131648&r1=1131647&r2=1131648&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/test/java/org/apache/geronimo/openejb/deployment/SchemaConversionTest.java Sun Jun 5 04:08:16 2011
@@ -27,7 +27,6 @@ import org.apache.geronimo.testsupport.X
* @version $Rev: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $
*/
public class SchemaConversionTest extends XmlBeansTestSupport {
- private ClassLoader classLoader = this.getClass().getClassLoader();
// Dain: I don't believe we need this test anymore since openejb is doing the converstions.
public void testNothing() {
Modified: geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java?rev=1131648&r1=1131647&r2=1131648&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java Sun Jun 5 04:08:16 2011
@@ -123,9 +123,6 @@ public class WinkModuleBuilderExtension
// not a web module, nothing to do
return;
}
- WebModule webModule = (WebModule) module;
- WebApp webApp = webModule.getSpecDD();
-
EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
}
@@ -228,7 +225,7 @@ public class WinkModuleBuilderExtension
Class servletClass=null;
try {
- bundleClassLoader.loadClass(servlet.getServletClass());
+ servletClass = bundleClassLoader.loadClass(servlet.getServletClass());
} catch (ClassNotFoundException e) {
log.warn("failed to load servlet class:"+servlet.getServletClass());
}