ammulder 2005/12/10 11:52:06
Modified: modules/openejb-builder/src/java/org/openejb/deployment Tag:
v2_0 CMPEntityBuilder.java
OpenEJBModuleBuilder.java
Log:
Merge deployment error fixes to branch
Revision Changes Path
No revision
No revision
1.43.2.1 +7 -8
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
Index: CMPEntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- CMPEntityBuilder.java 8 Oct 2005 04:45:58 -0000 1.43
+++ CMPEntityBuilder.java 10 Dec 2005 16:52:06 -0000 1.43.2.1
@@ -47,12 +47,6 @@
*/
package org.openejb.deployment;
-import java.util.Map;
-
-import javax.management.ObjectName;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -77,6 +71,11 @@
import org.tranql.ql.QueryException;
import org.tranql.sql.SQLSchema;
+import javax.management.ObjectName;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import java.util.Map;
+
/**
* During the process of deploying an EJB JAR, this class is called to deploy
@@ -189,7 +188,7 @@
GBeanData gbean =
builder.createConfiguration(containerObjectName,
earContext.getTransactionContextManagerObjectName(),
earContext.getConnectionTrackerObjectName(),
getTssBeanObjectName(openejbEntityBean, earContext));
return gbean;
} catch (Throwable e) {
- throw new DeploymentException("Unable to initialize EJBContainer
GBean: ejbName [" + ejbName + "]", e);
+ throw new DeploymentException("Unable to initialize EJB named '"
+ ejbName + "': "+e.getMessage(), e);
}
}
1.63.2.1 +26 -24
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -r1.63 -r1.63.2.1
--- OpenEJBModuleBuilder.java 1 Dec 2005 08:34:55 -0000 1.63
+++ OpenEJBModuleBuilder.java 10 Dec 2005 16:52:06 -0000 1.63.2.1
@@ -48,34 +48,13 @@
package org.openejb.deployment;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.Permissions;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.JarFile;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.xml.namespace.QName;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.deployment.xbeans.ClassFilterType;
import org.apache.geronimo.deployment.xbeans.DependencyType;
import org.apache.geronimo.deployment.xbeans.GbeanType;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -92,8 +71,8 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
-import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.schema.NamespaceElementConverter;
+import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.security.deployment.SecurityBuilder;
import org.apache.geronimo.security.deployment.SecurityConfiguration;
import org.apache.geronimo.security.jacc.ComponentPermissions;
@@ -126,6 +105,26 @@
import org.tranql.sql.DataSourceDelegate;
import org.tranql.sql.SQLSchema;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.Permissions;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.jar.JarFile;
+
/**
* Master builder for processing EJB JAR deployments and creating the
@@ -218,6 +217,9 @@
}
OpenejbOpenejbJarType openejbJar = getOpenejbJar(plan, moduleFile,
standAlone, targetPath, ejbJar);
+ if(openejbJar == null) { // Avoid NPE GERONIMO-1220; todo: remove
this if we can work around the requirement for a plan
+ throw new DeploymentException("Currently a Geronimo deployment
plan is required for an EJB module. Please provide a plan as a deployer
argument or packaged in the EJB JAR at META-INF/openejb-jar.xml");
+ }
// get the ids from either the application plan or for a stand alone
module from the specific deployer
URI configId = null;
