[jboss-cvs] JBossAS SVN: r80666 - in trunk: connector/src/main/org/jboss/resource/deployers and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 7 11:06:12 EST 2008
Author: scott.stark at jboss.org
Date: 2008-11-07 11:06:12 -0500 (Fri, 07 Nov 2008)
New Revision: 80666
Removed:
trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/AbstractInstanceClassFactory.java
trunk/profileservice/src/main/org/jboss/profileservice/management/plugins/BasicDeploymentTemplateInfo.java
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java
trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxCFInstanceClassFactory.java
trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxInstanceClassFactory.java
trunk/connector/src/main/org/jboss/resource/deployers/management/TxInstanceClassFactory.java
trunk/connector/src/main/org/jboss/resource/deployers/management/XADSInstanceClassFactory.java
trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml
trunk/connector/src/tests/org/jboss/tests/jca/managed/TestICFOverloadingTestCase.java
trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/XADSInstanceClassFactory.java
trunk/profileservice/build.xml
trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java
trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java
trunk/security/src/etc/deploy/security-jboss-beans.xml
trunk/server/src/etc/conf/default/deployers.xml
trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
trunk/system/.classpath
trunk/system/build.xml
trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
trunk/testsuite/.classpath
trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java
Log:
JBAS-6046, JBAS-6048 update jboss-managed to 2.0.0.CR4 jboss-deployers to 2.0.0.CR5
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/component-matrix/pom.xml 2008-11-07 16:06:12 UTC (rev 80666)
@@ -57,10 +57,10 @@
<version.org.jboss.reflect>2.0.0.GA</version.org.jboss.reflect>
<version.org.jboss.vfs>2.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
- <version.org.jboss.man>2.0.0.CR3</version.org.jboss.man>
+ <version.org.jboss.man>2.0.0.CR4</version.org.jboss.man>
<version.org.jboss.microcontainer>2.0.0.CR5</version.org.jboss.microcontainer>
<version.org.jboss.cl>2.0.0.CR5</version.org.jboss.cl>
- <version.org.jboss.deployers>2.0.0.CR4</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.0.0.CR5</version.org.jboss.deployers>
<version.org.jboss.cache.core>3.0.0.CR4</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.CR4</version.org.jboss.cache.pojo>
<version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -23,6 +23,7 @@
import java.io.InputStream;
import java.util.Map;
+import java.util.Set;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
@@ -32,26 +33,14 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
-import org.jboss.resource.deployers.management.LocalDSInstanceClassFactory;
-import org.jboss.resource.deployers.management.NoTxCFInstanceClassFactory;
-import org.jboss.resource.deployers.management.NoTxInstanceClassFactory;
-import org.jboss.resource.deployers.management.TxInstanceClassFactory;
-import org.jboss.resource.deployers.management.XADSInstanceClassFactory;
import org.jboss.virtual.VirtualFile;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
-import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
import org.jboss.metatype.api.types.CollectionMetaType;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.values.CollectionValue;
@@ -68,13 +57,13 @@
* TODO Note, this is currently a total hack until we can rework the JAXBDeployer
*/
public class ManagedConnectionFactoryParserDeployer extends AbstractVFSParsingDeployer<ManagedConnectionFactoryDeploymentGroup>
+ implements ManagedObjectCreator
{
/** The context */
private JAXBContext context;
/** The repository */
private JCAMetaDataRepository repository;
- private ManagedObjectFactory moFactory;
/**
* Create a new ManagedConnectionFactoryParserDeployer.
@@ -85,13 +74,6 @@
setIncludeDeploymentFile(true);
setBuildManagedObject(true);
- moFactory = ManagedObjectFactoryBuilder.create();
- // Setup the ManagedObject builders and InstanceClassFactorys
- moFactory.setInstanceClassFactory(LocalDataSourceDeploymentMetaData.class, new LocalDSInstanceClassFactory(moFactory));
- moFactory.setInstanceClassFactory(XADataSourceDeploymentMetaData.class, new XADSInstanceClassFactory(moFactory));
- moFactory.setInstanceClassFactory(NoTxDataSourceDeploymentMetaData.class, new NoTxInstanceClassFactory(moFactory));
- moFactory.setInstanceClassFactory(TxConnectionFactoryDeploymentMetaData.class, new TxInstanceClassFactory(moFactory));
- moFactory.setInstanceClassFactory(NoTxConnectionFactoryDeploymentMetaData.class, new NoTxCFInstanceClassFactory(moFactory));
}
/**
@@ -155,10 +137,9 @@
* @param managedObjects map of managed objects
* @throws DeploymentException for any deployment exception
*/
- @Override
- public void build(DeploymentUnit unit, Map<String, ManagedObject> managedObjects) throws DeploymentException
+ public void build(DeploymentUnit unit, Set<String> outputs,
+ Map<String, ManagedObject> managedObjects) throws DeploymentException
{
- super.build(unit, managedObjects);
if(isBuildManagedObject())
{
ManagedObject mcfdgMO = managedObjects.get(ManagedConnectionFactoryDeploymentGroup.class.getName());
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -31,6 +31,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.factory.AbstractInstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
@@ -57,6 +58,11 @@
super(mof);
}
+ public Class<LocalDataSourceDeploymentMetaData> getType()
+ {
+ return LocalDataSourceDeploymentMetaData.class;
+ }
+
public Class<? extends Serializable> getManagedObjectClass(
LocalDataSourceDeploymentMetaData attachment)
throws ClassNotFoundException
@@ -65,6 +71,7 @@
}
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
LocalDataSourceDeploymentMetaData attachment)
{
MetaValue value = null;
@@ -84,7 +91,7 @@
}
else
{
- value = super.getValue(beanInfo, property, attachment);
+ value = super.getValue(beanInfo, property, metaData, attachment);
}
return value;
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxCFInstanceClassFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxCFInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxCFInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -25,6 +25,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.factory.AbstractInstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData;
@@ -48,7 +49,13 @@
super(mof);
}
+ public Class<NoTxConnectionFactoryDeploymentMetaData> getType()
+ {
+ return NoTxConnectionFactoryDeploymentMetaData.class;
+ }
+
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
NoTxConnectionFactoryDeploymentMetaData attachment)
{
MetaValue value = null;
@@ -58,7 +65,7 @@
}
else
{
- value = super.getValue(beanInfo, property, attachment);
+ value = super.getValue(beanInfo, property, metaData, attachment);
}
return value;
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxInstanceClassFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/NoTxInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -25,6 +25,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.factory.AbstractInstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
@@ -47,7 +48,13 @@
super(mof);
}
+ public Class<NoTxDataSourceDeploymentMetaData> getType()
+ {
+ return NoTxDataSourceDeploymentMetaData.class;
+ }
+
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
NoTxDataSourceDeploymentMetaData attachment)
{
MetaValue value = null;
@@ -57,7 +64,7 @@
}
else
{
- value = super.getValue(beanInfo, property, attachment);
+ value = super.getValue(beanInfo, property, metaData, attachment);
}
return value;
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/TxInstanceClassFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/TxInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/TxInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -25,6 +25,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.factory.AbstractInstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
@@ -49,7 +50,13 @@
super(mof);
}
+ public Class<TxConnectionFactoryDeploymentMetaData> getType()
+ {
+ return TxConnectionFactoryDeploymentMetaData.class;
+ }
+
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
TxConnectionFactoryDeploymentMetaData attachment)
{
MetaValue value = null;
@@ -59,7 +66,7 @@
}
else
{
- value = super.getValue(beanInfo, property, attachment);
+ value = super.getValue(beanInfo, property, metaData, attachment);
}
return value;
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/XADSInstanceClassFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/XADSInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/XADSInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -29,6 +29,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.factory.AbstractInstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
@@ -57,7 +58,13 @@
super(mof);
}
+ public Class<XADataSourceDeploymentMetaData> getType()
+ {
+ return XADataSourceDeploymentMetaData.class;
+ }
+
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
XADataSourceDeploymentMetaData attachment)
{
MetaValue metaValue = null;
@@ -82,7 +89,7 @@
}
else
{
- metaValue = super.getValue(beanInfo, property, attachment);
+ metaValue = super.getValue(beanInfo, property, metaData, attachment);
}
return metaValue;
}
Modified: trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml 2008-11-07 16:06:12 UTC (rev 80666)
@@ -39,7 +39,40 @@
<bean name="ConnectionManagerBuilder" class="org.jboss.resource.deployers.builder.ConnectionManagerBuilder"/>
<bean name="ConnectionFactoryBindingBuilder" class="org.jboss.resource.deployers.builder.ConnectionFactoryBindingBuilder"/>
<bean name="MetaDataTypeMappingBuilder" class="org.jboss.resource.deployers.builder.MetaDataTypeMappingBuilder"/>
+
+ <!-- The InstanceClassFactorys -->
+ <bean name="LocalDSInstanceClassFactory"
+ class="org.jboss.resource.deployers.management.LocalDSInstanceClassFactory">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="XADSInstanceClassFactory"
+ class="org.jboss.resource.deployers.management.XADSInstanceClassFactory">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="NoTxInstanceClassFactory"
+ class="org.jboss.resource.deployers.management.NoTxInstanceClassFactory">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="TxInstanceClassFactory"
+ class="org.jboss.resource.deployers.management.TxInstanceClassFactory">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="NoTxCFInstanceClassFactory"
+ class="org.jboss.resource.deployers.management.NoTxCFInstanceClassFactory">
+ <constructor>
+ <parameter><inject bean="ManagedObjectFactory"/></parameter>
+ </constructor>
+ </bean>
+ <!-- The *-ds.xml parsing deployer -->
<bean name="ManagedConnectionFactoryParserDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryParserDeployer">
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
Modified: trunk/connector/src/tests/org/jboss/tests/jca/managed/TestICFOverloadingTestCase.java
===================================================================
--- trunk/connector/src/tests/org/jboss/tests/jca/managed/TestICFOverloadingTestCase.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/tests/org/jboss/tests/jca/managed/TestICFOverloadingTestCase.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -46,9 +46,9 @@
XADSInstanceClassFactory icf = new XADSInstanceClassFactory();
XADataSourceDeploymentMetaData xads = new XADataSourceDeploymentMetaData();
ManagedPropertyImpl property = new ManagedPropertyImpl("xa-datasource-properties");
- icf.getValue(null, property, xads);
+ icf.getValue(null, property, null, xads);
InstanceClassFactory icfref = icf;
Serializable x = xads;
- icfref.getValue(null, property, x);
+ icfref.getValue(null, property, null, x);
}
}
Deleted: trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/AbstractInstanceClassFactory.java
===================================================================
--- trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/AbstractInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/AbstractInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.tests.jca.managed.icf;
-
-import java.io.Serializable;
-
-import org.jboss.beans.info.spi.BeanInfo;
-import org.jboss.logging.Logger;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.spi.factory.InstanceClassFactory;
-import org.jboss.metatype.api.values.MetaValue;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class AbstractInstanceClassFactory<T extends Serializable>
- implements InstanceClassFactory<T>
-{
- private static Logger log = Logger.getLogger(AbstractInstanceClassFactory.class);
-
- public Class<? extends Serializable> getManagedObjectClass(T attachment)
- throws ClassNotFoundException
- {
- log.info("getManagedObjectClass, "+attachment);
- return attachment.getClass();
- }
-
- public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
- T attachment)
- {
- log.info("getValue, "+attachment);
- return null;
- }
-
- public Object getComponentName(BeanInfo beanInfo, ManagedProperty property,
- T attachment, MetaValue value)
- {
- return null;
- }
-
- /**
- * Set a value
- *
- * @param beanInfo the bean info
- * @param property the property
- * @param object the object
- * @param the meta value
- */
- public void setValue(BeanInfo beanInfo, ManagedProperty property, T object, MetaValue value)
- {
- log.info("setValue, "+object.getClass());
- }
-
-}
Modified: trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/XADSInstanceClassFactory.java
===================================================================
--- trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/XADSInstanceClassFactory.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/connector/src/tests/org/jboss/tests/jca/managed/icf/XADSInstanceClassFactory.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -26,6 +26,8 @@
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedProperty;
+import org.jboss.managed.plugins.factory.AbstractInstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
@@ -47,7 +49,13 @@
return null;
}
+ public Class<XADataSourceDeploymentMetaData> getType()
+ {
+ return XADataSourceDeploymentMetaData.class;
+ }
+
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
XADataSourceDeploymentMetaData attachment)
{
log.info("getValue, "+property);
Modified: trunk/profileservice/build.xml
===================================================================
--- trunk/profileservice/build.xml 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/build.xml 2008-11-07 16:06:12 UTC (rev 80666)
@@ -82,6 +82,7 @@
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="stax.api.classpath"/>
<path refid="org.jboss.aspects.classpath"/>
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -71,6 +71,7 @@
import org.jboss.managed.api.annotation.ManagementObjectRef;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.managed.api.annotation.ViewUse;
+import org.jboss.managed.plugins.BasicDeploymentTemplateInfo;
import org.jboss.managed.plugins.ManagedComponentImpl;
import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
import org.jboss.metatype.api.types.ArrayMetaType;
@@ -81,7 +82,6 @@
import org.jboss.metatype.api.values.GenericValue;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValue;
-import org.jboss.profileservice.management.plugins.BasicDeploymentTemplateInfo;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
@@ -101,7 +101,7 @@
* @author ales.justin at jboss.org
* @version $Revision$
*/
- at ManagementObject
+ at ManagementObject(name="ManagementView", componentType=@ManagementComponent(type="MCBean", subtype="*"))
public class ManagementViewImpl implements ManagementView
{
private static Logger log = Logger.getLogger(ManagementViewImpl.class);
@@ -245,6 +245,8 @@
throws Exception
{
String key = mo.getName() + "/" + mo.getNameType();
+ if(mo.getName().equals("org.jboss.security.plugins.SecurityConfig"))
+ log.info("Saw SecurityConfig MO");
log.debug("ID for ManagedObject: "+key+", attachmentName: "+mo.getAttachmentName());
// See if this is a runtime ManagedObject
@@ -295,11 +297,10 @@
ManagementComponent mc = (ManagementComponent) moAnns.get(ManagementComponent.class.getName());
if (mc != null)
{
- log.debug("Processing ManagementComponent: "+mc);
ComponentType type = new ComponentType(mc.type(), mc.subtype());
ManagedComponentImpl comp = new ManagedComponentImpl(type, md, mo);
md.addComponent(mo.getName(), comp);
- log.debug("Added ManagementComponent: "+mc+"under name: "+mo.getName());
+ log.debug("Processing ManagementComponent: "+comp);
Set<ManagedComponent> typeComps = compByCompType.get(type);
if (typeComps == null)
{
@@ -719,18 +720,14 @@
// Now apply the managed properties to get the deployment ManagedObjects
Map<String, ManagedObject> mos = mainDeployer.getManagedObjects(ctx.getName());
log.debug("applyTemplate, profile="+activeProfile+", deploymentBaseName="+deploymentBaseName+", phase="+phase+", :"+mos);
- // TODO: need a proper api for mapping to the template properties
- if(info instanceof BasicDeploymentTemplateInfo)
+ // Map the
+ String propName = info.getRootManagedPropertyName();
+ if(propName != null)
{
- BasicDeploymentTemplateInfo binfo = (BasicDeploymentTemplateInfo) info;
- String propName = binfo.getRootManagedPropertyName();
- if(propName != null)
- {
- // Flatten out the root objects
- ManagedObject rootMO = mos.get(ctx.getName());
- if(rootMO != null)
- flattenRootObject(rootMO, propName, mos);
- }
+ // Flatten out the root objects
+ ManagedObject rootMO = mos.get(ctx.getName());
+ if(rootMO != null)
+ flattenRootObject(rootMO, propName, mos);
}
for(ManagedProperty prop : info.getProperties().values())
{
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
@@ -71,7 +72,8 @@
}
}
- public void build(DeploymentUnit unit, Map<String, ManagedObject> map)
+ public void build(DeploymentUnit unit, Set<String> outputs,
+ Map<String, ManagedObject> map)
throws DeploymentException
{
String name = unit.getSimpleName();
Deleted: trunk/profileservice/src/main/org/jboss/profileservice/management/plugins/BasicDeploymentTemplateInfo.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/plugins/BasicDeploymentTemplateInfo.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/plugins/BasicDeploymentTemplateInfo.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.profileservice.management.plugins;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.managed.api.DeploymentTemplateInfo;
-import org.jboss.managed.api.ManagedProperty;
-
-/**
- * A simple bean type of implementation of DeploymentTemplateInfo
- * @author Scott.Stark at jboss.org
- * @version $Revision:$
- */
-public class BasicDeploymentTemplateInfo
- implements DeploymentTemplateInfo, Serializable
-{
- private static final long serialVersionUID = 1;
- /** The name the template is registered under with the profile service */
- private String name;
- /** The template description */
- private String description;
- /** The name of the ManagedProperty in the Map<String, ManagedObject> map
- * obtained from the mainDeployer.getManagedObjects(VFSDeployment)
- * for the resulting template VFSDeployment.
- */
- private String rootManagedPropertyName;
- /**
- *
- */
- private Map<String, ManagedProperty> properties;
-
- public BasicDeploymentTemplateInfo(String name, String description)
- {
- this(name, description, new HashMap<String, ManagedProperty>());
- }
- public BasicDeploymentTemplateInfo(String name, String description,
- Map<String, ManagedProperty> properties)
- {
- this.name = name;
- this.description = description;
- this.properties = properties;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getRootManagedPropertyName()
- {
- return rootManagedPropertyName;
- }
- public void setRootManagedPropertyName(String rootManagedPropertyName)
- {
- this.rootManagedPropertyName = rootManagedPropertyName;
- }
-
- public Map<String, ManagedProperty> getProperties()
- {
- return properties;
- }
- public void setProperties(Map<String, ManagedProperty> properties)
- {
- this.properties = properties;
- }
- public void addProperty(ManagedProperty property)
- {
- this.properties.put(property.getName(), property);
- }
-
- public String toString()
- {
- StringBuilder tmp = new StringBuilder(super.toString());
- tmp.append('{');
- tmp.append(name);
- tmp.append(",description=");
- tmp.append(description);
- tmp.append(",properties=");
- tmp.append(properties);
- tmp.append('}');
- return tmp.toString();
- }
-}
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -25,6 +25,7 @@
import java.util.Map;
import org.jboss.managed.api.Fields;
+import org.jboss.managed.plugins.BasicDeploymentTemplateInfo;
import org.jboss.managed.plugins.DefaultFieldsImpl;
import org.jboss.managed.plugins.ManagedObjectImpl;
import org.jboss.managed.plugins.ManagedPropertyImpl;
@@ -34,8 +35,6 @@
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.jboss.profileservice.management.plugins.BasicDeploymentTemplateInfo;
-import org.jboss.system.metadata.ServiceDeployment;
/**
* The properties used by the DsXmlDataSourceTemplate.
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -27,10 +27,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.profileservice.management.plugins.BasicDeploymentTemplateInfo;
import org.jboss.annotation.factory.AnnotationProxy;
import org.jboss.managed.api.Fields;
import org.jboss.managed.api.annotation.ManagementObjectID;
+import org.jboss.managed.plugins.BasicDeploymentTemplateInfo;
import org.jboss.managed.plugins.ManagedObjectImpl;
import org.jboss.managed.plugins.DefaultFieldsImpl;
import org.jboss.managed.plugins.ManagedPropertyImpl;
@@ -43,6 +43,7 @@
*/
public class JmsDestinationTemplateInfo extends BasicDeploymentTemplateInfo
{
+ private static final long serialVersionUID = 1;
private String destinationType = "queue";
public JmsDestinationTemplateInfo(String name, String description, String destinationType)
Modified: trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -27,6 +27,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.management.ObjectName;
@@ -91,7 +92,8 @@
}
}
- public void build(DeploymentUnit unit, Map<String, ManagedObject> map)
+ public void build(DeploymentUnit unit, Set<String> outputs,
+ Map<String, ManagedObject> map)
throws DeploymentException
{
String name = unit.getSimpleName();
Modified: trunk/security/src/etc/deploy/security-jboss-beans.xml
===================================================================
--- trunk/security/src/etc/deploy/security-jboss-beans.xml 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/security/src/etc/deploy/security-jboss-beans.xml 2008-11-07 16:06:12 UTC (rev 80666)
@@ -3,7 +3,9 @@
Security beans
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+
+ <annotation>@org.jboss.managed.api.annotation.ManagementDeployment(description="JBossSX Security Beans")</annotation>
+
<!-- Establish the basic XML Based Configuration-->
<bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
<property name="configResource">login-config.xml</property>
Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/server/src/etc/conf/default/deployers.xml 2008-11-07 16:06:12 UTC (rev 80666)
@@ -29,7 +29,14 @@
<!-- 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 ManagedObjectCreator implementation -->
+ <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+ <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
<!-- The MainDeployer -->
<bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
@@ -62,6 +69,7 @@
<!-- Accept any implementor of deployer -->
<incallback method="addDeployer"/>
<uncallback method="removeDeployer"/>
+ <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
</bean>
<!-- A declared structure descriptor deployer -->
@@ -151,24 +159,12 @@
<!-- POJO Deployment -->
<bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
- <install bean="ManagedObjectFactory" method="setInstanceClassFactory">
- <parameter>
- <value>org.jboss.beans.metadata.spi.BeanMetaData</value>
- </parameter>
- <parameter>
- <this />
- </parameter>
- </install>
- <uninstall bean="ManagedObjectFactory" method="setInstanceClassFactory">
- <parameter>
- <value>org.jboss.beans.metadata.spi.BeanMetaData</value>
- </parameter>
- <parameter>
- <null />
- </parameter>
- </uninstall>
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
</bean>
+ <bean name="KernelDeploymentManagedObjectCreator"
+ class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
+ <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
<bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
<property name="suffix">jboss-beans.xml</property>
</bean>
@@ -186,6 +182,7 @@
<value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
</parameter>
</uninstall>
+ <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
</bean>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
<constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
@@ -194,25 +191,8 @@
<!-- JMX Deployment -->
<bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <install bean="ManagedObjectFactory" method="setInstanceClassFactory">
- <parameter>
- <value>org.jboss.system.metadata.ServiceMetaData</value>
- </parameter>
- <parameter>
- <this />
- </parameter>
- </install>
- <uninstall bean="ManagedObjectFactory" method="setInstanceClassFactory">
- <parameter>
- <value>org.jboss.system.metadata.ServiceMetaData</value>
- </parameter>
- <parameter>
- <null />
- </parameter>
- </uninstall>
</bean>
<bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
- <property name="icf"><inject bean="ServiceMetaDataICF"/></property>
</bean>
<bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/>
<bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
Modified: trunk/system/.classpath
===================================================================
--- trunk/system/.classpath 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/system/.classpath 2008-11-07 16:06:12 UTC (rev 80666)
@@ -27,5 +27,6 @@
<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar" sourcepath="/thirdparty/sun-jaxb/lib/jaxb-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/stax-api/lib/stax-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/main"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core.jar" sourcepath="/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/system/build.xml
===================================================================
--- trunk/system/build.xml 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/system/build.xml 2008-11-07 16:06:12 UTC (rev 80666)
@@ -76,6 +76,7 @@
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.jboss.deployers.classpath"/>
<path refid="jboss.jboss.man.classpath"/>
+ <path refid="jboss.jboss.mdr.classpath"/>
<path refid="jboss.jboss.reflect.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
Modified: trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
===================================================================
--- trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -34,6 +34,7 @@
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.api.annotation.ManagementObjectClass;
import org.jboss.managed.spi.factory.InstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.MetaValueFactory;
@@ -79,6 +80,11 @@
return context.getTarget();
}
+ public Class<BeanMetaData> getType()
+ {
+ return BeanMetaData.class;
+ }
+
public Object getComponentName(BeanInfo beanInfo, ManagedProperty property,
BeanMetaData attachment, MetaValue value)
{
@@ -122,6 +128,7 @@
}
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
BeanMetaData attachment)
{
// Get the property from the bean
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -29,12 +29,9 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
-import org.jboss.system.deployers.managed.ServiceMetaDataICF;
import org.jboss.system.metadata.ServiceDeployment;
import org.jboss.system.metadata.ServiceDeploymentClassPath;
import org.jboss.system.metadata.ServiceDeploymentParser;
-import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
@@ -46,15 +43,15 @@
* This deployer is responsible for looking for -service.xml
* and creating the metadata object.<p>
*
- * The {@link ServiceClassLoaderDeployer} and {@link ServiceDeployer} does the real work of deployment.
+ * The {@link ServiceClassLoaderDeployer} and {@link ServiceDeployer} does the
+ * real work of deployment.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
*/
public class SARDeployer extends JAXPDeployer<ServiceDeployment>
{
- private ServiceMetaDataICF icf;
-
/**
* Create a new SARDeployer.
*
@@ -68,23 +65,6 @@
setBuildManagedObject(true);
}
- public ServiceMetaDataICF getIcf()
- {
- return icf;
- }
-
- public void setIcf(ServiceMetaDataICF icf)
- {
- this.icf = icf;
- // TODO - should we allow null to handle ICF removal?
- if (icf != null)
- {
- // Have the ServiceMetaData ManagedObject build from the code class
- ManagedObjectFactory mof = ManagedObjectFactory.getInstance();
- mof.setInstanceClassFactory(ServiceMetaData.class, icf);
- }
- }
-
/**
* @param unit - the deployment unit
* @param file - the vf for the jboss-service.xml descriptor
Property changes on: trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/managed/ServiceMetaDataICF.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -34,6 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.spi.factory.InstanceClassFactory;
+import org.jboss.metadata.spi.MetaData;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.MetaValueFactory;
import org.jboss.system.metadata.ServiceAnnotationMetaData;
@@ -71,6 +72,11 @@
this.mbeanServer = mbeanServer;
}
+ public Class<ServiceMetaData> getType()
+ {
+ return ServiceMetaData.class;
+ }
+
public Class<? extends Serializable> getManagedObjectClass(ServiceMetaData md)
throws ClassNotFoundException
{
@@ -111,7 +117,9 @@
}
}
- public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property, ServiceMetaData md)
+ public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property,
+ MetaData metaData,
+ ServiceMetaData md)
{
// First look to the mapped name
String name = property.getMappedName();
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/testsuite/.classpath 2008-11-07 16:06:12 UTC (rev 80666)
@@ -46,5 +46,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-aspects.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/profileservice"/>
+ <classpathentry kind="lib" path="/cluster/output/lib/jboss-ha-legacy-client.jar"/>
+ <classpathentry kind="lib" path="output/resources/security"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java 2008-11-07 15:51:57 UTC (rev 80665)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/SecurityManagedObjectsTestCase.java 2008-11-07 16:06:12 UTC (rev 80666)
@@ -26,6 +26,7 @@
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
+import org.jboss.managed.api.ManagedDeployment;
/**
* TODO: validate the expected management interfaces
@@ -78,8 +79,19 @@
ManagementView mgtMview = getManagementView();
ComponentType type = new ComponentType("MCBean", "Security");
ManagedComponent mc = mgtMview.getComponent("JNDIBasedSecurityRegistration", type);
- // TODO: assertNotNull(mc);
+ assertNotNull(mc);
}
+ public void testAll()
+ throws Exception
+ {
+ ManagementView mgtMview = getManagementView();
+ Set<String> names = mgtMview.getDeploymentNames();
+ for(String name : names)
+ {
+ ManagedDeployment md = mgtMview.getDeployment(name, null);
+ System.out.println(md);
+ }
+ }
@Override
protected String getProfileName()
More information about the jboss-cvs-commits
mailing list