[jboss-cvs] JBossAS SVN: r99777 - in projects/reloaded/trunk/vdf-bootstrap-minimal/src: main/resources and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 21 15:27:03 EST 2010
Author: ALRubinger
Date: 2010-01-21 15:27:03 -0500 (Thu, 21 Jan 2010)
New Revision: 99777
Added:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/Descriptors.java
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_classloading.xml
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml
Removed:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml
Modified:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java
Log:
[RELOADED-10] Move the descriptors to the main package and out of tests; rename the contract from which we obtain descriptor names to something simpler, "Descriptors"
Copied: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/Descriptors.java (from rev 99522, projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java)
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/Descriptors.java (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/Descriptors.java 2010-01-21 20:27:03 UTC (rev 99777)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.
+ */
+import org.jboss.deployers.client.spi.main.MainDeployer;
+
+/**
+ * Contains contracted names of the {@link ClassLoader}
+ * resources which are Microcontainer descriptors
+ * containing the components needed to boot the Virtual
+ * Deployment Framework
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ */
+public interface Descriptors
+{
+ /**
+ * Name of the resource containing a Microcontainer
+ * deployment descriptor capable of launching VDF elements
+ * required for {@link MainDeployer} support
+ */
+ String RESOURCE_NAME_VDF = "org.jboss.reloaded_vdf.xml";
+
+ /**
+ * Name of the resource containing a Microcontainer
+ * deployment descriptor capable of launching VFS-based
+ * ClassLoading
+ */
+ String RESOURCE_NAME_CLASSLOADING = "org.jboss.reloaded_classloading.xml";
+}
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java 2010-01-21 20:23:48 UTC (rev 99776)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/VdfBootstrapDescriptorNames.java 2010-01-21 20:27:03 UTC (rev 99777)
@@ -1,48 +0,0 @@
-import org.jboss.deployers.client.spi.main.MainDeployer;
-
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.
- */
-
-/**
- * Contains contracted names of the {@link ClassLoader}
- * resources which are Microcontainer descriptors
- * containing the components needed to boot the Virtual
- * Deployment Framework
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- */
-public interface VdfBootstrapDescriptorNames
-{
- /**
- * Name of the resource containing a Microcontainer
- * deployment descriptor capable of launching VDF elements
- * required for {@link MainDeployer} support
- */
- String RESOURCE_NAME_VDF = "org.jboss.reloaded_vdf.xml";
-
- /**
- * Name of the resource containing a Microcontainer
- * deployment descriptor capable of launching VFS-based
- * ClassLoading
- */
- String RESOURCE_NAME_CLASSLOADING = "org.jboss.reloaded_classloading.xml";
-}
Copied: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_classloading.xml (from rev 99522, projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml)
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_classloading.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_classloading.xml 2010-01-21 20:27:03 UTC (rev 99777)
@@ -0,0 +1,31 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- VFS ClassLoader -->
+ <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+ <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+ </bean>
+ <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+ <incallback method="addModule" state="Configured"/>
+ <uncallback method="removeModule" state="Configured"/>
+ </bean>
+ <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-classloading.xml</property>
+ <property name="buildManagedObject">true</property>
+ </bean>
+ <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+ <property name="defaultMetaData">
+ <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
+ </property>
+ </bean>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
+ <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ </bean>
+ <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ <property name="system"><inject bean="ClassLoaderSystem"/></property>
+ </bean>
+</deployment>
Copied: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml (from rev 99522, projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml)
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml 2010-01-21 20:27:03 UTC (rev 99777)
@@ -0,0 +1,93 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The ManagedObjectFactory -->
+ <bean name="ManagedObjectFactory">
+ <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+ <!-- Accept any implementor of InstanceClassFactory -->
+ <incallback method="addInstanceClassFactory"/>
+ <uncallback method="removeInstanceClassFactory"/>
+ </bean>
+
+ <!-- The MainDeployer -->
+ <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+ <property name="deployers"><inject bean="Deployers"/></property>
+ <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+ </bean>
+
+ <!-- The ManagedDeploymentCreator implementation -->
+ <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
+ <!-- The ManagedObjectCreator implementation -->
+ <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+ <property name="mof"><inject bean="ManagedObjectFactory"/></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>
+ <!-- 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>
+ <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
+ <!-- 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"/>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <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"/>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of KernelControllerContextCreator -->
+ <incallback method="addControllerContextCreator"/>
+ <uncallback method="removeControllerContextCreator"/>
+ </bean>
+
+</deployment>
Modified: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java 2010-01-21 20:23:48 UTC (rev 99776)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/MainDeployerViaBootstrapUnitTest.java 2010-01-21 20:27:03 UTC (rev 99777)
@@ -83,9 +83,9 @@
// Add the required bootstrap descriptors
final List<BootstrapDescriptor> descriptors = mcServer.getConfiguration().getBootstrapDescriptors();
- descriptors.add(new ClassLoaderResourceBootstrapDescriptor(VdfBootstrapDescriptorNames.RESOURCE_NAME_VDF));
+ descriptors.add(new ClassLoaderResourceBootstrapDescriptor(Descriptors.RESOURCE_NAME_VDF));
descriptors
- .add(new ClassLoaderResourceBootstrapDescriptor(VdfBootstrapDescriptorNames.RESOURCE_NAME_CLASSLOADING));
+ .add(new ClassLoaderResourceBootstrapDescriptor(Descriptors.RESOURCE_NAME_CLASSLOADING));
log.info("Using bootstrap descriptors:" + descriptors);
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml 2010-01-21 20:23:48 UTC (rev 99776)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_classloading.xml 2010-01-21 20:27:03 UTC (rev 99777)
@@ -1,31 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- VFS ClassLoader -->
- <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
- <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
- </bean>
- <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
- <incallback method="addModule" state="Configured"/>
- <uncallback method="removeModule" state="Configured"/>
- </bean>
- <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
- <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
- </constructor>
- <property name="name">jboss-classloading.xml</property>
- <property name="buildManagedObject">true</property>
- </bean>
- <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
- <property name="defaultMetaData">
- <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
- </property>
- </bean>
- <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
- <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
- <property name="classLoading"><inject bean="ClassLoading"/></property>
- </bean>
- <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
- <property name="classLoading"><inject bean="ClassLoading"/></property>
- <property name="system"><inject bean="ClassLoaderSystem"/></property>
- </bean>
-</deployment>
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml 2010-01-21 20:23:48 UTC (rev 99776)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/resources/org.jboss.reloaded_vdf.xml 2010-01-21 20:27:03 UTC (rev 99777)
@@ -1,93 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The ManagedObjectFactory -->
- <bean name="ManagedObjectFactory">
- <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
- <!-- Accept any implementor of InstanceClassFactory -->
- <incallback method="addInstanceClassFactory"/>
- <uncallback method="removeInstanceClassFactory"/>
- </bean>
-
- <!-- The MainDeployer -->
- <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
- <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
- <property name="deployers"><inject bean="Deployers"/></property>
- <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
- </bean>
-
- <!-- The ManagedDeploymentCreator implementation -->
- <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
- <!-- The ManagedObjectCreator implementation -->
- <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
- <property name="mof"><inject bean="ManagedObjectFactory"/></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>
- <!-- 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>
- <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
- <!-- 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"/>
-
- <!-- JAR Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <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"/>
- <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
- <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor><parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of KernelControllerContextCreator -->
- <incallback method="addControllerContextCreator"/>
- <uncallback method="removeControllerContextCreator"/>
- </bean>
-
-</deployment>
More information about the jboss-cvs-commits
mailing list