[jboss-cvs] JBossAS SVN: r70862 - 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 06:43:19 EDT 2008
Author: alesj
Date: 2008-03-14 06:43:19 -0400 (Fri, 14 Mar 2008)
New Revision: 70862
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:
JBDEPLOY-14; also removing Deployer:type.
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2008-03-14 10:43:19 UTC (rev 70862)
@@ -91,11 +91,6 @@
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java 2008-03-14 10:43:19 UTC (rev 70862)
@@ -66,14 +66,12 @@
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java 2008-03-14 10:43:19 UTC (rev 70862)
@@ -58,14 +58,12 @@
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-03-14 10:43:19 UTC (rev 70862)
@@ -42,11 +42,6 @@
{
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java 2008-03-14 10:43:19 UTC (rev 70862)
@@ -36,14 +36,6 @@
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2008-03-14 10:43:19 UTC (rev 70862)
@@ -70,9 +70,6 @@
/** The output name */
private Set<String> outputs;
-
- /** The type */
- private String type;
/** Whether to process parents first */
private boolean parentFirst = true;
@@ -380,21 +377,6 @@
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;
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 07:57:53 UTC (rev 70861)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml 2008-03-14 10:43:19 UTC (rev 70862)
@@ -85,15 +85,10 @@
</bean>
<!-- POJO Deployment -->
- <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="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" />
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
<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