You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/18 10:42:30 UTC
svn commit: r1094358 -
/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Author: xuhaihong
Date: Mon Apr 18 08:42:30 2011
New Revision: 1094358
URL: http://svn.apache.org/viewvc?rev=1094358&view=rev
Log:
No function change, just format the codes a bit for later changes, and add the svn properties
Modified:
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (contents, props changed)
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1094358&r1=1094357&r2=1094358&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Mon Apr 18 08:42:30 2011
@@ -162,7 +162,7 @@ import org.slf4j.LoggerFactory;
* Acts as either a ModuleBuilder (for standalone ejb jars or ejb jars in an ear) or as a ModuleBuilderExtension
* for ejbs embedded in a web app.
*
- * @version $Revision: 479481 $ $Date: 2006-11-26 16:52:20 -0800 (Sun, 26 Nov 2006) $
+ * @version $Revision$ $Date$
*/
@GBean(j2eeType = NameFactory.MODULE_BUILDER)
public class EjbModuleBuilder implements ModuleBuilder, GBeanLifecycle, ModuleBuilderExtension {
@@ -297,10 +297,14 @@ public class EjbModuleBuilder implements
}
- private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment earEnvironment, Module parentModule, Naming naming, ModuleIDBuilder idBuilder, String ddDir, boolean subModule) throws DeploymentException {
- if (moduleFile == null) throw new NullPointerException("moduleFile is null");
- if (targetPath == null) throw new NullPointerException("targetPath is null");
- if (targetPath.endsWith("/")) throw new IllegalArgumentException("targetPath must not end with a '/'");
+ private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment earEnvironment, Module parentModule, Naming naming, ModuleIDBuilder idBuilder,
+ String ddDir, boolean subModule) throws DeploymentException {
+ if (moduleFile == null)
+ throw new NullPointerException("moduleFile is null");
+ if (targetPath == null)
+ throw new NullPointerException("targetPath is null");
+ if (targetPath.endsWith("/"))
+ throw new IllegalArgumentException("targetPath must not end with a '/'");
// verify we have a valid file
String jarPath = moduleFile.getName();
@@ -313,7 +317,7 @@ public class EjbModuleBuilder implements
baseUrl = jarFile.toURI().toURL();
- classLoader = (ClassLoader) ClassLoaderUtil.createTempClassLoader(ClassLoaderUtil.createClassLoader(jarPath, new URL[]{baseUrl}, OpenEJB.class.getClassLoader()));
+ classLoader = ClassLoaderUtil.createTempClassLoader(ClassLoaderUtil.createClassLoader(jarPath, new URL[] { baseUrl }, OpenEJB.class.getClassLoader()));
ResourceFinder finder = new ResourceFinder("", classLoader, baseUrl);
@@ -392,7 +396,6 @@ public class EjbModuleBuilder implements
idBuilder.resolve(environment, new File(moduleFile.getName()).getName(), "car");
}
-
AbstractName moduleName;
if (parentModule == null || ".".equals(targetPath)) {
AbstractName earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
@@ -404,12 +407,11 @@ public class EjbModuleBuilder implements
// Create XMLBeans version of EjbJarType for the AnnotatedApp interface
EjbJar ejbJar = ejbModule.getEjbJar();
-
File file = new File(moduleFile.getName());
String packageName = file.getName();
-
+
String name;
-
+
if (subModule) {
name = parentModule.getName();
} else if (ejbJar.getModuleName() != null) {
@@ -421,14 +423,13 @@ public class EjbModuleBuilder implements
}
ejbModule.setModuleId(name);
-
+
if (standAlone || ".".equals(targetPath)) {
ejbModule.setModuleUri(URI.create(packageName));
} else {
ejbModule.setModuleUri(URI.create(targetPath));
}
-
Map<JndiKey, Map<String, Object>> context = null;
if (subModule) {
context = parentModule.getJndiContext();
@@ -439,7 +440,7 @@ public class EjbModuleBuilder implements
for (ModuleBuilderExtension builder : moduleBuilderExtensions) {
try {
- builder.createModule(module, plan, moduleFile, targetPath, specDDUrl, environment, null, parentModule == null? null: parentModule.getModuleName(), naming, idBuilder);
+ builder.createModule(module, plan, moduleFile, targetPath, specDDUrl, environment, null, parentModule == null ? null : parentModule.getModuleName(), naming, idBuilder);
} catch (Throwable t) {
String builderName = builder.getClass().getSimpleName();
Propchange: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain