djencks 2005/01/26 10:13:21
Modified: modules/openejb-builder/src/java/org/openejb/deployment
AbstractContainerBuilder.java
CMPContainerBuilder.java CMPEntityBuilder.java
ContainerSecurityBuilder.java
WSContainerBuilder.java
Log:
sort, expand, cleanup imports
Revision Changes Path
1.4 +2 -2
openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java
Index: AbstractContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/AbstractContainerBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractContainerBuilder.java 27 Dec 2004 02:03:25 -0000 1.3
+++ AbstractContainerBuilder.java 26 Jan 2005 15:13:20 -0000 1.4
@@ -53,12 +53,12 @@
import javax.management.ObjectName;
import javax.security.auth.Subject;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.ClassLoading;
import org.apache.geronimo.naming.java.ReadOnlyContext;
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.transaction.UserTransactionImpl;
import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.gbean.GBeanData;
import org.openejb.EJBContainer;
import org.openejb.GenericEJBContainer;
import org.openejb.InstanceContextFactory;
1.8 +1 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CMPContainerBuilder.java 7 Jan 2005 06:37:54 -0000 1.7
+++ CMPContainerBuilder.java 26 Jan 2005 15:13:20 -0000 1.8
@@ -54,7 +54,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import javax.ejb.TimedObject;
import javax.ejb.Timer;
import javax.management.ObjectName;
1.14 +3 -5
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CMPEntityBuilder.java 22 Jan 2005 00:39:14 -0000 1.13
+++ CMPEntityBuilder.java 26 Jan 2005 15:13:20 -0000 1.14
@@ -51,17 +51,16 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.security.Permissions;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-
import javax.management.ObjectName;
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;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -76,7 +75,7 @@
import org.apache.geronimo.xbeans.j2ee.EntityBeanType;
import org.apache.geronimo.xbeans.j2ee.JavaTypeType;
import org.apache.geronimo.xbeans.j2ee.QueryType;
-import org.apache.geronimo.gbean.GBeanData;
+import org.openejb.entity.cmp.PrimaryKeyGeneratorWrapper;
import org.openejb.proxy.EJBProxyFactory;
import org.openejb.transaction.TransactionPolicySource;
import org.openejb.xbeans.ejbjar.OpenejbEjbRelationType;
@@ -85,7 +84,6 @@
import
org.openejb.xbeans.ejbjar.OpenejbEntityBeanType.AutomaticKeyGeneration;
import org.openejb.xbeans.ejbjar.OpenejbEntityBeanType.CmpFieldMapping;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.openejb.entity.cmp.PrimaryKeyGeneratorWrapper;
import org.tranql.cache.GlobalSchema;
import org.tranql.cache.GlobalSchemaLoader;
import org.tranql.ejb.CMPField;
1.8 +3 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContainerSecurityBuilder.java 6 Dec 2004 06:32:33 -0000 1.7
+++ ContainerSecurityBuilder.java 26 Jan 2005 15:13:21 -0000 1.8
@@ -47,9 +47,6 @@
*/
package org.openejb.deployment;
-import javax.security.auth.Subject;
-import javax.security.jacc.EJBMethodPermission;
-import javax.security.jacc.EJBRoleRefPermission;
import java.lang.reflect.Method;
import java.security.Permission;
import java.security.Permissions;
@@ -58,6 +55,9 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import javax.security.auth.Subject;
+import javax.security.jacc.EJBMethodPermission;
+import javax.security.jacc.EJBRoleRefPermission;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.GeronimoSecurityException;
@@ -77,7 +77,6 @@
import org.apache.geronimo.xbeans.j2ee.RoleNameType;
import org.apache.geronimo.xbeans.j2ee.SecurityIdentityType;
import org.apache.geronimo.xbeans.j2ee.SecurityRoleRefType;
-
import org.openejb.security.SecurityConfiguration;
1.2 +14 -6
openejb/modules/openejb-builder/src/java/org/openejb/deployment/WSContainerBuilder.java
Index: WSContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/WSContainerBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSContainerBuilder.java 22 Dec 2004 05:42:40 -0000 1.1
+++ WSContainerBuilder.java 26 Jan 2005 15:13:21 -0000 1.2
@@ -48,19 +48,25 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
import java.util.jar.JarFile;
import javax.management.ObjectName;
-import javax.wsdl.*;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanData;
@@ -68,9 +74,11 @@
import org.apache.geronimo.j2ee.deployment.EJBModule;
import org.apache.geronimo.security.deploy.Security;
import org.apache.geronimo.xbeans.j2ee.SessionBeanType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.openejb.dd.webservices.*;
+import org.openejb.dd.webservices.PortComponent;
+import org.openejb.dd.webservices.ServiceImplBean;
+import org.openejb.dd.webservices.WebServiceDescription;
+import org.openejb.dd.webservices.WebServices;
+import org.openejb.dd.webservices.WebServicesFactory;
import org.openejb.server.soap.WSContainerGBean;
import org.openejb.xbeans.ejbjar.OpenejbSessionBeanType;
