ammulder 2004/12/06 01:32:33
Modified: modules/openejb-builder/src/java/org/openejb/deployment
CMPContainerBuilder.java CMPEntityBuilder.java
ContainerSecurityBuilder.java EntityBuilder.java
MdbBuilder.java OpenEJBModuleBuilder.java
SessionBuilder.java TransactionPolicyHelper.java
Log:
Changes to OpenEJB module builder to be compatible with latest Geronimo
Revision Changes Path
1.5 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java
Index: CMPContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPContainerBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CMPContainerBuilder.java 2 Dec 2004 23:13:59 -0000 1.4
+++ CMPContainerBuilder.java 6 Dec 2004 06:32:33 -0000 1.5
@@ -57,7 +57,7 @@
import javax.ejb.Timer;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.kernel.ClassLoading;
import org.openejb.EJBComponentType;
import org.openejb.InstanceContextFactory;
1.9 +1 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CMPEntityBuilder.java 2 Dec 2004 23:13:59 -0000 1.8
+++ CMPEntityBuilder.java 6 Dec 2004 06:32:33 -0000 1.9
@@ -61,7 +61,7 @@
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
1.7 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java
Index: ContainerSecurityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ContainerSecurityBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContainerSecurityBuilder.java 23 Nov 2004 02:09:03 -0000 1.6
+++ ContainerSecurityBuilder.java 6 Dec 2004 06:32:33 -0000 1.7
@@ -59,7 +59,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.GeronimoSecurityException;
import org.apache.geronimo.security.PrimaryRealmPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
1.6 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java
Index: EntityBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/EntityBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EntityBuilder.java 19 Nov 2004 03:58:59 -0000 1.5
+++ EntityBuilder.java 6 Dec 2004 06:32:33 -0000 1.6
@@ -55,7 +55,7 @@
import javax.management.MalformedObjectNameException;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
1.7 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
Index: MdbBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MdbBuilder.java 1 Dec 2004 06:59:10 -0000 1.6
+++ MdbBuilder.java 6 Dec 2004 06:32:33 -0000 1.7
@@ -55,7 +55,7 @@
import javax.management.ObjectName;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
1.14 +2 -2
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- OpenEJBModuleBuilder.java 25 Nov 2004 01:17:46 -0000 1.13
+++ OpenEJBModuleBuilder.java 6 Dec 2004 06:32:33 -0000 1.14
@@ -62,7 +62,7 @@
import javax.management.ObjectName;
import javax.naming.Reference;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.GBeanHelper;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanInfo;
1.6 +1 -1
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
Index: SessionBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionBuilder.java 19 Nov 2004 03:58:59 -0000 1.5
+++ SessionBuilder.java 6 Dec 2004 06:32:33 -0000 1.6
@@ -55,7 +55,7 @@
import javax.management.MalformedObjectNameException;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.EJBModule;
1.2 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/TransactionPolicyHelper.java
Index: TransactionPolicyHelper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/TransactionPolicyHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionPolicyHelper.java 10 Nov 2004 01:35:08 -0000 1.1
+++ TransactionPolicyHelper.java 6 Dec 2004 06:32:33 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.xbeans.j2ee.ContainerTransactionType;
import org.apache.geronimo.xbeans.j2ee.JavaTypeType;
import org.apache.geronimo.xbeans.j2ee.MethodIntfType;
