[jboss-cvs] JBossAS SVN: r63726 - in trunk/profileservice: src/main/org/jboss/profileservice/aop and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 28 13:23:30 EDT 2007
Author: adrian at jboss.org
Date: 2007-06-28 13:23:30 -0400 (Thu, 28 Jun 2007)
New Revision: 63726
Modified:
trunk/profileservice/.classpath
trunk/profileservice/src/main/org/jboss/profileservice/aop/MainDeployerAdvice.java
trunk/profileservice/src/main/org/jboss/profileservice/management/ComponentTypeOverridesVisitor.java
trunk/profileservice/src/main/org/jboss/profileservice/management/ManagedDeploymentImpl.java
trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java
trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java
Log:
Deployers reloaded
Modified: trunk/profileservice/.classpath
===================================================================
--- trunk/profileservice/.classpath 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/.classpath 2007-06-28 17:23:30 UTC (rev 63726)
@@ -7,24 +7,28 @@
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar" sourcepath="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer-src.zip"/>
+ <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/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.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/microcontainer/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-managed-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-managed-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar" sourcepath="/thirdparty/jboss/remoting/lib/jboss-remoting-src.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/aspects"/>
<classpathentry combineaccessrules="false" kind="src" path="/system"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-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="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/profileservice/src/main/org/jboss/profileservice/aop/MainDeployerAdvice.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/aop/MainDeployerAdvice.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/aop/MainDeployerAdvice.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -24,11 +24,12 @@
import java.util.Collection;
import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentContext;
import org.jboss.logging.Logger;
/**
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision:$
*/
public class MainDeployerAdvice
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ComponentTypeOverridesVisitor.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ComponentTypeOverridesVisitor.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ComponentTypeOverridesVisitor.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -21,9 +21,9 @@
*/
package org.jboss.profileservice.management;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.deployers.spi.management.ComponentType;
import org.jboss.deployers.spi.management.ComponentTypeVisitor;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.system.metadata.ServiceMetaData;
@@ -32,6 +32,7 @@
* a pluggable override of the ComponentType of a deployment.
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision$
*/
public class ComponentTypeOverridesVisitor
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagedDeploymentImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagedDeploymentImpl.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagedDeploymentImpl.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -27,10 +27,10 @@
import java.util.Map;
import java.util.Set;
+import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.spi.management.DeploymentTemplateInfo;
import org.jboss.deployers.spi.management.ManagedComponent;
import org.jboss.deployers.spi.management.ManagedDeployment;
-import org.jboss.deployers.spi.structure.DeploymentContext;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.profileservice.spi.Profile.DeploymentPhase;
@@ -49,18 +49,18 @@
private ArrayList<ManagedComponent> components = new ArrayList<ManagedComponent>();
private ArrayList<ManagedDeployment> children = new ArrayList<ManagedDeployment>();
- ManagedDeploymentImpl(ManagementViewImpl mgtView, DeploymentContext ctx,
+ ManagedDeploymentImpl(ManagementViewImpl mgtView, Deployment ctx,
Map<String, ManagedProperty> properties)
{
this(mgtView, ctx, properties, null);
}
- ManagedDeploymentImpl(ManagementViewImpl mgtView, DeploymentContext ctx,
+ ManagedDeploymentImpl(ManagementViewImpl mgtView, Deployment ctx,
Map<String, ManagedProperty> properties, ManagedDeployment parent)
{
super(ctx.getSimpleName(), properties);
this.name = ctx.getName();
- this.types = ctx.getTypes();
- this.phase = ctx.getTransientManagedObjects().getAttachment(DeploymentPhase.class);
+ // TODO this.types = ctx.getTypes();
+ // TODO this.phase = ctx.getTransientManagedObjects().getAttachment(DeploymentPhase.class);
this.parent = parent;
}
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -34,13 +34,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
+import org.jboss.deployers.client.spi.Deployment;
+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.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.deployment.MainDeployer;
import org.jboss.deployers.spi.management.ComponentType;
import org.jboss.deployers.spi.management.ComponentTypeListener;
import org.jboss.deployers.spi.management.ComponentTypeVisitor;
@@ -49,16 +45,19 @@
import org.jboss.deployers.spi.management.ManagedComponent;
import org.jboss.deployers.spi.management.ManagedDeployment;
import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.profileservice.aop.DeployerAspects;
import org.jboss.profileservice.spi.AttachmentsSerializer;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
+import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
import org.jboss.profileservice.spi.ProfileKey;
-import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.profileservice.spi.Profile.DeploymentPhase;
import org.jboss.virtual.VirtualFile;
@@ -67,6 +66,7 @@
* The default ManagementView implementation.
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision$
*/
public class ManagementViewImpl
@@ -75,6 +75,9 @@
private static Logger log = Logger.getLogger(ManagementViewImpl.class);
private static final String BUNDLE_NAME = "org.jboss.profileservice.management.messages"; //$NON-NLS-1$
+ /** The deployment factory */
+ private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance();
+
/** */
private ProfileService ps;
/** The currently loaded profile */
@@ -242,7 +245,7 @@
public ManagedDeployment getDeployment(String name, DeploymentPhase phase)
throws NoSuchDeploymentException, Exception
{
- DeploymentContext ctx = activeProfile.getDeployment(name, phase);
+ Deployment ctx = activeProfile.getDeployment(name, phase);
ManagedDeployment md = getManagedDeployment(ctx);
log.debug("getDeployment, name="+name+", md="+md);
return md;
@@ -262,7 +265,7 @@
HashSet<ManagedDeployment> mds = new HashSet<ManagedDeployment>();
for(String name : names)
{
- DeploymentContext ctx = activeProfile.getDeployment(name, null);
+ Deployment ctx = activeProfile.getDeployment(name, null);
ManagedDeployment md = getManagedDeployment(ctx);
mds.add(md);
}
@@ -324,13 +327,13 @@
if( log.isTraceEnabled() )
log.trace("applyTemplate, profile="+activeProfile+", deploymentBaseName="+deploymentBaseName+", phase="+phase+", info="+info);
VirtualFile vf = template.applyTemplate(root, deploymentBaseName, info);
- AbstractDeploymentContext ctx = new AbstractDeploymentContext(vf);
+ VFSDeployment ctx = deploymentFactory.createVFSDeployment(vf);
activeProfile.addDeployment(ctx, phase);
- mainDeployer.addDeploymentContext(ctx);
+ mainDeployer.addDeployment(ctx);
template.updateTemplateDeployment(ctx, info);
// Apply the managed properties
- Map<String, ManagedObject> mos = mainDeployer.getManagedObjects(ctx);
+ Map<String, ManagedObject> mos = mainDeployer.getManagedObjects(ctx.getName());
log.debug("applyTemplate, profile="+activeProfile+", deploymentBaseName="+deploymentBaseName+", phase="+phase+", :"+mos);
for(ManagedProperty prop : info.getProperties().values())
{
@@ -370,7 +373,7 @@
public void removeDeployment(String deploymentName, DeploymentPhase phase)
throws NoSuchProfileException, NoSuchDeploymentException, Exception
{
- DeploymentContext ctx = activeProfile.removeDeployment(deploymentName, phase);
+ Deployment ctx = activeProfile.removeDeployment(deploymentName, phase);
if( ctx == null )
{
formatter.applyPattern(i18n.getString("ManagementView.NoSuchDeploymentException")); //$NON-NLS-1$
@@ -379,7 +382,7 @@
throw new NoSuchDeploymentException(msg);
}
// TODO i18n
- if( mainDeployer.removeDeploymentContext(ctx.getName()) == false )
+ if( mainDeployer.removeDeployment(ctx.getName()) == false )
throw new NoSuchDeploymentException("MainDeployer failed to remove: "+ctx.getName());
}
@@ -391,7 +394,7 @@
public void process() throws Exception
{
mainDeployer.process();
- checkIncomplete();
+ mainDeployer.checkComplete();
}
/**
@@ -400,6 +403,7 @@
*/
public void updateComponentType(DeploymentUnit unit, ComponentType type)
{
+ /* TODO component
DeploymentContext ctx = unit.getDeploymentContext();
log.debug("updateComponentType, unit="+unit.getName()+", type="+type);
ctxToCompType.put(ctx, type);
@@ -419,6 +423,7 @@
log.warn("Failed to create ManagedDeployment for ctx="+ctx);
}
}
+ */
}
public void updateDeployment()
@@ -434,7 +439,7 @@
md = md.getParent();
String name = md.getSimpleName();
DeploymentPhase phase = md.getDeploymentPhase();
- DeploymentContext mdCtx = activeProfile.getDeployment(name, phase);
+ Deployment mdCtx = activeProfile.getDeployment(name, phase);
if( mdCtx == null )
{
formatter.applyPattern(i18n.getString("ManagementView.NoSuchDeploymentException")); //$NON-NLS-1$
@@ -444,7 +449,7 @@
}
// Apply the managed properties
- Map<String, ManagedObject> mos = mainDeployer.getManagedObjects(mdCtx);
+ Map<String, ManagedObject> mos = mainDeployer.getManagedObjects(mdCtx.getName());
log.debug("updateComponent, profile="+activeProfile+", deploymentName="+name+", phase="+phase+", :"+mos);
for(ManagedProperty prop : comp.getProperties().values())
{
@@ -487,8 +492,8 @@
private void indexComponents()
throws Exception
{
- Collection<DeploymentContext> ctxs = activeProfile.getDeployments();
- for(DeploymentContext ctx : ctxs)
+ Collection<VFSDeployment> ctxs = activeProfile.getDeployments();
+ for(Deployment ctx : ctxs)
{
ManagedDeployment md = getManagedDeployment(ctx);
indexComponents(md);
@@ -517,13 +522,14 @@
}
}
- private ManagedDeployment getManagedDeployment(DeploymentContext ctx)
+ private ManagedDeployment getManagedDeployment(Deployment ctx)
throws Exception
{
- Map<String, ManagedObject> mdMOs = mainDeployer.getManagedObjects(ctx);
+ Map<String, ManagedObject> mdMOs = mainDeployer.getManagedObjects(ctx.getName());
Map<String, ManagedProperty> mdProps = getProperties(mdMOs);
ManagedDeploymentImpl md = new ManagedDeploymentImpl(this, ctx, mdProps);
log.debug("Created "+md);
+ /** TODO children
Set<DeploymentContext> children = ctx.getChildren();
for(DeploymentContext child : children)
{
@@ -534,8 +540,10 @@
getManagedComponents(child, childMD);
}
getManagedComponents(ctx, md);
+ */
return md;
}
+ /* TODO children
private void getManagedComponents(DeploymentContext ctx, ManagedDeploymentImpl md)
throws Exception
{
@@ -551,6 +559,7 @@
md.getComponents().add(mc);
}
}
+ */
/**
* Get the map of the ManagedPropertys keyed by the property mapped name.
@@ -585,9 +594,11 @@
*/
protected void checkIncomplete() throws DeploymentException
{
+ /** TODO This should now be done by the main deployer
IncompleteDeployments incomplete = IncompleteDeploymentsBuilder.build(mainDeployer, null);
if (incomplete.isIncomplete())
throw new IncompleteDeploymentException(incomplete);
+ */
}
}
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -24,8 +24,8 @@
import java.util.Map;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.managed.ManagedObjectBuilder;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.plugins.advice.WrapperAdvice;
@@ -35,10 +35,11 @@
* A ManagedObjectBuilder for use as an override to the ConnectionFactoryDeployer
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision$
*/
public class ConnectionFactoryDeployerManagedObjectBuilder
- implements ManagedObjectBuilder
+ implements ManagedObjectCreator
{
private static Logger log = Logger.getLogger(ConnectionFactoryDeployerManagedObjectBuilder.class);
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -27,8 +27,8 @@
import java.util.Map;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.managed.ManagedObjectBuilder;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.plugins.DefaultFieldsImpl;
@@ -45,10 +45,11 @@
* A ManagedObjectBuilder for use as an override to the FakeDataSourceDeployer
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision:$
*/
public class FakeConnectionFactoryDeployerManagedObjectBuilder
- implements ManagedObjectBuilder
+ implements ManagedObjectCreator
{
private static Logger log = Logger.getLogger(ConnectionFactoryDeployerManagedObjectBuilder.class);
/**
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplate.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -31,23 +31,24 @@
import org.jboss.deployers.spi.management.DeploymentTemplate;
import org.jboss.deployers.spi.management.DeploymentTemplateInfo;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.types.CompositeMetaType;
import org.jboss.metatype.api.values.CompositeValue;
import org.jboss.metatype.api.values.SimpleValue;
+import org.jboss.util.xml.DOMWriter;
import org.jboss.virtual.VirtualFile;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
-import org.jboss.util.xml.DOMWriter;
/**
* A template for creating a datasource(*-ds.xml) deployments.
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision:$
*/
public class DsXmlDataSourceTemplate
@@ -78,7 +79,7 @@
* @param ctx - the DeploymentContext to associate metadata to
* @param values - the managed property values passed to apply.
*/
- public void updateTemplateDeployment(DeploymentContext ctx,
+ public void updateTemplateDeployment(VFSDeployment ctx,
DeploymentTemplateInfo values)
throws Exception
{
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/FakeDsXmlDataSourceTemplate.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -29,7 +29,7 @@
import org.jboss.deployers.spi.management.DeploymentTemplate;
import org.jboss.deployers.spi.management.DeploymentTemplateInfo;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.profileservice.mock.ds.DataSourceDeployment;
import org.jboss.profileservice.mock.ds.FakeDataSourceDeployer;
@@ -41,6 +41,7 @@
* A template for creating a datasource(*-dsf.xml) deployments.
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision:$
*/
public class FakeDsXmlDataSourceTemplate
@@ -97,7 +98,7 @@
* @param ctx - the DeploymentContext to associate metadata to
* @param values - the managed property values passed to apply.
*/
- public void updateTemplateDeployment(DeploymentContext ctx,
+ public void updateTemplateDeployment(VFSDeployment ctx,
DeploymentTemplateInfo values)
throws Exception
{
@@ -109,7 +110,9 @@
ServiceMetaData dsMetaData = deployer.createDsServiceMetaData(ds);
services.add(dsMetaData);
service.setServices(services);
- ctx.getTransientAttachments().addAttachment(ServiceDeployment.class, service);
+ /** TODO What is this?
+ ctx.getTransientAttachments().addAttachment(ServiceDeployment.class, service);
+ */
}
public DeploymentTemplateInfo getInfo()
Modified: trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java 2007-06-28 17:23:15 UTC (rev 63725)
+++ trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java 2007-06-28 17:23:30 UTC (rev 63726)
@@ -28,13 +28,13 @@
import java.util.List;
import java.util.Map;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.deployers.plugins.deployers.helpers.JAXPDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.managed.ManagedObjectBuilder;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.plugins.DefaultFieldsImpl;
import org.jboss.managed.plugins.ManagedObjectImpl;
@@ -59,10 +59,11 @@
* ServiceMetaData representing the DataSource connection mbean.
*
* @author Scott.Stark at jboss.org
+ * @author adrian at jboss.org
* @version $Revision:$
*/
public class FakeDataSourceDeployer extends JAXPDeployer<ServiceDeployment>
- implements ManagedObjectBuilder
+ implements ManagedObjectCreator
{
/**
* A mapping from the managed property name to the attachment property name.
@@ -72,6 +73,7 @@
public FakeDataSourceDeployer()
{
super(ServiceDeployment.class);
+ setSuffix("-dsf.xml");
}
public Map<String, String> getPropertyNameMappings()
@@ -131,14 +133,8 @@
}
@Override
- public void deploy(DeploymentUnit unit) throws DeploymentException
+ protected ServiceDeployment parse(VFSDeploymentUnit unit, VirtualFile file, Document document) throws Exception
{
- createMetaData(unit, null, "-dsf.xml");
- }
-
- @Override
- protected ServiceDeployment parse(DeploymentUnit unit, VirtualFile file, Document document) throws Exception
- {
ServiceDeployment deployment = new ServiceDeployment();
DataSourceDeployment ds = new DataSourceDeployment();
ds.parse(document);
More information about the jboss-cvs-commits
mailing list