[jboss-cvs] JBossAS SVN: r78421 - in trunk: ejb3/src/main/org/jboss/ejb3/clientmodule and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 11 07:30:02 EDT 2008
Author: wolfc
Date: 2008-09-11 07:30:02 -0400 (Thu, 11 Sep 2008)
New Revision: 78421
Added:
trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePersistenceUnitHandler.java
trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePuEncInjector.java
Modified:
trunk/component-matrix/pom.xml
trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
Log:
JBAS-5940: using remotely injected persistence unit in app client
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-09-11 10:34:32 UTC (rev 78420)
+++ trunk/component-matrix/pom.xml 2008-09-11 11:30:02 UTC (rev 78421)
@@ -52,7 +52,7 @@
<version.org.jboss.ejb3.proxy.client>0.1.4</version.org.jboss.ejb3.proxy.client>
<version.org.jboss.ejb3.proxy.clustered.client>0.1.3</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0-Beta1</version.org.jboss.ejb3.security.client>
- <version.org.jboss.jpa>0.1.1</version.org.jboss.jpa>
+ <version.org.jboss.jpa>0.1.2</version.org.jboss.jpa>
<version.org.jboss.reflect>2.0.0.CR1</version.org.jboss.reflect>
<version.org.jboss.mdr>2.0.0.CR1</version.org.jboss.mdr>
<version.org.jboss.vfs>2.0.0.CR1</version.org.jboss.vfs>
Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2008-09-11 10:34:32 UTC (rev 78420)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2008-09-11 11:30:02 UTC (rev 78421)
@@ -61,7 +61,6 @@
import org.jboss.injection.ExtendedInjectionContainer;
import org.jboss.injection.InjectionHandler;
import org.jboss.injection.Injector;
-import org.jboss.injection.PersistenceUnitHandler;
import org.jboss.injection.WebServiceRefHandler;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.logging.Logger;
@@ -322,7 +321,7 @@
handlers.add(new DependsHandler<JBossClientMetaData>());
//handlers.add(new JndiInjectHandler<JBossClientMetaData>());
//handlers.add(new PersistenceContextHandler<JBossClientMetaData>());
- handlers.add(new PersistenceUnitHandler<JBossClientMetaData>());
+ handlers.add(new RemotePersistenceUnitHandler<JBossClientMetaData>());
handlers.add(new ResourceHandler<JBossClientMetaData>());
handlers.add(new WebServiceRefHandler<JBossClientMetaData>());
Added: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePersistenceUnitHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePersistenceUnitHandler.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePersistenceUnitHandler.java 2008-09-11 11:30:02 UTC (rev 78421)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.clientmodule;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import javax.naming.NameNotFoundException;
+
+import org.jboss.injection.InjectionContainer;
+import org.jboss.injection.InjectionHandler;
+import org.jboss.injection.InjectionUtil;
+import org.jboss.injection.Injector;
+import org.jboss.injection.PersistenceUnitHandler;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.RemoteEnvironment;
+
+/**
+ * EXPERIMENTAL
+ *
+ * Allow injection of a persistence unit into a component running outside
+ * the VM where the peristence unit is deployed.
+ *
+ * Currently this only runs for application client which does do any
+ * annotation processing by itself. This is delegated to the AnnotationDeployer.
+ *
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class RemotePersistenceUnitHandler<X extends RemoteEnvironment> implements InjectionHandler<X>
+{
+ public void handleClassAnnotations(Class<?> clazz, InjectionContainer container)
+ {
+ throw new UnsupportedOperationException("metadata should have been complete");
+ }
+
+ public void handleFieldAnnotations(Field field, InjectionContainer container,
+ Map<AccessibleObject, Injector> injectors)
+ {
+ throw new UnsupportedOperationException("metadata should have been complete");
+ }
+
+ public void handleMethodAnnotations(Method method, InjectionContainer container,
+ Map<AccessibleObject, Injector> injectors)
+ {
+ throw new UnsupportedOperationException("metadata should have been complete");
+ }
+
+ public void loadXml(X xml, InjectionContainer container)
+ {
+ if (xml == null) return;
+ if (xml.getPersistenceUnitRefs() == null) return;
+
+ for (PersistenceUnitReferenceMetaData ref : xml.getPersistenceUnitRefs())
+ {
+ String encName = "env/" + ref.getPersistenceUnitRefName();
+ // we add injection target no matter what. enc injection might be overridden but
+ // XML injection cannot be overriden
+ Class<?> injectionType = InjectionUtil.injectionTarget(encName, ref, container, container.getEncInjections());
+ if (container.getEncInjectors().containsKey(encName))
+ return;
+ container.getEncInjectors().put(encName, new RemotePuEncInjector(encName, injectionType, ref.getPersistenceUnitName(), "<persistence-unit-ref>"));
+ try
+ {
+ PersistenceUnitHandler.addPUDependency(ref.getPersistenceUnitName(), container);
+ }
+ catch (NameNotFoundException e)
+ {
+ throw new RuntimeException("Illegal <persistence-unit-ref> of " + ref.getPersistenceUnitRefName() + " :" + e.getMessage());
+ }
+ }
+ }
+
+}
Added: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePuEncInjector.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePuEncInjector.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/RemotePuEncInjector.java 2008-09-11 11:30:02 UTC (rev 78421)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.clientmodule;
+
+import javax.naming.NamingException;
+
+import org.jboss.injection.EncInjector;
+import org.jboss.injection.ExtendedInjectionContainer;
+import org.jboss.injection.InjectionContainer;
+import org.jboss.jpa.deployment.PersistenceUnitDeployment;
+import org.jboss.jpa.remote.RemotelyInjectEntityManagerFactory;
+import org.jboss.jpa.spi.PersistenceUnitRegistry;
+import org.jboss.util.naming.Util;
+
+/**
+ * EXPERIMENTAL
+ *
+ * Setup a remote entity manager factory.
+ *
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class RemotePuEncInjector implements EncInjector
+{
+ private String encName;
+ private String unitName;
+
+ public RemotePuEncInjector(String encName, Class<?> injectionType, String unitName, String error)
+ {
+ assert encName != null : "encName is null";
+ this.encName = encName;
+ this.unitName = unitName;
+ }
+
+ public void inject(InjectionContainer c)
+ {
+ if(!(c instanceof ExtendedInjectionContainer))
+ throw new UnsupportedOperationException("RemotePuEncInjector only works for ExtendedInjectionContainer");
+ ExtendedInjectionContainer container = (ExtendedInjectionContainer) c;
+
+ String name = container.resolvePersistenceUnitSupplier(unitName);
+ PersistenceUnitDeployment deployment = ((PersistenceUnitDeployment) PersistenceUnitRegistry.getPersistenceUnit(name));
+ RemotelyInjectEntityManagerFactory factory = new RemotelyInjectEntityManagerFactory(deployment.getXml(), "FIXME");
+
+ try
+ {
+ Util.rebind(container.getEnc(), encName, factory);
+ }
+ catch (NamingException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
More information about the jboss-cvs-commits
mailing list