[jboss-cvs] JBossAS SVN: r70804 - in projects/jboss-deployers/trunk: deployers-client-spi/src/main/org/jboss/deployers/client/spi and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 05:18:28 EDT 2008
Author: alesj
Date: 2008-03-13 05:18:28 -0400 (Thu, 13 Mar 2008)
New Revision: 70804
Modified:
projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java
projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java
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/TestFlowDeployer.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/deployer/test/DeployerProtocolUnitTestCase.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-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.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-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractSimpleRealDeployer.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
Log:
JBDEPLOY-14; removed Deployment::types, still left Deployer:type.
Modified: projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-client/src/main/org/jboss/deployers/client/plugins/deployment/AbstractDeployment.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -42,8 +42,6 @@
/** The name of the deployment */
private String name;
- /** The types associated with the deployment */
- private Set<String> types;
/**
* Create a new AbstractDeployment.
@@ -96,15 +94,6 @@
this.name = name;
}
- public Set<String> getTypes()
- {
- return types;
- }
- public void setTypes(Set<String> types)
- {
- this.types = types;
- }
-
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
super.readExternal(in);
Modified: projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-client-spi/src/main/org/jboss/deployers/client/spi/Deployment.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -22,7 +22,6 @@
package org.jboss.deployers.client.spi;
import java.io.Serializable;
-import java.util.Set;
import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
@@ -47,19 +46,4 @@
* @return the name
*/
String getSimpleName();
-
- /**
- * Get the deployment types associated with this deployment.
- *
- * @return set of deployment type names deployers have identified
- * in this deployment.
- */
- Set<String> getTypes();
- /**
- * Set the deployment types associated with this deployment.
- *
- * @param types set of deployment type names deployers have identified
- * in this deployment.
- */
- void setTypes(Set<String> types);
}
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-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -95,7 +95,7 @@
{
return deployer.getType();
}
-
+
public int getRelativeOrder()
{
return deployer.getRelativeOrder();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestFlowDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestFlowDeployer.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestFlowDeployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -102,7 +102,6 @@
public void internalDeploy(DeploymentUnit unit) throws DeploymentException
{
- unit.getTypes().add(getType());
deployed.put(unit.getName(), ++order);
}
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-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestSimpleDeployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -66,14 +66,14 @@
public TestSimpleDeployer(int relativeOrder)
{
setRelativeOrder(relativeOrder);
- this.setType("test");
+ setType("test");
name = "TestSimpleDeployer" + relativeOrder;
}
public TestSimpleDeployer(DeploymentStage stage)
{
setStage(stage);
- this.setType("test");
+ setType("test");
name = super.toString();
}
@@ -125,7 +125,6 @@
public void internalDeploy(DeploymentUnit unit) throws DeploymentException
{
log.debug(this + " deploy : " + unit.getName());
- unit.getTypes().add(getType());
deployed.put(unit.getName(), ++order);
if (this.equals(unit.getAttachment("fail")))
throw new DeploymentException("Asked to fail");
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/test/DeployerProtocolUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/test/DeployerProtocolUnitTestCase.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/test/DeployerProtocolUnitTestCase.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -62,9 +62,6 @@
Set<String> expected = new HashSet<String>();
expected.add(context.getName());
assertEquals(expected, deployer.getDeployedUnits());
- HashSet<String> types = new HashSet<String>();
- types.add("test");
- // TODO JBMICROCONT-185 types assertEquals(types, context.getTypes());
}
public void testUndeploy() throws Exception
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-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/main/support/TestSimpleDeployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -58,14 +58,14 @@
public TestSimpleDeployer(int relativeOrder)
{
setRelativeOrder(relativeOrder);
- this.setType("test");
+ setType("test");
name = "TestSimpleDeployer" + relativeOrder;
}
public TestSimpleDeployer(DeploymentStage stage)
{
setStage(stage);
- this.setType("test");
+ setType("test");
name = super.toString();
}
@@ -99,7 +99,6 @@
public void internalDeploy(DeploymentUnit unit) throws DeploymentException
{
log.debug(this + " deploy : " + unit.getName());
- unit.getTypes().add(getType());
deployed.add(unit.getName());
if (this.equals(unit.getAttachment("fail")))
{
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-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -56,7 +56,6 @@
lastAttachment.setProperty("string1", "initialString1");
lastAttachment.setProperty("string2", "initialString2");
unit.addAttachment(TestAttachment.class, lastAttachment);
- unit.getTypes().add(getType());
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -22,7 +22,6 @@
package org.jboss.test.deployers.managed.test;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -81,11 +80,6 @@
main.addDeployment(context);
main.process();
- // Check the deployment types
- HashSet<String> expectedTypes = new HashSet<String>();
- expectedTypes.add("TestManagedObjectDeployer");
- assertEquals(expectedTypes, context.getTypes());
-
// Check the default settings
assertNotNull(deployer.lastAttachment);
assertEquals("initialString1", deployer.lastAttachment.getProperty("string1"));
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-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/Deployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -36,14 +36,13 @@
public interface Deployer extends Ordered
{
/**
- * Get the type of the deployer. This should be reflected in
- * the DeploymentUnit deploymentType set of deployments the
- * Deployer processes.
- *
+ * 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
*
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-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -382,7 +382,7 @@
/**
* Get the type.
- *
+ *
* @return the type.
*/
public String getType()
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -247,9 +247,6 @@
result = parse(unit, name, result);
else
result = parse(unit, name, suffix, result);
- // Add the associated deployer type if there is a result
- if( result != null )
- unit.getTypes().add(getType());
}
catch (Exception e)
{
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractSimpleRealDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractSimpleRealDeployer.java 2008-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractSimpleRealDeployer.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -59,11 +59,7 @@
{
T deployment = unit.getAttachment(getInput());
if (deployment != null)
- {
- // Set the deployer type
- unit.getTypes().add(getType());
deploy(unit, deployment);
- }
}
public void internalUndeploy(DeploymentUnit unit)
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-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentContext.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -124,13 +124,6 @@
* @param comparator the comparator.
*/
void setComparator(Comparator<DeploymentContext> comparator);
-
- /**
- * Get the deployment types associated with this deployment.
- * @return set of deployment type names deployers have identified
- * in this deployment.
- */
- Set<String> getTypes();
/**
* Get 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-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/DeploymentUnit.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -80,14 +80,6 @@
String getRelativePath();
/**
- * Get the deployment types associated with this deployment.
- *
- * @return set of deployment type names deployers have identified
- * in this deployment.
- */
- 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-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -402,11 +402,6 @@
this.comparator = comparator;
}
- public Set<String> getTypes()
- {
- return deploymentTypes;
- }
-
public ScopeKey getScope()
{
if (scope == null)
@@ -469,7 +464,6 @@
if (deployment == null)
throw new IllegalArgumentException("Null deployment");
this.deployment = deployment;
- this.deployment.setTypes(getTypes());
}
public DeploymentUnit getDeploymentUnit()
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-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -115,11 +115,6 @@
return deploymentContext.getRelativePath();
}
- public Set<String> getTypes()
- {
- return deploymentContext.getTypes();
- }
-
public ScopeKey getScope()
{
return deploymentContext.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-03-13 07:11:28 UTC (rev 70803)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java 2008-03-13 09:18:28 UTC (rev 70804)
@@ -171,11 +171,6 @@
// No relative ordering of components?
}
- public Set<String> getTypes()
- {
- return parent.getTypes();
- }
-
public ScopeKey getScope()
{
if (scope == null)
More information about the jboss-cvs-commits
mailing list