[jboss-cvs] JBossAS SVN: r63737 - in trunk/connector: src/main/org/jboss/resource/deployers and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 28 13:56:07 EDT 2007
Author: adrian at jboss.org
Date: 2007-06-28 13:56:07 -0400 (Thu, 28 Jun 2007)
New Revision: 63737
Modified:
trunk/connector/.classpath
trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
trunk/connector/src/main/org/jboss/resource/deployers/RARDeployer.java
trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/repository/DefaultJCAMetaDataRepository.java
trunk/connector/src/resources/deployers/jca-deployers-beans.xml
Log:
Deployers reloaded
Modified: trunk/connector/.classpath
===================================================================
--- trunk/connector/.classpath 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/.classpath 2007-06-28 17:56:07 UTC (rev 63737)
@@ -2,21 +2,21 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/j2se"/>
+ <classpathentry kind="src" path="/profileservice"/>
+ <classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/system"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
- <classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
- <classpathentry kind="src" path="/j2se"/>
<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar" sourcepath="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
@@ -26,11 +26,14 @@
<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-aop-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/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-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/profileservice"/>
- <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-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-src.zip"/>
+ <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-structure-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-sources.jar"/>
+ <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/quartz/lib/quartz-all.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java 2007-06-28 17:56:07 UTC (rev 63737)
@@ -25,10 +25,10 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
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.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.managed.api.ManagedObject;
import org.jboss.resource.deployers.builder.AbstractBuilder;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
@@ -41,21 +41,28 @@
* A ManagedConnectionFactoryDeployer.
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*/
public class ManagedConnectionFactoryDeployer
extends AbstractSimpleRealDeployer<ManagedConnectionFactoryDeploymentGroup>
- implements ManagedObjectBuilder
+ implements ManagedObjectCreator
{
- /** The suffix */
- private String suffix;
-
/** The repository */
private DefaultJCAMetaDataRepository repository;
/** The builders */
private List<AbstractBuilder> builders = new ArrayList<AbstractBuilder>();
+ /**
+ * Create a new ManagedConnectionFactoryDeployer.
+ */
+ public ManagedConnectionFactoryDeployer()
+ {
+ super(ManagedConnectionFactoryDeploymentGroup.class);
+ setOutput(ServiceDeployment.class);
+ }
+
public void setBuilders(List<AbstractBuilder> builders)
{
this.builders = builders;
@@ -85,34 +92,7 @@
{
this.repository = repository;
}
-
- public ManagedConnectionFactoryDeployer()
- {
- super(ManagedConnectionFactoryDeploymentGroup.class);
- setRelativeOrder(PARSER_DEPLOYER + 1);
-
- }
- /**
- * Get the suffix.
- *
- * @return the suffix.
- */
- public String getSuffix()
- {
- return suffix;
- }
-
- /**
- * Set the suffix.
- *
- * @param suffix The suffix to set.
- */
- public void setSuffix(String suffix)
- {
- this.suffix = suffix;
- }
-
@Override
public void deploy(DeploymentUnit unit, ManagedConnectionFactoryDeploymentGroup group) throws DeploymentException
{
@@ -126,7 +106,6 @@
for (ServiceMetaData data : serviceDefintion)
{
componentServices.add(data);
-
}
for (ManagedConnectionFactoryDeploymentMetaData data : deployments)
@@ -139,14 +118,11 @@
{
componentServices.add(candidate);
}
-
}
-
}
serviceDeployment.setServices(componentServices);
unit.addAttachment(ServiceDeployment.class, serviceDeployment);
-
}
@Override
@@ -154,19 +130,11 @@
{
}
- /**
- * Generate the connection factory ManagedObject. This adds the ManagedObject
- * @param unit the deployment unit
- * @param managedObjects the map of managed objects keyed by attachment name.
- */
- public void build(DeploymentUnit unit, Map<String, ManagedObject> map)
- throws DeploymentException
+ public void build(DeploymentUnit unit, Map<String, ManagedObject> map) throws DeploymentException
{
ManagedConnectionFactoryDeploymentGroup group = unit.getAttachment(ManagedConnectionFactoryDeploymentGroup.class);
if( group == null )
return;
}
-
-
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2007-06-28 17:56:07 UTC (rev 63737)
@@ -28,12 +28,9 @@
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractParsingDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.logging.Logger;
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
import org.jboss.virtual.VirtualFile;
@@ -41,50 +38,29 @@
* A ManagedConnectionFactoryParserDeployer.
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
+ * @author adrian at jboss.org
* @version $Revision: 1.1 $
*
- * Note, this is currently a total hack until we can rework the JAXBDeployer
+ * TODO Need to add LoaderRepositoryConfig parsing
+ * TODO Note, this is currently a total hack until we can rework the JAXBDeployer
*/
-public class ManagedConnectionFactoryParserDeployer extends AbstractParsingDeployer<ManagedConnectionFactoryDeploymentGroup>
+public class ManagedConnectionFactoryParserDeployer extends AbstractVFSParsingDeployer<ManagedConnectionFactoryDeploymentGroup>
{
- /** The log */
- private static final Logger log = Logger.getLogger(ManagedConnectionFactoryParserDeployer.class);
-
/** The context */
private JAXBContext context;
/** The repository */
private JCAMetaDataRepository repository;
-
- /** The suffix */
- private String suffix;
-
- public ManagedConnectionFactoryParserDeployer()
- {
- super(ManagedConnectionFactoryDeploymentGroup.class);
- }
-
- /**
- * Get the suffix.
- *
- * @return the suffix.
- */
- public String getSuffix()
- {
- return suffix;
- }
/**
- * Set the suffix.
- *
- * @param suffix The suffix to set.
+ * Create a new ManagedConnectionFactoryParserDeployer.
*/
- public void setSuffix(String suffix)
+ public ManagedConnectionFactoryParserDeployer()
{
- this.suffix = suffix;
+ super(ManagedConnectionFactoryDeploymentGroup.class);
+ setIncludeDeploymentFile(true);
}
-
/**
* Get the repository.
*
@@ -107,12 +83,12 @@
public void create() throws Exception
{
- context = JAXBContext.newInstance(new Class[]{getDeploymentType()});
+ context = JAXBContext.newInstance(new Class[]{getInput()});
}
@Override
- protected ManagedConnectionFactoryDeploymentGroup parse(DeploymentUnit unit, VirtualFile file, ManagedConnectionFactoryDeploymentGroup root) throws Exception
+ protected ManagedConnectionFactoryDeploymentGroup parse(VFSDeploymentUnit unit, VirtualFile file, ManagedConnectionFactoryDeploymentGroup root) throws Exception
{
//TODO do we need to this every time?
Unmarshaller um = context.createUnmarshaller();
@@ -128,24 +104,13 @@
}
finally
{
- if(is != null)
- {
+ if (is != null)
is.close();
- }
}
-
-
}
-
- @Override
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- createMetaData(unit, unit.getName(), getSuffix());
-
- }
@Override
- protected void init(DeploymentUnit unit, ManagedConnectionFactoryDeploymentGroup metaData, VirtualFile file) throws Exception
+ protected void init(VFSDeploymentUnit unit, ManagedConnectionFactoryDeploymentGroup metaData, VirtualFile file) throws Exception
{
metaData.setUrl(file.toURL());
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARDeployer.java 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARDeployer.java 2007-06-28 17:56:07 UTC (rev 63737)
@@ -26,10 +26,9 @@
import javax.management.ObjectName;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.resource.metadata.ConnectorMetaData;
import org.jboss.system.metadata.ServiceAttributeMetaData;
import org.jboss.system.metadata.ServiceConstructorMetaData;
@@ -52,12 +51,11 @@
/**
* Create a new RARDeployer.
- * Set the relative order to COMPONENT_DEPLOYER+1 by default
*/
public RARDeployer()
{
super(ConnectorMetaData.class);
- setRelativeOrder(COMPONENT_DEPLOYER+1);
+ setOutput(ServiceMetaData.class);
}
/**
@@ -103,13 +101,12 @@
protected String getObjectName(DeploymentUnit unit, ConnectorMetaData cmd)
{
// TODO this is a hack
- DeploymentContext ctx = unit.getDeploymentContext();
- String name = ctx.getRoot().getName();
- ctx = ctx.getParent();
- while (ctx != null)
+ String name = unit.getSimpleName();
+ unit = unit.getParent();
+ while (unit != null)
{
- name = ctx.getRoot().getName() + "#" + name;
- ctx = ctx.getParent();
+ name = unit.getSimpleName() + "#" + name;
+ unit = unit.getParent();
}
return "jboss.jca:service=RARDeployment,name='" + name + "'";
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java 2007-06-28 17:56:07 UTC (rev 63737)
@@ -21,9 +21,8 @@
*/
package org.jboss.resource.deployers;
-import org.jboss.deployers.plugins.deployers.helpers.ObjectModelFactoryDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.resource.deployment.ResourceAdapterObjectModelFactory;
import org.jboss.resource.metadata.ConnectorMetaData;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
@@ -38,6 +37,7 @@
*/
public class RARParserDeployer extends ObjectModelFactoryDeployer<ConnectorMetaData>
{
+ /** The metadata repsoitory */
private JCAMetaDataRepository metaDataRepository;
/**
@@ -46,6 +46,7 @@
public RARParserDeployer()
{
super(ConnectorMetaData.class);
+ setName("ra.xml");
}
public JCAMetaDataRepository getMetaDataRepository()
@@ -62,28 +63,11 @@
{
return new ResourceAdapterObjectModelFactory();
}
-
+
@Override
- protected ConnectorMetaData parse(DeploymentUnit unit, String name, ConnectorMetaData root) throws Exception
+ protected void init(VFSDeploymentUnit unit, ConnectorMetaData cmd, VirtualFile file) throws Exception
{
- ConnectorMetaData md = super.parse(unit, name, root);
-
- //TODO should we aspectize this?
- if(md != null)
- {
- metaDataRepository.addConnectorMetaData(unit.getSimpleName(), md);
- }
-
- return md;
-
- }
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- createMetaData(unit, "ra.xml", null);
- }
-
- protected void init(DeploymentUnit unit, ConnectorMetaData cmd, VirtualFile file) throws Exception
- {
cmd.setURL(file.toURL());
+ metaDataRepository.addConnectorMetaData(unit.getSimpleName(), cmd);
}
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-06-28 17:56:07 UTC (rev 63737)
@@ -491,7 +491,4 @@
{
this.statisticsFormatter = statisticsFormatter;
}
-
-
-
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/repository/DefaultJCAMetaDataRepository.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/repository/DefaultJCAMetaDataRepository.java 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/main/org/jboss/resource/metadata/repository/DefaultJCAMetaDataRepository.java 2007-06-28 17:56:07 UTC (rev 63737)
@@ -43,7 +43,7 @@
* @author <a href="weston.price at jboss.org">Weston Price</a>
* @version $Revision: 1.1 $
*/
- at JMX(exposedInterface=JCAMetaDataRepository.class,name="jboss.jca:service=JCAMetaDataRepository,name=DefaultJCAMetaDataRepository")
+// TODO FIXME @JMX(exposedInterface=JCAMetaDataRepository.class,name="jboss.jca:service=JCAMetaDataRepository,name=DefaultJCAMetaDataRepository")
public class DefaultJCAMetaDataRepository implements JCAMetaDataRepository, Serializable
{
private static final Logger log = Logger.getLogger(DefaultJCAMetaDataRepository.class);
Modified: trunk/connector/src/resources/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-deployers-beans.xml 2007-06-28 17:30:17 UTC (rev 63736)
+++ trunk/connector/src/resources/deployers/jca-deployers-beans.xml 2007-06-28 17:56:07 UTC (rev 63737)
@@ -10,24 +10,12 @@
<!-- RAR Deployment -->
<bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
<property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">rar</property>
</bean>
<bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
<property name="workManagerName">jboss.jca:service=WorkManager</property>
<property name="XATerminatorName">jboss:service=TransactionManager</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">rar</property>
</bean>
@@ -38,12 +26,6 @@
<bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
<property name="suffix">-ds.xml</property>
<property name="XSLPath">stylesheets/ConnectionFactoryTemplate.xsl</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">jca-ds</property>
</bean>
@@ -60,12 +42,6 @@
<bean name="ManagedConnectionFactoryParserDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryParserDeployer">
<property name="repository"><inject bean="JCAMetaDataRepository"></inject></property>
<property name="suffix">-ds.xml</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">jca-ds</property>
</bean>
@@ -81,12 +57,6 @@
<inject bean="MetaDataTypeMappingBuilder"/>
</list>
</property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
<property name="type">jca-ds</property>
</bean>
-->
More information about the jboss-cvs-commits
mailing list