[jboss-cvs] JBossAS SVN: r67021 - trunk/ejb3/src/main/org/jboss/ejb3/client.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2007-11-13 09:54:38 -0500 (Tue, 13 Nov 2007)
New Revision: 67021

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
Log:
EJBTHREE-1067: removed PersistenceContextHandler

Modified: trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-11-13 14:46:05 UTC (rev 67020)
+++ trunk/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java	2007-11-13 14:54:38 UTC (rev 67021)
@@ -43,8 +43,6 @@
 import org.jboss.ejb3.DependencyPolicy;
 import org.jboss.ejb3.InitialContextFactory;
 import org.jboss.ejb3.entity.PersistenceUnitDeployment;
-import org.jboss.ejb3.metamodel.ApplicationClientDD;
-import org.jboss.ejb3.metamodel.LifecycleCallback;
 import org.jboss.injection.DependsHandler;
 import org.jboss.injection.EJBInjectionHandler;
 import org.jboss.injection.EncInjector;
@@ -63,7 +61,6 @@
 import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
 import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
 import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
 import org.jboss.util.NotImplementedException;
 import org.jboss.virtual.VirtualFile;
 
@@ -205,7 +202,7 @@
    /* (non-Javadoc)
     * @see org.jboss.injection.InjectionContainer#getEjbJndiName(java.lang.String, java.lang.Class)
     */
-   public String getEjbJndiName(String link, Class businessInterface)
+   public String getEjbJndiName(String link, Class<?> businessInterface)
    {
       throw new NotImplementedException();
       //return "java:comp/env/" + link + "/remote";
@@ -284,7 +281,7 @@
    
    public void invokeMain(String args[]) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException
    {
-      Class parameterTypes[] = { args.getClass() };
+      Class<?> parameterTypes[] = { args.getClass() };
       Method method = mainClass.getDeclaredMethod("main", parameterTypes);
       method.invoke(null, (Object) args);
    }
@@ -320,15 +317,14 @@
       
       // TODO: check which handlers a client container should support
       Collection<InjectionHandler<RemoteEnvironment>> handlers = new ArrayList<InjectionHandler<RemoteEnvironment>>();
-      handlers.add(new EJBInjectionHandler());
+      handlers.add(new EJBInjectionHandler<RemoteEnvironment>());
       //handlers.add(new ClientEJBHandler());
-      handlers.add(new DependsHandler());
-      handlers.add(new JndiInjectHandler());
-      handlers.add(new PersistenceContextHandler());
-      handlers.add(new PersistenceUnitHandler());
+      handlers.add(new DependsHandler<RemoteEnvironment>());
+      handlers.add(new JndiInjectHandler<RemoteEnvironment>());
+      handlers.add(new PersistenceUnitHandler<RemoteEnvironment>());
       // since enc injectors live on the server side, we don't want to check those
-      handlers.add(new ResourceHandler(false));
-      handlers.add(new WebServiceRefHandler());
+      handlers.add(new ResourceHandler<RemoteEnvironment>(false));
+      handlers.add(new WebServiceRefHandler<RemoteEnvironment>());
       
       // TODO: we're going to use a jar class loader
 //      ClassLoader old = Thread.currentThread().getContextClassLoader();
@@ -336,7 +332,7 @@
       try
       {
          // EJB container's XML must be processed before interceptor's as it may override interceptor's references
-         for (InjectionHandler handler : handlers) handler.loadXml(xml, this);
+         for (InjectionHandler<RemoteEnvironment> handler : handlers) handler.loadXml(xml, this);
 
          Map<AccessibleObject, Injector> tmp = InjectionUtil.processAnnotations(this, handlers, getMainClass());
          injectors.addAll(tmp.values());
@@ -374,7 +370,7 @@
       processPostConstructs(mainClass);
       
       LifecycleCallbacksMetaData callbacks = xml.getPostConstructs();
-      if (callbacks != null)
+      if(callbacks != null)
       {
          for(LifecycleCallbackMetaData callback : callbacks)
          {