[jboss-cvs] JBossAS SVN: r70869 - in projects/jboss-deployers/trunk: deployers-impl/src/tests/org/jboss/test/deployers/deployer/support and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 14 09:28:52 EDT 2008
Author: alesj
Date: 2008-03-14 09:28:52 -0400 (Fri, 14 Mar 2008)
New Revision: 70869
Modified:
projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java
projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java
projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java
projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml
Log:
Reverting back to 70804, one commit before type removal.
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2008-03-14 13:28:52 UTC (rev 70869)
@@ -91,6 +91,11 @@
this.managedObjectCreator = managedObjectCreator;
}
+ public String getType()
+ {
+ return deployer.getType();
+ }
+
public int getRelativeOrder()
{
return deployer.getRelativeOrder();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java 2008-03-14 13:28:52 UTC (rev 70869)
@@ -66,12 +66,14 @@
public TestSimpleDeployer(int relativeOrder)
{
setRelativeOrder(relativeOrder);
+ setType("test");
name = "TestSimpleDeployer" + relativeOrder;
}
public TestSimpleDeployer(DeploymentStage stage)
{
setStage(stage);
+ setType("test");
name = super.toString();
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java 2008-03-14 13:28:52 UTC (rev 70869)
@@ -58,12 +58,14 @@
public TestSimpleDeployer(int relativeOrder)
{
setRelativeOrder(relativeOrder);
+ setType("test");
name = "TestSimpleDeployer" + relativeOrder;
}
public TestSimpleDeployer(DeploymentStage stage)
{
setStage(stage);
+ setType("test");
name = super.toString();
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-03-14 13:28:52 UTC (rev 70869)
@@ -42,6 +42,11 @@
{
public static TestAttachment lastAttachment;
+ public TestManagedObjectDeployer()
+ {
+ setType("TestManagedObjectDeployer");
+ }
+
public void deploy(DeploymentUnit unit) throws DeploymentException
{
lastAttachment = unit.getAttachment(TestAttachment.class);
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java 2008-03-14 13:28:52 UTC (rev 70869)
@@ -36,6 +36,14 @@
public interface Deployer extends Ordered
{
/**
+ * Get the type of the deployer.
+ * This should reflect in the Managed* api.
+ *
+ * @return the deployer type.
+ */
+ String getType();
+
+ /**
* Get the deployment stage for this deployer
*
* @return the stage
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2008-03-14 13:28:52 UTC (rev 70869)
@@ -70,6 +70,9 @@
/** The output name */
private Set<String> outputs;
+
+ /** The type */
+ private String type;
/** Whether to process parents first */
private boolean parentFirst = true;
@@ -377,6 +380,21 @@
addOutput(output.getName());
}
+ /**
+ * Get the type.
+ *
+ * @return the type.
+ */
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
public boolean isParentFirst()
{
return parentFirst;
@@ -392,12 +410,6 @@
this.parentFirst = parentFirst;
}
- @Deprecated
- public void setType(String type)
- {
- log.warn("Types should be set using Managed* api for " + this);
- }
-
public void undeploy(DeploymentUnit unit)
{
// Nothing
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml 2008-03-14 13:25:58 UTC (rev 70868)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml 2008-03-14 13:28:52 UTC (rev 70869)
@@ -85,10 +85,15 @@
</bean>
<!-- POJO Deployment -->
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" />
- <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="type">beans</property>
+ </bean>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+ <property name="type">beans</property>
+ </bean>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
<constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ <property name="type">beans</property>
</bean>
<!-- VFS ClassLoader -->
More information about the jboss-cvs-commits
mailing list