[jboss-cvs] JBossAS SVN: r89033 - in branches/Branch_5_x: system/src/main/org/jboss/deployers/plugins/managed and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 19 02:40:23 EDT 2009
Author: scott.stark at jboss.org
Date: 2009-05-19 02:40:23 -0400 (Tue, 19 May 2009)
New Revision: 89033
Modified:
branches/Branch_5_x/server/src/etc/conf/default/bootstrap/profile.xml
branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/AbstractComponentMapper.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/ComponentMapperRegistry.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
Log:
JBAS-5990, update component mapping registry
Modified: branches/Branch_5_x/server/src/etc/conf/default/bootstrap/profile.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/default/bootstrap/profile.xml 2009-05-19 06:18:36 UTC (rev 89032)
+++ branches/Branch_5_x/server/src/etc/conf/default/bootstrap/profile.xml 2009-05-19 06:40:23 UTC (rev 89033)
@@ -12,6 +12,14 @@
<root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
</classloader>
+ <bean name="ComponentMapperRegistry"
+ class="org.jboss.system.server.profileservice.persistence.component.ComponentMapperRegistry">
+ <constructor factoryClass="org.jboss.system.server.profileservice.persistence.component.ComponentMapperRegistry" factoryMethod="getInstance"/>
+ <!-- Accept any AbstractprofileFactory -->
+ <incallback method="addMapper" />
+ <uncallback method="removeComponentMapper" />
+ </bean>
+
<!--
The profile configuration
This contains required properties:
@@ -158,6 +166,14 @@
<bean name="KernelDeploymentComponentMapper" class="org.jboss.deployers.plugins.managed.KernelDeploymentComponentMapper">
<constructor><parameter><inject bean="PersistenceFactory" /></parameter></constructor>
+ <!-- Register under the attachment interface name as well -->
+ <install bean="ComponentMapperRegistry" method="addMapper">
+ <parameter class="java.lang.String">org.jboss.kernel.spi.deployment.KernelDeployment</parameter>
+ <parameter class="org.jboss.system.server.profileservice.persistence.component.ComponentMapper"><this/></parameter>
+ </install>
+ <uninstall bean="ComponentMapperRegistry" method="removeComponentMapper">
+ <parameter class="java.lang.String">org.jboss.kernel.spi.deployment.KernelDeployment</parameter>
+ </uninstall>
</bean>
<bean name="ServiceDeploymentComponentMapper" class="org.jboss.system.deployers.managed.ServiceDeploymentComponentMapper">
<constructor><parameter><inject bean="PersistenceFactory" /></parameter></constructor>
Modified: branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java 2009-05-19 06:18:36 UTC (rev 89032)
+++ branches/Branch_5_x/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java 2009-05-19 06:40:23 UTC (rev 89033)
@@ -31,6 +31,7 @@
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.plugins.config.Configurator;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
import org.jboss.managed.api.Fields;
@@ -290,7 +291,15 @@
protected ClassLoader getClassLoader(BeanMetaData bmd)
{
- ClassLoader loader = null; //Configurator.getClassLoader(bmd);
+ ClassLoader loader = null;
+ try
+ {
+ loader = Configurator.getClassLoader(bmd);
+ }
+ catch(Throwable t)
+ {
+ log.debug("Failed to load BeanMetaData class loader", t);
+ }
// Fallback to TCL if there is no
if(loader == null)
loader = SecurityActions.getContextClassLoader();
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/AbstractComponentMapper.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/AbstractComponentMapper.java 2009-05-19 06:18:36 UTC (rev 89032)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/AbstractComponentMapper.java 2009-05-19 06:40:23 UTC (rev 89033)
@@ -151,7 +151,7 @@
protected abstract void setComponentName(PersistedComponent component, ManagedObject mo);
/**
- * Update a attachment descriptor based on the persisted
+ * Update a attachment descripto based on the persisted
* component information.
*
* @param attachment the attachment
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/ComponentMapperRegistry.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/ComponentMapperRegistry.java 2009-05-19 06:18:36 UTC (rev 89032)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/component/ComponentMapperRegistry.java 2009-05-19 06:40:23 UTC (rev 89033)
@@ -72,12 +72,18 @@
{
if(mapper == null)
throw new IllegalArgumentException("null mapper");
- if(mapper.getType() == null)
- throw new IllegalArgumentException("null mapper type");
this.map.put(mapper.getType(), mapper);
}
+ public void addMapper(String type, ComponentMapper mapper)
+ {
+ if(type == null)
+ throw new IllegalArgumentException("null mapper type");
+
+ this.map.put(type, mapper);
+ }
+
/**
* Remove a component mapper.
*
@@ -88,11 +94,15 @@
{
if(mapper == null)
throw new IllegalArgumentException("null mapper");
- if(mapper.getType() == null)
+ return removeComponentMapper(mapper.getType());
+ }
+
+ public ComponentMapper removeComponentMapper(String type)
+ {
+ if(type == null)
throw new IllegalArgumentException("null mapper type");
- return this.map.remove(mapper.getType());
+ return this.map.remove(type);
}
-
}
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2009-05-19 06:18:36 UTC (rev 89032)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2009-05-19 06:40:23 UTC (rev 89033)
@@ -196,7 +196,7 @@
protected void loadApplications(VirtualFile applicationDir) throws Exception
{
ArrayList<VirtualFile> added = new ArrayList<VirtualFile>();
- addedDeployments(added, applicationDir);
+ addedDeployment(added, applicationDir);
for (VirtualFile vf : added)
{
ProfileDeployment vfCtx = createDeployment(vf);
@@ -214,7 +214,7 @@
*/
protected void addedDeployments(List<VirtualFile> list, VirtualFile root) throws IOException, URISyntaxException
{
- if(root.isLeaf())
+ if(root.isLeaf() == true || root.isArchive() == true)
{
addedDeployment(list, root);
}
More information about the jboss-cvs-commits
mailing list