[jboss-cvs] JBossAS SVN: r76755 - in projects/jboss-deployers/trunk: deployers-impl/src/tests/org/jboss/test/deployers/deployer/support and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 7 05:51:42 EDT 2008
Author: alesj
Date: 2008-08-07 05:51:41 -0400 (Thu, 07 Aug 2008)
New Revision: 76755
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-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java
projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml
Log:
[JBDEPLOY-14]; Remove Deployment(Unit|Context)::getTypes.
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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -71,9 +71,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-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java 2008-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -126,14 +126,6 @@
void setComparator(Comparator<DeploymentContext> comparator);
/**
- * Get the types.
- *
- * @return the types.
- */
- @Deprecated
- Set<String> getTypes();
-
- /**
* Get the scope
*
* @return the scope
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java 2008-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -80,14 +80,6 @@
String getRelativePath();
/**
- * Get the types.
- *
- * @return the types.
- */
- @Deprecated
- Set<String> getTypes();
-
- /**
* Get the scope
*
* @return the scope
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2008-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -402,12 +402,6 @@
this.comparator = comparator;
}
- @Deprecated
- public Set<String> getTypes()
- {
- return deploymentTypes;
- }
-
public ScopeKey getScope()
{
if (scope == null)
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java 2008-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -114,12 +114,6 @@
{
return deploymentContext.getRelativePath();
}
-
- @Deprecated
- public Set<String> getTypes()
- {
- return deploymentContext.getTypes();
- }
public ScopeKey getScope()
{
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java 2008-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java 2008-08-07 09:51:41 UTC (rev 76755)
@@ -171,12 +171,6 @@
// No relative ordering of components?
}
- @Deprecated
- public Set<String> getTypes()
- {
- return parent.getTypes();
- }
-
public ScopeKey getScope()
{
if (scope == null)
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-08-07 09:51:17 UTC (rev 76754)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bootstrap/bootstrap.xml 2008-08-07 09:51:41 UTC (rev 76755)
@@ -68,15 +68,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 class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <property name="type">beans</property>
</bean>
<!-- VFS ClassLoader -->
More information about the jboss-cvs-commits
mailing list