[jboss-cvs] JBossAS SVN: r63770 - in trunk/embedded: src/main/java/org/jboss/embedded and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 2 11:00:18 EDT 2007
Author: adrian at jboss.org
Date: 2007-07-02 11:00:18 -0400 (Mon, 02 Jul 2007)
New Revision: 63770
Modified:
trunk/embedded/.classpath
trunk/embedded/build-test.xml
trunk/embedded/build.xml
trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
trunk/embedded/src/main/java/org/jboss/embedded/ClassLoaderDeployer.java
trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java
trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java
trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java
trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java
trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java
trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
Log:
Update the embedded to fix its broken build and changes for the new deployers.
Still need to get the tests working, but that looks more like a classpath problem.
Modified: trunk/embedded/.classpath
===================================================================
--- trunk/embedded/.classpath 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/.classpath 2007-07-02 15:00:18 UTC (rev 63770)
@@ -2,15 +2,35 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="lib" path="output/lib/embedded-jboss/lib/hibernate-all.jar"/>
- <classpathentry kind="lib" path="output/lib/embedded-jboss/lib/jboss-embedded-all.jar"/>
- <classpathentry kind="lib" path="output/lib/embedded-jboss/lib/jboss-embedded-tomcat-bootstrap.jar"/>
- <classpathentry kind="lib" path="output/lib/embedded-jboss/lib/thirdparty-all.jar"/>
- <classpathentry kind="lib" path="output/lib/embedded-jboss/optional-lib/jboss-test.jar"/>
- <classpathentry kind="lib" path="output/lib/embedded-jboss/optional-lib/junit.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/naming"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/aspects"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/ejb3"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar" sourcepath="/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/jbossweb.jar" sourcepath="/thirdparty/jboss/web/lib/jbossweb-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/web/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: trunk/embedded/build-test.xml
===================================================================
--- trunk/embedded/build-test.xml 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/build-test.xml 2007-07-02 15:00:18 UTC (rev 63770)
@@ -216,7 +216,50 @@
depends="jars"/>
+ <target name="tests" depends="main"
+ description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <path id="test.classpath">
+ <fileset dir="${build.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <path refid="thirdparty.classpath"/>
+ </path>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+ <sysproperty key="jbosstest.deploy.dir" value="test-lib"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+ <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+ <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+
+ <classpath>
+ <path refid="test.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.classes}">
+ <include name="**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
<target name="test" depends="init" if="test"
description="Execute all tests in the given test directory.">
<mkdir dir="${build.reports}"/>
Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/build.xml 2007-07-02 15:00:18 UTC (rev 63770)
@@ -113,7 +113,7 @@
<path refid="jboss.aop.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.ejb3x.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
@@ -353,25 +353,33 @@
</fileset>
<zipfileset src="${jboss.ejb3.lib}/jboss-ejb3.jar"/>
<zipfileset src="${jboss.ejb3.lib}/jboss-annotations-ejb3.jar"/>
- <zipfileset src="${jboss.ejb3x.lib}/jboss-ejb3x.jar"/>
+ <zipfileset src="${jboss.jboss.javaee.lib}/jboss-javaee.jar"/>
<zipfileset src="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
+ <zipfileset src="${jboss.aop.lib}/jboss-aop-deployer-jdk50.jar"/>
<zipfileset src="${jboss.varia.lib}/hsqldb-plugin.jar"/>
<zipfileset src="${jboss.mq.lib}/jbossmq.jar"/>
+ <zipfileset src="${jboss.security.int.lib}/jbosssx-server.jar"/>
<zipfileset src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
- <zipfileset src="${jboss.aspects.lib}/jboss-aop-deployer-jdk50.jar"/>
<zipfileset src="${jboss.transaction.lib}/jboss-transaction.jar"/>
<zipfileset src="${jboss.naming.lib}/jnpserver.jar"/>
- <zipfileset src="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
<zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar"/>
<zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
<zipfileset src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar"/>
<zipfileset src="${jboss.jbossxb.lib}/jboss-xml-binding.jar"/>
<zipfileset src="${jboss.security.lib}/jbosssx.jar"/>
<zipfileset src="${jboss.security.spi.lib}/jboss-security-spi.jar"/>
- <zipfileset src="${jboss.microcontainer.lib}/jboss-microcontainer.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-kernel.jar"/>
<zipfileset src="${jboss.microcontainer.lib}/jboss-container.jar"/>
<zipfileset src="${jboss.microcontainer.lib}/jboss-dependency.jar"/>
- <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client-spi.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core-spi.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-impl.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-spi.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-structure-spi.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs.jar"/>
+ <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs-spi.jar"/>
<zipfileset src="${jboss.microcontainer.lib}/jboss-aop-mc-int.jar"/>
<zipfileset src="${jboss.microcontainer.lib}/jboss-metatype.jar"/>
<zipfileset src="${jboss.microcontainer.lib}/jboss-managed.jar"/>
@@ -394,6 +402,7 @@
<zipfileset src="${jboss.jbossws.lib}/jboss-jaxrpc.jar"/>
<zipfileset src="${jboss.jbossws.lib}/jboss-jaxws.jar"/>
<zipfileset src="${jboss.jbossws.lib}/jbossws-client.jar"/>
+ <zipfileset src="${jboss.jbossws.spi.lib}/jbossws-spi.jar"/>
<zipfileset src="${jboss.jboss.vfs.lib}/jboss-vfs.jar"/>
<zipfileset src="${jboss.messaging.lib}/jboss-messaging.jar"/>
<zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
@@ -411,9 +420,7 @@
<jar jarfile="${build.lib}/embedded-jboss/lib/thirdparty-all.jar">
<zipfileset src="${apache.log4j.lib}/log4j.jar"/>
<zipfileset src="${hsqldb.hsqldb.lib}/hsqldb.jar"/>
- <zipfileset src="${asm.asm.lib}/asm.jar"/>
- <zipfileset src="${asm.asm.lib}/asm-attrs.jar"/>
- <zipfileset src="${antlr.antlr.lib}/antlr-2.7.6.jar"/>
+ <zipfileset src="${antlr.antlr.lib}/antlr.jar"/>
<zipfileset src="${cglib.lib}/cglib.jar"/>
<zipfileset src="${dom4j.dom4j.lib}/dom4j.jar"/>
<zipfileset src="${apache.logging.lib}/commons-logging.jar"/>
@@ -424,7 +431,7 @@
<zipfileset src="${apache.xerces.lib}/xml-apis.jar" excludes="**/license"/>
<zipfileset src="${javassist.lib}/javassist.jar"/>
<zipfileset src="${trove.lib}/trove.jar"/>
- <zipfileset src="${quartz.quartz.lib}/quartz-all-1.5.2.jar"/>
+ <zipfileset src="${quartz.quartz.lib}/quartz-all.jar"/>
</jar>
</target>
Modified: trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -21,37 +21,30 @@
*/
package org.jboss.embedded;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
+import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployer;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.Kernel;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.io.FileInputStream;
-import java.io.ObjectInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Field;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.List;
-
/**
* comment
*
* @author <a href="bill at jboss.com">Bill Burke</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*/
public class BinaryBootstrap extends Bootstrap
@@ -67,7 +60,7 @@
/**
* For those applications that need a singelton Bootstrap instance
*
- * @return
+ * @return the bootstrap
*/
public static synchronized Bootstrap getInstance()
{
Modified: trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -21,32 +21,27 @@
*/
package org.jboss.embedded;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.List;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.deployers.client.spi.main.MainDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.IncompleteDeploymentException;
-import org.jboss.deployers.spi.IncompleteDeployments;
-import org.jboss.deployers.spi.IncompleteDeploymentsBuilder;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
+import org.jboss.embedded.adapters.ServerConfig;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
-import org.jboss.virtual.VirtualFile;
import org.jboss.logging.Logger;
-import org.jboss.embedded.adapters.ServerConfig;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.Dispatcher;
+import org.jboss.virtual.VirtualFile;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Enumeration;
-
/**
* Basic bootstrap class for embeddable JBoss
*
* @author <a href="bill at jboss.com">Bill Burke</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*/
public class Bootstrap
@@ -69,7 +64,7 @@
/**
* For those applications that need a singelton Bootstrap instance
*
- * @return
+ * @return the bootstrap
*/
public static synchronized Bootstrap getInstance()
{
@@ -132,18 +127,6 @@
return bootstrap1.getKernel();
}
- /**
- * Check whether we are incomplete
- *
- * @throws DeploymentException the deployment exception
- */
- protected void checkIncomplete() throws DeploymentException
- {
- IncompleteDeployments incomplete = IncompleteDeploymentsBuilder.build(mainDeployer, kernel.getController());
- if (incomplete.isIncomplete())
- throw new IncompleteDeploymentException(incomplete);
- }
-
protected void deployBaseBootstrapUrl(URL url) throws Throwable
{
BeanXMLDeployer deployer = new BeanXMLDeployer(kernel);
@@ -166,7 +149,7 @@
{
throw new RuntimeException("Unable to bootstrap: ", throwable);
}
- checkIncomplete();
+ mainDeployer.checkComplete();
started = true;
}
@@ -431,8 +414,6 @@
public void undeployResourceBases(String baseResource) throws DeploymentException
{
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- if (loader != null) classLoader = loader;
try
{
Enumeration<URL> urls = loader.getResources(baseResource);
@@ -486,8 +467,7 @@
public void undeploy(VirtualFile vf)
throws DeploymentException
{
- String name = AbstractDeploymentContext.getDeploymentName(vf);
- mainDeployer.removeDeploymentContext(name);
+ mainDeployer.removeDeployment(vf.getName());
mainDeployer.process();
}
@@ -495,10 +475,7 @@
{
List<VirtualFile> files = DeploymentGroup.getDeployerDirUrls(null, url, recurse);
for (VirtualFile vf : files)
- {
- String name = AbstractDeploymentContext.getDeploymentName(vf);
- mainDeployer.removeDeploymentContext(name);
- }
+ mainDeployer.removeDeployment(vf.getName());
mainDeployer.process();
}
@@ -508,10 +485,7 @@
if (loader != null) classLoader = loader;
List<VirtualFile> files = DeploymentGroup.getDeployerDirUrlsFromResource(null, classLoader, resource, recurse);
for (VirtualFile vf : files)
- {
- String name = AbstractDeploymentContext.getDeploymentName(vf);
- mainDeployer.removeDeploymentContext(name);
- }
+ mainDeployer.removeDeployment(vf.getName());
mainDeployer.process();
}
Modified: trunk/embedded/src/main/java/org/jboss/embedded/ClassLoaderDeployer.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/ClassLoaderDeployer.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/ClassLoaderDeployer.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -21,18 +21,18 @@
*/
package org.jboss.embedded;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractTopLevelClassLoaderDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.deployer.helpers.AbstractTopLevelClassLoaderDeployer;
+import org.jboss.deployers.structure.spi.DeploymentContext;
/**
* comment
*
* @author <a href="bill at jboss.com">Bill Burke</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*/
public class ClassLoaderDeployer extends AbstractTopLevelClassLoaderDeployer
{
-
public ClassLoader createTopLevelClassLoader(DeploymentContext context) throws Exception
{
context.setClassLoader(Thread.currentThread().getContextClassLoader());
Modified: trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -22,18 +22,6 @@
package org.jboss.embedded;
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.IncompleteDeploymentException;
-import org.jboss.deployers.spi.IncompleteDeployments;
-import org.jboss.deployers.spi.IncompleteDeploymentsBuilder;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.kernel.Kernel;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -43,15 +31,27 @@
import java.util.List;
import java.util.StringTokenizer;
+import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.kernel.Kernel;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+
/**
* comment
*
* @author <a href="bill at jboss.com">Bill Burke</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*/
public class DeploymentGroup
{
- private ArrayList<DeploymentContext> deployments = new ArrayList<DeploymentContext>();
+ private ArrayList<VFSDeployment> deployments = new ArrayList<VFSDeployment>();
protected MainDeployer mainDeployer;
protected Kernel kernel;
private VirtualFileFilter filter;
@@ -126,7 +126,7 @@
public void process() throws DeploymentException
{
mainDeployer.process();
- checkIncomplete();
+ mainDeployer.checkComplete();
}
/**
@@ -136,22 +136,11 @@
*/
public void undeploy() throws DeploymentException
{
- for (DeploymentContext ctx : deployments)
- {
- mainDeployer.removeDeploymentContext(ctx.getName());
- }
+ for (VFSDeployment ctx : deployments)
+ mainDeployer.removeDeployment(ctx);
process();
}
- protected void checkIncomplete() throws DeploymentException
- {
- IncompleteDeployments incomplete = IncompleteDeploymentsBuilder.build(mainDeployer, kernel.getController());
- if (incomplete.isIncomplete())
- {
- throw new IncompleteDeploymentException(incomplete);
- }
- }
-
/**
* Schedule a VirtualFile to be deployed
*
@@ -160,8 +149,9 @@
*/
public void add(VirtualFile vf) throws DeploymentException
{
- DeploymentContext deployment = new AbstractDeploymentContext(vf);
- mainDeployer.addDeploymentContext(deployment);
+ VFSDeploymentFactory factory = VFSDeploymentFactory.getInstance();
+ VFSDeployment deployment = factory.createVFSDeployment(vf);
+ mainDeployer.addDeployment(deployment);
deployments.add(deployment);
}
@@ -506,8 +496,28 @@
}
- public ArrayList<DeploymentContext> getDeployments()
+ /**
+ * Get the deployment units
+ *
+ * @return the deployment units
+ * @throws IllegalStateException when the units cannot be located
+ */
+ public List<DeploymentUnit> getDeploymentUnits()
{
+ ArrayList<DeploymentUnit> result = new ArrayList<DeploymentUnit>();
+ MainDeployerStructure structure = (MainDeployerStructure) mainDeployer;
+ for (VFSDeployment deployment : deployments)
+ {
+ DeploymentUnit unit = structure.getDeploymentUnit(deployment.getName());
+ if (unit == null)
+ throw new IllegalStateException("DeploymentUnit not found " + deployment.getName());
+ result.add(unit);
+ }
+ return result;
+ }
+
+ public List<VFSDeployment> getDeployments()
+ {
return deployments;
}
@@ -562,8 +572,7 @@
*
* @param loader
* @param resource
- * @return
- * @throws Exception
+ * @return the url
*/
public static URL getDirFromResource(ClassLoader loader, String resource)
{
Modified: trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -54,6 +54,7 @@
*
* @author Scott.Stark at jboss.org
* @author bill at jboss.org
+ * @author adrian at jboss.org
* @version $Revision:$
*/
public class JMXKernel extends JBossObject implements JMXKernelMBean, NotificationEmitter
@@ -105,7 +106,7 @@
* We don't want to override platforms default mechanism for creating MBeanServer so lets just do it ourselves
*
* @param domain
- * @return
+ * @return the mbeanserver
*/
private MBeanServer createMBeanServer(String domain)
{
Modified: trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -40,12 +40,18 @@
* Simple, local-only UserTransaction adapter
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @author adrian at jboss.org
* @version $Revision: 40050 $
*/
public final class LocalOnlyUserTransaction implements UserTransaction, java.io.Externalizable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -5998336139321082314L;
+
protected static Logger log = Logger.getLogger(LocalOnlyUserTransaction.class);
+ private boolean trace = log.isTraceEnabled();
+
/**
* Timeout value in seconds for new transactions started
* by this bean instance.
@@ -58,8 +64,8 @@
public void start()
{
- if (log.isDebugEnabled())
- log.debug("new UserTx: " + this);
+ if (trace)
+ log.trace("new UserTx: " + this);
this.tm = TxUtil.getTransactionManager();
}
@@ -75,8 +81,8 @@
tm.begin();
Transaction tx = tm.getTransaction();
- if (log.isDebugEnabled())
- log.debug("UserTx begin: " + tx);
+ if (trace)
+ log.trace("UserTx begin: " + tx);
}
@@ -85,8 +91,8 @@
SecurityException, IllegalStateException, SystemException
{
Transaction tx = tm.getTransaction();
- if (log.isDebugEnabled())
- log.debug("UserTx commit: " + tx);
+ if (trace)
+ log.trace("UserTx commit: " + tx);
tm.commit();
}
@@ -95,8 +101,8 @@
throws IllegalStateException, SecurityException, SystemException
{
Transaction tx = tm.getTransaction();
- if (log.isDebugEnabled())
- log.debug("UserTx rollback: " + tx);
+ if (trace)
+ log.trace("UserTx rollback: " + tx);
tm.rollback();
}
@@ -104,8 +110,8 @@
throws IllegalStateException, SystemException
{
Transaction tx = tm.getTransaction();
- if (log.isDebugEnabled())
- log.debug("UserTx setRollbackOnly: " + tx);
+ if (trace)
+ log.trace("UserTx setRollbackOnly: " + tx);
tm.setRollbackOnly();
}
Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -21,18 +21,18 @@
*/
package org.jboss.embedded.tomcat;
+import java.io.File;
+import java.lang.reflect.Method;
+
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.core.StandardContext;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.embedded.Bootstrap;
import org.jboss.embedded.DeploymentGroup;
-import java.io.File;
-import java.lang.reflect.Method;
-
/**
* Searches for WAR's WEB-INF directory and deploys that directory.
* A JBoss DeploymentContext is created and the StandardContext is added as an attachment
@@ -41,6 +41,7 @@
* a directory in a file system.
*
* @author <a href="bill at jboss.com">Bill Burke</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*/
public class WebinfScanner implements LifecycleListener
@@ -81,9 +82,9 @@
{
group.add(webInfClasses.toURL());
}
- for (DeploymentContext deployment : group.getDeployments())
+ for (DeploymentUnit deployment : group.getDeploymentUnits())
{
- deployment.getTransientAttachments().addAttachment(StandardContext.class, container);
+ deployment.getTransientManagedObjects().addAttachment(StandardContext.class, container);
}
group.process();
}
Modified: trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java 2007-07-02 15:00:18 UTC (rev 63770)
@@ -21,32 +21,29 @@
*/
package org.jboss.naming;
-import org.jnp.interfaces.NamingContext;
-import org.jnp.interfaces.Naming;
-import org.jboss.aspects.remoting.Remoting;
-import org.jboss.aspects.remoting.IsLocalInterceptor;
-import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
-import org.jboss.aspects.remoting.PojiProxy;
-import org.jboss.aspects.security.SecurityClientInterceptor;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.security.auth.callback.UsernamePasswordHandler;
-import org.jboss.security.jndi.*;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.remoting.InvokerLocator;
+import java.security.Principal;
+import java.util.Hashtable;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.ObjectFactory;
+import javax.naming.AuthenticationException;
import javax.naming.Context;
-import javax.naming.NamingException;
import javax.naming.Name;
+import javax.naming.NamingException;
import javax.naming.Reference;
-import javax.naming.AuthenticationException;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.ObjectFactory;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import java.util.Hashtable;
-import java.security.Principal;
-import java.lang.reflect.Proxy;
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aspects.remoting.InvokeRemoteInterceptor;
+import org.jboss.aspects.remoting.IsLocalInterceptor;
+import org.jboss.aspects.remoting.Remoting;
+import org.jboss.aspects.security.SecurityClientInterceptor;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.callback.UsernamePasswordHandler;
+import org.jnp.interfaces.Naming;
+import org.jnp.interfaces.NamingContext;
+
/**
* Creating a JNDI connection using JBoss Remoting.
*
@@ -68,6 +65,7 @@
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @author <a href="mailto:scott at jboss.org">Scott Stark</a>
+ * @author adrian at jboss.org
* @version $Revision: 37459 $
*/
public class JBossRemotingContextFactory
Modified: trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2007-07-02 15:00:18 UTC (rev 63770)
@@ -35,95 +35,110 @@
</bean>
<!-- The MainDeployer -->
- <bean name="MainDeployer" class="org.jboss.deployers.plugins.deployment.MainDeployerImpl">
- <property name="structureDeployers">
- <list>
- <!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployers.plugins.structure.vfs.explicit.DeclaredStructure">
- </bean>
- <!-- JAR Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.plugins.structure.vfs.jar.JARStructure">
- <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>.zip</value>
- <value>.ear</value>
- <value>.jar</value>
- <value>.rar</value>
- <value>.war</value>
- <value>.sar</value>
- <value>.har</value>
- <value>.aop</value>
- <value>.deployer</value>
- <value>.beans</value>
- </set>
- </parameter>
- </constructor>
- <property name="candidateStructureVisitorFactory">
- <!-- Any file that is not an ordinary directory is a candidate -->
- <bean name="JARStructureCandidates"
- class="org.jboss.deployers.plugins.structure.vfs.jar.JARCandidateStructureVisitorFactory">
- <!-- A filter to exclude some obvious non-subdeployments -->
- <property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
- <constructor>
- <parameter>
- <list elementClass="java.lang.String">
- <!-- Exclude class files as subdeployments -->
- <value>.class</value>
- </list>
- </parameter>
- </constructor>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
- <!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.plugins.structure.vfs.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-service.xml</value>
- <value>-beans.xml</value>
- <value>-ds.xml</value>
- <value>-aop.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
- </list>
+ <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+ <property name="deployers"><inject bean="Deployers"/></property>
+ </bean>
+
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
</property>
- <property name="deployers">
- <list>
- <!-- POJO Deployment -->
- <bean name="BeanDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanDeployer"/>
- <bean name="KernelDeploymentDeployer"
- class="org.jboss.deployers.plugins.deployers.kernel.KernelDeploymentDeployer"/>
- <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.plugins.deployers.kernel.BeanMetaDataDeployer">
- <constructor>
- <parameter>
- <inject bean="jboss.kernel:service=Kernel"/>
- </parameter>
- </constructor>
- </bean>
- <!-- JMX Deployment -->
- <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"/>
- <bean name="ServiceClassLoaderDeployer" class="org.jboss.embedded.ClassLoaderDeployer"/>
- <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"/>
- <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
- <constructor>
- <parameter>
- <inject bean="JMXKernel" property="serviceController"/>
- </parameter>
- </constructor>
- </bean>
- </list>
- </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
</bean>
+
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+ <!-- A declared structure descriptor deployer -->
+ <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>.zip</value>
+ <value>.ear</value>
+ <value>.jar</value>
+ <value>.rar</value>
+ <value>.war</value>
+ <value>.sar</value>
+ <value>.har</value>
+ <value>.aop</value>
+ <value>.deployer</value>
+ <value>.beans</value>
+ </set>
+ </parameter>
+ </constructor>
+ <property name="candidateStructureVisitorFactory">
+ <!-- Any file that is not an ordinary directory is a candidate -->
+ <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+ <!-- A filter to exclude some obvious non-subdeployments -->
+ <property name="filter">
+ <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <constructor><parameter>
+ <list elementClass="java.lang.String">
+ <!-- Exclude class files as subdeployments -->
+ <value>.class</value>
+ </list>
+ </parameter></constructor>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-service.xml</value>
+ <value>-beans.xml</value>
+ <value>-ds.xml</value>
+ <value>-aop.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- POJO Deployment -->
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="type">beans</property>
+ </bean>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+ <property name="type">beans</property>
+ </bean>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ <property name="type">beans</property>
+ </bean>
+
+ <!-- JMX Deployment -->
+ <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
+ <property name="type">sar</property>
+ </bean>
+ <bean name="ServiceClassLoaderDeployer" class="org.jboss.embedded.ClassLoaderDeployer"/>
+ <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
+ <property name="type">sar</property>
+ </bean>
+ <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
+ <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
+ <property name="type">sar</property>
+ </bean>
+
<!-- A filter for excluding files from the scanner -->
<bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
<!-- Files starting with theses strings are ignored -->
Modified: trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml 2007-07-02 15:00:18 UTC (rev 63770)
@@ -4,13 +4,47 @@
Aspect Deployer
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ Valid values for the AspectManager bean for use with enableTransformer=true are:
+ * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
+ * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+ -->
+ <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+ <constructor>
+ <parameter><![CDATA[
+ <aop>
+ </aop>]]>
+ </parameter>
+ </constructor>
+
+ <property name="enableLoadtimeWeaving">false</property>
+ <!-- only relevant when EnableLoadtimeWeaving is true.
+ When transformer is on, every loaded class gets
+ transformed. If AOP can't find the class, then it
+ throws an exception. Sometimes, classes may not have
+ all the classes they reference. So, the Suppressing
+ is needed. (i.e. Jboss cache in the default configuration -->
+ <property name="suppressTransformationErrors">true</property>
+ <property name="prune">true</property>
+ <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+ <property name="exclude">org.jboss.</property>
+ <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+ <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+ <property name="optimized">true</property>
+ <property name="verbose">false</property>
+ <!--
+ Available choices for this attribute are:
+ org.jboss.aop.instrument.ClassicInstrumentor (default)
+ org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+ <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+ -->
+ </bean>
+
<!-- Aspect Deployment -->
- <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
+ <!-- TODO FIXME once aop is up-date with new deployers -->
+ <bean name="AspectDeployer" class="org.jboss.aop.deployers.temp.AspectDeployer">
+ <property name="type">aop</property>
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
</bean>
</deployment>
Modified: trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml 2007-07-02 15:00:18 UTC (rev 63770)
@@ -8,16 +8,6 @@
<bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
<bean name="EJBRegistrationDeployer" class="org.jboss.ejb3.deployers.EJBRegistrationDeployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
@@ -106,16 +96,6 @@
<depends>AspectDeployer</depends>
</bean>
<bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>AspectDeployer</depends>
</bean>
Modified: trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml 2007-07-02 12:38:59 UTC (rev 63769)
+++ trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml 2007-07-02 15:00:18 UTC (rev 63770)
@@ -8,24 +8,12 @@
<!-- RAR Deployment -->
<bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
<property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">rar</property>
</bean>
<bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
<property name="workManagerName">jboss.jca:service=WorkManager</property>
<property name="XATerminatorName">jboss:service=TransactionManager</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">rar</property>
</bean>
@@ -36,12 +24,6 @@
<bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
<property name="suffix">-ds.xml</property>
<property name="XSLPath">stylesheets/NoJRMPConnectionFactoryTemplate.xsl</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">jca-ds</property>
</bean>
More information about the jboss-cvs-commits
mailing list