[jboss-cvs] JBossAS SVN: r104907 - in branches/JBPAPP_5_1: component-matrix and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 18 02:25:49 EDT 2010
Author: wolfc
Date: 2010-05-18 02:25:48 -0400 (Tue, 18 May 2010)
New Revision: 104907
Modified:
branches/JBPAPP_5_1/build/build-distr.xml
branches/JBPAPP_5_1/component-matrix/pom.xml
branches/JBPAPP_5_1/ejb3/build.xml
branches/JBPAPP_5_1/ejb3/pom.xml
branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-iiop-deployers-jboss-beans.xml
branches/JBPAPP_5_1/thirdparty/pom.xml
branches/JBPAPP_5_1/tomcat/build.xml
branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBPAPP-4128: integrated ejb3-pom-eap5 0.1.0
Modified: branches/JBPAPP_5_1/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1/build/build-distr.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/build/build-distr.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -111,6 +111,14 @@
<property name="_module.name" value="ejb3" override="true"/>
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+ <unjar src="${jboss.jboss.ejb3.deployers.lib}/jboss-ejb3-deployers.jar"
+ dest="${install.server}/all/deployers">
+ <patternset>
+ <include name="META-INF/ejb3-deployers-jboss-beans.xml"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unjar>
+
<copy todir="${install.server}/all/deploy" filtering="no">
<fileset dir="${_module.output}/resources">
<include name="ejb3-container-jboss-beans.xml"/>
@@ -136,6 +144,10 @@
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.common.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.context.base.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.context.naming.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.core.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
<fileset dir="${jboss.jboss.ejb3.deployers.lib}" includes="*.jar"
@@ -164,6 +176,14 @@
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.transactions.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.timeout.spi.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.timeout.3.0.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.vfs.spi.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.vfs.impl.vfs2.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${hibernate.commons.annotations.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${hibernate.entitymanager.lib}" includes="*.jar"
Modified: branches/JBPAPP_5_1/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_1/component-matrix/pom.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/component-matrix/pom.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -65,8 +65,9 @@
<version.org.jboss.cluster.server.api>1.1.1.GA</version.org.jboss.cluster.server.api>
<version.org.jboss.common.core>2.2.16.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.0.8.SP1</version.org.jboss.deployers>
+ <version.org.jboss.ejb3.bom>0.1.0-SNAPSHOT</version.org.jboss.ejb3.bom>
+ <!--
<version.org.jboss.ejb3.common.client>1.0.1</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.core.client>1.1.22</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.jpa.int>1.0.0</version.org.jboss.ejb3.jpa.int>
<version.org.jboss.ejb3.proxy.impl.client>1.0.6</version.org.jboss.ejb3.proxy.impl.client>
<version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
@@ -76,7 +77,7 @@
<version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
<version.org.jboss.ejb3.metrics.deployer>1.0.2</version.org.jboss.ejb3.metrics.deployer>
<version.org.jboss.ejb3.transactions>1.0.2</version.org.jboss.ejb3.transactions>
- <version.org.jboss.ejb3.interceptors>1.0.6</version.org.jboss.ejb3.interceptors>
+ -->
<version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.3.2.GA</version.org.jboss.jopr>
@@ -1698,11 +1699,24 @@
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-interceptors</artifactId>
- <version>${version.org.jboss.ejb3.interceptors}</version>
+ <groupId>org.jboss.ejb3.bom</groupId>
+ <artifactId>bom-eap5</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!--
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
@@ -1765,8 +1779,8 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- Normally comes in via ejb3-as-int, but we need some exclusions -->
+
+ < ! - - Normally comes in via ejb3-as-int, but we need some exclusions - - >
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metrics-deployer</artifactId>
@@ -1835,8 +1849,8 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- Normally comes in via ejb3-as-int, but we need a newer version -->
+
+ < ! - - Normally comes in via ejb3-as-int, but we need a newer version - - >
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-transactions</artifactId>
@@ -1848,7 +1862,6 @@
<artifactId>jboss-ejb3-endpoint-deployer</artifactId>
<version>${version.org.jboss.ejb3.endpoint.deployer}</version>
<exclusions>
- <!-- EJB3 artifacts come in via jboss-ejb3-as-int -->
<exclusion>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
@@ -1899,6 +1912,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.jboss.javaee</groupId>
@@ -2361,6 +2375,7 @@
<!-- JBAS-6904: use org.hibernate:hibernate-core -->
<exclude>org.hibernate:hibernate</exclude>
<exclude>org.jboss.jbossas:jboss-as-bootstrap</exclude> <!-- org.jboss.bootstrap:jboss-bootstrap JBAS-6171 -->
+ <exclude>org.jboss.metadata:jboss-metadata-common</exclude>
</excludes>
</bannedDependencies>
</rules>
Modified: branches/JBPAPP_5_1/ejb3/build.xml
===================================================================
--- branches/JBPAPP_5_1/ejb3/build.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/build.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ vi:ts=3:sw=3:expandtab
+-->
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
@@ -123,6 +126,8 @@
<path refid="jboss.jboss.ejb3.proxy.impl.classpath" />
<path refid="jboss.jboss.ejb3.proxy.spi.classpath" />
<path refid="jboss.jboss.ejb3.timerservice.spi.classpath" />
+ <path refid="jboss.jboss.ejb3.vfs.spi.classpath" />
+ <path refid="jboss.jboss.ejb3.vfs.impl.vfs2.classpath" />
<path refid="jboss.jboss.jpa.deployers.classpath"/>
<path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.jboss.reflect.classpath" />
Modified: branches/JBPAPP_5_1/ejb3/pom.xml
===================================================================
--- branches/JBPAPP_5_1/ejb3/pom.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/pom.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -125,6 +125,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-impl-vfs2</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
<classifier>client</classifier>
Modified: branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/client/ClientContainer.java 2010-05-18 06:25:48 UTC (rev 104907)
@@ -21,46 +21,26 @@
*/
package org.jboss.ejb3.client;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.LinkRef;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
import org.jboss.ejb3.Container;
import org.jboss.ejb3.DependencyPolicy;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.client.injection.ClientPersistenceUnitHandler;
-import org.jboss.injection.DependsHandler;
-import org.jboss.injection.EncInjector;
-import org.jboss.injection.InjectionContainer;
-import org.jboss.injection.InjectionHandler;
-import org.jboss.injection.Injector;
-import org.jboss.injection.WebServiceRefHandler;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.injection.*;
import org.jboss.logging.Logger;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
import org.jboss.util.NotImplementedException;
-import org.jboss.virtual.VirtualFile;
+import javax.naming.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.*;
+import java.net.URL;
+import java.util.*;
+
/**
* Injection of the application client main class is handled from here.
*
Modified: branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2010-05-18 06:25:48 UTC (rev 104907)
@@ -21,31 +21,10 @@
*/
package org.jboss.ejb3.clientmodule;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-
import org.jboss.beans.metadata.api.annotations.Start;
import org.jboss.beans.metadata.api.annotations.Stop;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Module;
+import org.jboss.ejb3.*;
import org.jboss.ejb3.deployers.JBoss5DeploymentScope;
import org.jboss.ejb3.deployers.JBoss5DeploymentUnit;
import org.jboss.ejb3.deployers.JBossASDepdencyPolicy;
@@ -53,12 +32,9 @@
import org.jboss.ejb3.enc.MessageDestinationResolver;
import org.jboss.ejb3.javaee.AbstractJavaEEComponent;
import org.jboss.ejb3.javaee.SimpleJavaEEModule;
-import org.jboss.injection.DependsHandler;
-import org.jboss.injection.EncInjector;
-import org.jboss.injection.ExtendedInjectionContainer;
-import org.jboss.injection.InjectionHandler;
-import org.jboss.injection.Injector;
-import org.jboss.injection.WebServiceRefHandler;
+import org.jboss.ejb3.vfs.spi.UnifiedVirtualFileFactory;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.injection.*;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.logging.Logger;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
@@ -66,10 +42,19 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.serviceref.ServiceReferenceHandler;
-import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
+
/**
* This class builds up the java:comp namespace for JavaEE 5 application clients.
* It uses the existing injection framework to get this done.
@@ -360,7 +345,7 @@
String encName = "env/" + name;
Context encCtx = getEnc();
- UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(getRootFile());
+ UnifiedVirtualFile vfsRoot = UnifiedVirtualFileFactory.getInstance().create(getRootFile());
new ServiceReferenceHandler().bindServiceRef(encCtx, encName, vfsRoot, getClassloader(), sref);
}
Modified: branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2010-05-18 06:25:48 UTC (rev 104907)
@@ -21,23 +21,21 @@
*/
package org.jboss.ejb3.deployers;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
+import org.jboss.ejb3.vfs.impl.vfs2.VirtualFileFilterAdapter;
+import org.jboss.ejb3.vfs.impl.vfs2.VirtualFileWrapper;
import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
import org.jboss.virtual.VisitorAttributes;
import org.jboss.virtual.plugins.context.jar.JarUtils;
import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+
/**
* Comment
*
@@ -77,9 +75,9 @@
return unit.removeAttachment(name);
}
- public VirtualFile getRootFile()
+ public org.jboss.ejb3.vfs.spi.VirtualFile getRootFile()
{
- return unit.getFile("");
+ return new VirtualFileWrapper(unit.getFile(""));
}
public String getRelativePath()
@@ -137,9 +135,9 @@
return extractDescriptorUrl("jboss.xml");
}
- public VirtualFile getMetaDataFile(String name)
+ public org.jboss.ejb3.vfs.spi.VirtualFile getMetaDataFile(String name)
{
- return unit.getMetaDataFile(name);
+ return new VirtualFileWrapper(unit.getMetaDataFile(name));
}
public List<Class> getClasses()
@@ -202,7 +200,7 @@
throw new IllegalStateException("EJBTHREE-1852: InterceptorInfoRepository must not be used anymore");
}
- public List<VirtualFile> getResources(VirtualFileFilter filter)
+ public List<org.jboss.ejb3.vfs.spi.VirtualFile> getResources(org.jboss.ejb3.vfs.spi.VirtualFileFilter filter)
{
List<VirtualFile> classPath = unit.getClassPath();
if(classPath == null || classPath.isEmpty())
@@ -212,7 +210,7 @@
va.setLeavesOnly(true);
SuffixesExcludeFilter noJars = new SuffixesExcludeFilter(JarUtils.getSuffixes());
va.setRecurseFilter(noJars);
- FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(filter, va);
+ FilterVirtualFileVisitor visitor = new FilterVirtualFileVisitor(new VirtualFileFilterAdapter(filter), va);
for(VirtualFile root : classPath)
{
@@ -227,6 +225,12 @@
}
}
- return visitor.getMatched();
+ final List<VirtualFile> matches = visitor.getMatched();
+ final List<org.jboss.ejb3.vfs.spi.VirtualFile> wrappedMatches = new ArrayList<org.jboss.ejb3.vfs.spi.VirtualFile>(matches.size());
+ for(VirtualFile match : matches)
+ {
+ wrappedMatches.add(new VirtualFileWrapper(match));
+ }
+ return wrappedMatches;
}
}
Modified: branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- EJB3 Deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ EJB3 Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
-
+
+ <bean name="EJBContextBinder" class="org.jboss.ejb3.context.naming.EJBContextBinder"/>
+
<bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
<!-- TODO: allow for configuration
<property name="dependencies">
@@ -17,246 +19,246 @@
-->
</bean>
- <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
- <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb3x</value>
- </parameter>
- <parameter>
- <value>3.*</value>
- </parameter>
- <parameter>
- <value>getEjbVersion</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb3x</value>
- </parameter>
- </uninstall>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
- <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
- <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
- <!-- Should war deployments be scanned for annotated ejbs -->
- <property name="scanWars">false</property>
-
- <!--
-
- Configure the deployer to optionally require a deployment
- descriptor for deployable units. By turning this switch to "true",
- "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml"
- will be required for deployment, enabling a performance increace in deployment by
- not scanning for annotations in non-deployable EJB3 JARs.
-
- Default for this value is "false".
-
- -->
- <property name="deploymentDescriptorRequired">false</property>
-
- <property name="ignoredJarsSet">
- <set elementClass="java.lang.String">
- <value>snmp-adaptor.jar</value>
- <value>otherimages.jar</value>
- <value>applet.jar</value>
- <value>jcommon.jar</value>
- <value>console-mgr-classes.jar</value>
- <value>jfreechart.jar</value>
- <value>juddi-service.jar</value>
- <value>wsdl4j.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-pool.jar</value>
- <value>juddi.jar</value>
- <value>commons-discovery.jar</value>
- <value>uddi4j.jar</value>
- <value>axis.jar</value>
- <value>commons-dbcp.jar</value>
- <value>jboss-juddiaxis.jar</value>
- <value>trove.jar</value>
- <value>javassist.jar</value>
- <value>jboss-aop-jdk50.jar</value>
- <value>jboss-aspect-library-jdk50.jar</value>
- <value>ejb3-persistence.jar</value>
- <value>commons-validator-1.1.3.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-fileupload.jar</value>
- <value>commons-pool.jar</value>
- <value>hibernate-entitymanager.jar</value>
- <value>jboss-ejb3x.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>cglib-2.1.1.jar</value>
- <value>commons-discovery.jar</value>
- <value>jboss-annotations-ejb3.jar</value>
- <value>jaxen-1.1-beta-4.jar</value>
- <value>hibernate-annotations.jar</value>
- <value>commons-httpclient.jar</value>
- <value>commons-logging.jar</value>
- <value>commons-vfs.jar</value>
- <value>hibernate3.jar</value>
- <value>commons-logging-api.jar</value>
- <value>asm.jar</value>
- <value>asm-attrs.jar</value>
- <value>commons-lang-2.0.jar</value>
- <value>commons-beanutils.jar</value>
- <value>jboss-ejb3.jar</value>
- <value>dom4j.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>wsdl4j.jar</value>
- <value>xmlsec.jar</value>
- <value>jbossws.jar</value>
- <value>jboss-bean-deployer.jar</value>
- <value>jboss-microcontainer.jar</value>
- <value>jboss-dependency.jar</value>
- <value>jboss-container.jar</value>
- <value>tomcat-coyote.jar</value>
- <value>commons-collections.jar</value>
- <value>myfaces.jar</value>
- <value>jstl.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>myfaces-impl.jar</value>
- <value>commons-beanutils.jar</value>
- <value>myfaces-jsf-api.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>catalina-optional.jar</value>
- <value>tomcat-util.jar</value>
- <value>jasper-compiler.jar</value>
- <value>commons-el.jar</value>
- <value>jasper-compiler-jdt.jar</value>
- <value>tomcat-http.jar</value>
- <value>catalina-manager.jar</value>
- <value>jasper-runtime.jar</value>
- <value>tomcat55-service.jar</value>
- <value>servlets-invoker.jar</value>
- <value>catalina.jar</value>
- <value>naming-resources.jar</value>
- <value>servlets-default.jar</value>
- <value>tomcat-ajp.jar</value>
- <value>commons-modeler.jar</value>
- <value>tomcat-apr.jar</value>
- <value>servlets-webdav.jar</value>
- </set>
- </property>
- <depends>AspectLibrary</depends>
- </bean>
-
- <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
- <!-- TODO: check depends -->
- <depends>AspectLibrary</depends>
- </bean>
-
- <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
- <depends>AppClientParsingDeployer</depends>
- </bean>
- <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
- <depends>AppClientParsingDeployer</depends>
- </bean>
-
- <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
- </parameter>
- <parameter>
- <value>car</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
- </parameter>
- </uninstall>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <!-- TODO: check depends -->
- <depends>AspectLibrary</depends>
- </bean>
-
- <!-- EJB3 Cache Factory Registry -->
- <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- NoPassivationCache -->
- <entry>
- <key>NoPassivationCache</key>
- <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
- </entry>
- <!-- SimpleStatefulCache -->
- <entry>
- <key>SimpleStatefulCache</key>
- <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
- </entry>
- <!-- StatefulTreeCache -->
- <entry>
- <key>StatefulTreeCache</key>
- <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- EJB3 Pool Factory Registry -->
- <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- ThreadlocalPool -->
- <entry>
- <key>ThreadlocalPool</key>
- <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
- </entry>
- <!-- StrictMaxPool -->
- <entry>
- <key>StrictMaxPool</key>
- <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <!-- EJB3 Persistence Manager Factory Registry -->
- <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
- <property name="factories">
- <!-- Define each of the registered factories -->
- <map class="java.util.HashMap" keyClass="java.lang.String"
- valueClass="java.lang.Class">
- <!-- StatefulSessionFilePersistenceManager -->
- <entry>
- <key>StatefulSessionFilePersistenceManager</key>
- <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
-
- <!-- Persistence Unit deployers -->
- <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </parameter>
- <parameter>
- <value>par</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </parameter>
- </uninstall>
- </bean>
+ <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
+ <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb3x</value>
+ </parameter>
+ <parameter>
+ <value>3.*</value>
+ </parameter>
+ <parameter>
+ <value>getEjbVersion</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb3x</value>
+ </parameter>
+ </uninstall>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
+ <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
+ <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
+ <!-- Should war deployments be scanned for annotated ejbs -->
+ <property name="scanWars">false</property>
+
+ <!--
+
+ Configure the deployer to optionally require a deployment
+ descriptor for deployable units. By turning this switch to "true",
+ "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml"
+ will be required for deployment, enabling a performance increace in deployment by
+ not scanning for annotations in non-deployable EJB3 JARs.
+
+ Default for this value is "false".
+
+ -->
+ <property name="deploymentDescriptorRequired">false</property>
+
+ <property name="ignoredJarsSet">
+ <set elementClass="java.lang.String">
+ <value>snmp-adaptor.jar</value>
+ <value>otherimages.jar</value>
+ <value>applet.jar</value>
+ <value>jcommon.jar</value>
+ <value>console-mgr-classes.jar</value>
+ <value>jfreechart.jar</value>
+ <value>juddi-service.jar</value>
+ <value>wsdl4j.jar</value>
+ <value>commons-collections.jar</value>
+ <value>commons-pool.jar</value>
+ <value>juddi.jar</value>
+ <value>commons-discovery.jar</value>
+ <value>uddi4j.jar</value>
+ <value>axis.jar</value>
+ <value>commons-dbcp.jar</value>
+ <value>jboss-juddiaxis.jar</value>
+ <value>trove.jar</value>
+ <value>javassist.jar</value>
+ <value>jboss-aop-jdk50.jar</value>
+ <value>jboss-aspect-library-jdk50.jar</value>
+ <value>ejb3-persistence.jar</value>
+ <value>commons-validator-1.1.3.jar</value>
+ <value>commons-collections.jar</value>
+ <value>commons-fileupload.jar</value>
+ <value>commons-pool.jar</value>
+ <value>hibernate-entitymanager.jar</value>
+ <value>jboss-ejb3x.jar</value>
+ <value>commons-digester-1.6.jar</value>
+ <value>cglib-2.1.1.jar</value>
+ <value>commons-discovery.jar</value>
+ <value>jboss-annotations-ejb3.jar</value>
+ <value>jaxen-1.1-beta-4.jar</value>
+ <value>hibernate-annotations.jar</value>
+ <value>commons-httpclient.jar</value>
+ <value>commons-logging.jar</value>
+ <value>commons-vfs.jar</value>
+ <value>hibernate3.jar</value>
+ <value>commons-logging-api.jar</value>
+ <value>asm.jar</value>
+ <value>asm-attrs.jar</value>
+ <value>commons-lang-2.0.jar</value>
+ <value>commons-beanutils.jar</value>
+ <value>jboss-ejb3.jar</value>
+ <value>dom4j.jar</value>
+ <value>commons-codec-1.2.jar</value>
+ <value>wsdl4j.jar</value>
+ <value>xmlsec.jar</value>
+ <value>jbossws.jar</value>
+ <value>jboss-bean-deployer.jar</value>
+ <value>jboss-microcontainer.jar</value>
+ <value>jboss-dependency.jar</value>
+ <value>jboss-container.jar</value>
+ <value>tomcat-coyote.jar</value>
+ <value>commons-collections.jar</value>
+ <value>myfaces.jar</value>
+ <value>jstl.jar</value>
+ <value>commons-digester-1.6.jar</value>
+ <value>myfaces-impl.jar</value>
+ <value>commons-beanutils.jar</value>
+ <value>myfaces-jsf-api.jar</value>
+ <value>commons-codec-1.2.jar</value>
+ <value>catalina-optional.jar</value>
+ <value>tomcat-util.jar</value>
+ <value>jasper-compiler.jar</value>
+ <value>commons-el.jar</value>
+ <value>jasper-compiler-jdt.jar</value>
+ <value>tomcat-http.jar</value>
+ <value>catalina-manager.jar</value>
+ <value>jasper-runtime.jar</value>
+ <value>tomcat55-service.jar</value>
+ <value>servlets-invoker.jar</value>
+ <value>catalina.jar</value>
+ <value>naming-resources.jar</value>
+ <value>servlets-default.jar</value>
+ <value>tomcat-ajp.jar</value>
+ <value>commons-modeler.jar</value>
+ <value>tomcat-apr.jar</value>
+ <value>servlets-webdav.jar</value>
+ </set>
+ </property>
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
+ <depends>AppClientParsingDeployer</depends>
+ </bean>
+ <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
+ <depends>AppClientParsingDeployer</depends>
+ </bean>
+ <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </parameter>
+ <parameter>
+ <value>car</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </parameter>
+ </uninstall>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <!-- EJB3 Cache Factory Registry -->
+ <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- NoPassivationCache -->
+ <entry>
+ <key>NoPassivationCache</key>
+ <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+ </entry>
+ <!-- SimpleStatefulCache -->
+ <entry>
+ <key>SimpleStatefulCache</key>
+ <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+ </entry>
+ <!-- StatefulTreeCache -->
+ <entry>
+ <key>StatefulTreeCache</key>
+ <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- EJB3 Pool Factory Registry -->
+ <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- ThreadlocalPool -->
+ <entry>
+ <key>ThreadlocalPool</key>
+ <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
+ </entry>
+ <!-- StrictMaxPool -->
+ <entry>
+ <key>StrictMaxPool</key>
+ <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <!-- EJB3 Persistence Manager Factory Registry -->
+ <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- StatefulSessionFilePersistenceManager -->
+ <entry>
+ <key>StatefulSessionFilePersistenceManager</key>
+ <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
+
+ <!-- Persistence Unit deployers -->
+ <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </parameter>
+ <parameter>
+ <value>par</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </parameter>
+ </uninstall>
+ </bean>
+
<!--
JNDI Registrars
@@ -296,7 +298,7 @@
</parameter>
</constructor>
</bean>
-
+
<bean name="org.jboss.ejb3.ProxyClusteringRegistry"
class="org.jboss.ejb3.proxy.clustered.registry.ProxyClusteringRegistry"/>
@@ -322,35 +324,32 @@
</constructor>
</bean>
- <!-- EJB3 ProcessorChain Deployer -->
- <bean name="Ejb3MetadataProcessingDeployer"
- class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
<!-- EJB3 JNDI Policy Decorator Deployer -->
<bean name="EjbMetadataJndiPolicyDecoratorDeployer"
- class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer" />
-
- <!-- EJB Reference Resolver -->
- <bean name="org.jboss.ejb3.EjbReferenceResolver" class="org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver">
- <constructor factoryClass="org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolverFactory"
- factoryMethod="newInstance">
- <parameter>org.jboss.ejb3.common.resolvers.plugins.FirstMatchEjbReferenceResolver</parameter>
- </constructor>
- </bean>
-
- <!-- Add Annotation Plugins upon installation -->
- <bean name="org.jboss.ejb3.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService"
- class="org.jboss.ejb3.mcint.annotationadaptor.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService">
- <constructor>
- <parameter><inject bean="jboss.kernel:service=Kernel"/></parameter>
- </constructor>
- </bean>
-
- <!-- EJB Reference Annotation Plugin -->
- <bean name="org.jboss.ejb3.EjbReferenceAnnotationPlugin"
- class="org.jboss.ejb3.mcint.metadata.plugins.EjbReferenceAnnotationPlugin">
- <constructor>
- <parameter><inject bean="org.jboss.ejb3.EjbReferenceResolver" /></parameter>
- </constructor>
+ class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer" />
+
+ <!-- EJB Reference Resolver -->
+ <bean name="org.jboss.ejb3.EjbReferenceResolver" class="org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver">
+ <constructor factoryClass="org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolverFactory"
+ factoryMethod="newInstance">
+ <parameter>org.jboss.ejb3.common.resolvers.plugins.FirstMatchEjbReferenceResolver</parameter>
+ </constructor>
</bean>
+
+ <!-- Add Annotation Plugins upon installation -->
+ <bean name="org.jboss.ejb3.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService"
+ class="org.jboss.ejb3.mcint.annotationadaptor.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=Kernel"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- EJB Reference Annotation Plugin -->
+ <bean name="org.jboss.ejb3.EjbReferenceAnnotationPlugin"
+ class="org.jboss.ejb3.mcint.metadata.plugins.EjbReferenceAnnotationPlugin">
+ <constructor>
+ <parameter><inject bean="org.jboss.ejb3.EjbReferenceResolver" /></parameter>
+ </constructor>
+ </bean>
-</deployment>
+</deployment>
Modified: branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-iiop-deployers-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-iiop-deployers-jboss-beans.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/ejb3/src/resources/META-INF/ejb3-iiop-deployers-jboss-beans.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- This will be taken over by a deployer from ejb3 project -->
- <bean name="EJBsDeployer" class="org.jboss.as.ejb3.deployers.EJBsDeployer"/>
-
<bean name="EJB3IORDeployer" class="org.jboss.as.ejb3.deployers.IORDeployer"/>
</deployment>
\ No newline at end of file
Modified: branches/JBPAPP_5_1/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_1/thirdparty/pom.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/thirdparty/pom.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -638,8 +638,49 @@
<componentId>jboss.jboss-ejb3-endpoint-deployer</componentId>
</mapping>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-base</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-context-base</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-naming</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-context-naming</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-spi</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-timeout-spi</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.0</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-timeout-3.0</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-spi</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-vfs-spi</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-impl-vfs2</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-vfs-impl-vfs2</componentId>
+ </mapping>
+ </dependency>
-
<dependency>
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-deployers</artifactId>
@@ -1711,6 +1752,32 @@
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-naming</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-impl-vfs2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
Modified: branches/JBPAPP_5_1/tomcat/build.xml
===================================================================
--- branches/JBPAPP_5_1/tomcat/build.xml 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/tomcat/build.xml 2010-05-18 06:25:48 UTC (rev 104907)
@@ -74,6 +74,8 @@
<path refid="jboss.integration.classpath"/>
<path refid="jboss.jboss.ejb3.core.classpath" />
<path refid="jboss.jboss.ejb3.interceptors.classpath" />
+ <path refid="jboss.jboss.ejb3.vfs.spi.classpath" />
+ <path refid="jboss.jboss.ejb3.vfs.impl.vfs2.classpath" />
<path refid="org.jboss.cluster.classpath"/>
<path refid="jboss.jboss.jpa.deployers.classpath" />
<path refid="jboss.jboss.reflect.classpath" />
Modified: branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-05-18 06:25:05 UTC (rev 104906)
+++ branches/JBPAPP_5_1/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-05-18 06:25:48 UTC (rev 104907)
@@ -21,29 +21,6 @@
*/
package org.jboss.web.tomcat.service;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-
import org.apache.InstanceManager;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -55,25 +32,35 @@
import org.jboss.ejb3.deployers.JBoss5DependencyPolicy;
import org.jboss.ejb3.javaee.AbstractJavaEEComponent;
import org.jboss.ejb3.javaee.SimpleJavaEEModule;
-import org.jboss.injection.DependsHandler;
-import org.jboss.injection.EncInjector;
-import org.jboss.injection.ExtendedInjectionContainer;
-import org.jboss.injection.InjectionHandler;
-import org.jboss.injection.Injector;
-import org.jboss.injection.PersistenceContextHandler;
-import org.jboss.injection.PersistenceUnitHandler;
+import org.jboss.ejb3.vfs.impl.vfs2.VirtualFileWrapper;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.injection.*;
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
import org.jboss.web.WebApplication;
import org.jboss.web.tomcat.service.injection.TomcatInjectionUtils;
import org.jboss.web.tomcat.service.injection.WebEJBHandler;
import org.jboss.web.tomcat.service.injection.WebResourceHandler;
import org.jboss.web.tomcat.service.injection.WebServiceRefInjectionHandler;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
/**
* The TomcatInjectionContainer.
*
@@ -574,7 +561,7 @@
public VirtualFile getRootFile()
{
if (unit instanceof VFSDeploymentUnit)
- return ((VFSDeploymentUnit)unit).getRoot();
+ return new VirtualFileWrapper(((VFSDeploymentUnit)unit).getRoot());
else
return null;
}
More information about the jboss-cvs-commits
mailing list