[jboss-cvs] JBossAS SVN: r79220 - in projects/jboss-deployers/trunk: deployers-impl/src/test/java/org/jboss/test/deployers/main/support and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 7 09:31:30 EDT 2008
Author: alesj
Date: 2008-10-07 09:31:30 -0400 (Tue, 07 Oct 2008)
New Revision: 79220
Modified:
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestComponentDeployer.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer1.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer2.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/main/support/TestAttachmentsDeployer.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/scope/support/TestComponentDeployer.java
projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java
Log:
Move alias and tests to new AbstractDeploymentVisitor (JBDEPLOY-101).
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestComponentDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestComponentDeployer.java 2008-10-07 13:09:11 UTC (rev 79219)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestComponentDeployer.java 2008-10-07 13:31:30 UTC (rev 79220)
@@ -23,10 +23,9 @@
import java.util.List;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
/**
* TestDeploymentDeployer.
@@ -43,69 +42,39 @@
setRelativeOrder(order);
}
- protected static void addTestComponent(DeploymentUnit unit, TestComponentMetaData test)
+ public class TestComponentMetaDataContainerVisitor extends AbstractDeploymentVisitor<TestComponentMetaData, TestComponentMetaDataContainer>
{
- DeploymentUnit component = unit.addComponent(test.name);
- component.addAttachment(TestComponentMetaData.class, test);
- }
-
- protected static void removeTestComponent(DeploymentUnit unit, TestComponentMetaData test)
- {
- unit.removeComponent(test.name);
- }
-
- public class TestComponentMetaDataContainerVisitor implements DeploymentVisitor<TestComponentMetaDataContainer>
- {
public Class<TestComponentMetaDataContainer> getVisitorType()
{
return TestComponentMetaDataContainer.class;
}
- public void deploy(DeploymentUnit unit, TestComponentMetaDataContainer deployment) throws DeploymentException
+ protected List<? extends TestComponentMetaData> getComponents(TestComponentMetaDataContainer deployment)
{
- try
- {
- List<TestComponentMetaData> tests = deployment.componentMetaData;
- if (tests == null || tests.isEmpty())
- return;
-
- for (TestComponentMetaData test : tests)
- addTestComponent(unit, test);
- }
- catch (Throwable t)
- {
- throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + deployment, t);
- }
+ return deployment.componentMetaData;
}
- public void undeploy(DeploymentUnit unit, TestComponentMetaDataContainer deployment)
+ protected Class<TestComponentMetaData> getComponentType()
{
- List<TestComponentMetaData> tests = deployment.componentMetaData;
- if (tests == null)
- return;
-
- for (TestComponentMetaData test : tests)
- {
- unit.removeComponent(test.name);
- }
+ return TestComponentMetaData.class;
}
+
+ protected String getComponentName(TestComponentMetaData attachment)
+ {
+ return attachment.name;
+ }
}
- public static class TestComponentMetaDataVisitor implements DeploymentVisitor<TestComponentMetaData>
+ public static class TestComponentMetaDataVisitor extends AbstractComponentVisitor<TestComponentMetaData>
{
public Class<TestComponentMetaData> getVisitorType()
{
return TestComponentMetaData.class;
}
- public void deploy(DeploymentUnit unit, TestComponentMetaData deployment) throws DeploymentException
+ protected String getComponentName(TestComponentMetaData attachment)
{
- addTestComponent(unit, deployment);
+ return attachment.name;
}
-
- public void undeploy(DeploymentUnit unit, TestComponentMetaData deployment)
- {
- removeTestComponent(unit, deployment);
- }
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer1.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer1.java 2008-10-07 13:09:11 UTC (rev 79219)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer1.java 2008-10-07 13:31:30 UTC (rev 79220)
@@ -23,10 +23,9 @@
import java.util.List;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
/**
* TestDeploymentDeployer.
@@ -42,75 +41,45 @@
setComponentVisitor(new TestMetaDataVisitor());
}
- protected static void addTestComponent(DeploymentUnit unit, TestMetaData1 test)
- {
- DeploymentUnit component = unit.addComponent(test.getName());
- component.addAttachment(TestMetaData1.class, test);
- }
-
- protected static void removeTestComponent(DeploymentUnit unit, TestMetaData1 test)
- {
- unit.removeComponent(test.getName());
- }
-
/**
* TestDeploymentVisitor.
*/
- public class TestDeploymentVisitor implements DeploymentVisitor<TestDeployment1>
+ public class TestDeploymentVisitor extends AbstractDeploymentVisitor<TestMetaData1, TestDeployment1>
{
public Class<TestDeployment1> getVisitorType()
{
return TestDeployment1.class;
}
- public void deploy(DeploymentUnit unit, TestDeployment1 deployment) throws DeploymentException
+ protected List<? extends TestMetaData1> getComponents(TestDeployment1 deployment)
{
- try
- {
- List<TestMetaData1> tests = deployment.getBeans();
- if (tests == null || tests.isEmpty())
- return;
-
- for (TestMetaData1 test : tests)
- addTestComponent(unit, test);
- }
- catch (Throwable t)
- {
- throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + deployment, t);
- }
+ return deployment.getBeans();
}
- public void undeploy(DeploymentUnit unit, TestDeployment1 deployment)
+ protected Class<TestMetaData1> getComponentType()
{
- List<TestMetaData1> tests = deployment.getBeans();
- if (tests == null)
- return;
-
- for (TestMetaData1 test : tests)
- {
- unit.removeComponent(test.getName());
- }
+ return TestMetaData1.class;
}
+
+ protected String getComponentName(TestMetaData1 attachment)
+ {
+ return attachment.getName();
+ }
}
/**
* TestMetaDataVisitor.
*/
- public static class TestMetaDataVisitor implements DeploymentVisitor<TestMetaData1>
+ public static class TestMetaDataVisitor extends AbstractComponentVisitor<TestMetaData1>
{
public Class<TestMetaData1> getVisitorType()
{
return TestMetaData1.class;
}
- public void deploy(DeploymentUnit unit, TestMetaData1 deployment) throws DeploymentException
+ protected String getComponentName(TestMetaData1 attachment)
{
- addTestComponent(unit, deployment);
+ return attachment.getName();
}
-
- public void undeploy(DeploymentUnit unit, TestMetaData1 deployment)
- {
- removeTestComponent(unit, deployment);
- }
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer2.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer2.java 2008-10-07 13:09:11 UTC (rev 79219)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/TestDeploymentDeployer2.java 2008-10-07 13:31:30 UTC (rev 79220)
@@ -23,10 +23,9 @@
import java.util.List;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
/**
* TestDeploymentDeployer.
@@ -42,75 +41,45 @@
setComponentVisitor(new TestMetaDataVisitor());
}
- protected static void addTestComponent(DeploymentUnit unit, TestMetaData2 test)
- {
- DeploymentUnit component = unit.addComponent(test.getName());
- component.addAttachment(TestMetaData2.class, test);
- }
-
- protected static void removeTestComponent(DeploymentUnit unit, TestMetaData2 test)
- {
- unit.removeComponent(test.getName());
- }
-
/**
* TestDeploymentVisitor.
*/
- public class TestDeploymentVisitor implements DeploymentVisitor<TestDeployment2>
+ public class TestDeploymentVisitor extends AbstractDeploymentVisitor<TestMetaData2, TestDeployment2>
{
public Class<TestDeployment2> getVisitorType()
{
return TestDeployment2.class;
}
- public void deploy(DeploymentUnit unit, TestDeployment2 deployment) throws DeploymentException
+ protected List<? extends TestMetaData2> getComponents(TestDeployment2 deployment)
{
- try
- {
- List<TestMetaData2> tests = deployment.getBeans();
- if (tests == null || tests.isEmpty())
- return;
-
- for (TestMetaData2 test : tests)
- addTestComponent(unit, test);
- }
- catch (Throwable t)
- {
- throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + deployment, t);
- }
+ return deployment.getBeans();
}
- public void undeploy(DeploymentUnit unit, TestDeployment2 deployment)
+ protected Class<TestMetaData2> getComponentType()
{
- List<TestMetaData2> tests = deployment.getBeans();
- if (tests == null)
- return;
-
- for (TestMetaData2 test : tests)
- {
- unit.removeComponent(test.getName());
- }
+ return TestMetaData2.class;
}
+
+ protected String getComponentName(TestMetaData2 attachment)
+ {
+ return attachment.getName();
+ }
}
/**
* TestMetaDataVisitor.
*/
- public static class TestMetaDataVisitor implements DeploymentVisitor<TestMetaData2>
+ public static class TestMetaDataVisitor extends AbstractComponentVisitor<TestMetaData2>
{
public Class<TestMetaData2> getVisitorType()
{
return TestMetaData2.class;
}
- public void deploy(DeploymentUnit unit, TestMetaData2 deployment) throws DeploymentException
+ protected String getComponentName(TestMetaData2 attachment)
{
- addTestComponent(unit, deployment);
+ return attachment.getName();
}
-
- public void undeploy(DeploymentUnit unit, TestMetaData2 deployment)
- {
- removeTestComponent(unit, deployment);
- }
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/main/support/TestAttachmentsDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/main/support/TestAttachmentsDeployer.java 2008-10-07 13:09:11 UTC (rev 79219)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/main/support/TestAttachmentsDeployer.java 2008-10-07 13:31:30 UTC (rev 79220)
@@ -23,10 +23,9 @@
import java.util.List;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
/**
* Test attachments deployer.
@@ -41,66 +40,45 @@
setComponentVisitor(new TesAttachmentVisitor());
}
- protected static void addTestComponent(DeploymentUnit unit, TestAttachment bean)
- {
- DeploymentUnit component = unit.addComponent(bean.getName().toString());
- component.addAttachment(TestAttachment.class.getName(), bean);
- }
-
- protected static void removeTestComponent(DeploymentUnit unit, TestAttachment bean)
- {
- unit.removeComponent(bean.getName().toString());
- }
-
/**
* TestAttachmentsVisitor.
*/
- public static class TestAttachmentsVisitor implements DeploymentVisitor<TestAttachments>
+ public static class TestAttachmentsVisitor extends AbstractDeploymentVisitor<TestAttachment, TestAttachments>
{
public Class<TestAttachments> getVisitorType()
{
return TestAttachments.class;
}
- public void deploy(DeploymentUnit unit, TestAttachments deployment) throws DeploymentException
+ protected List<? extends TestAttachment> getComponents(TestAttachments deployment)
{
- List<TestAttachment> beans = deployment.getAttachments();
- if (beans != null && beans.isEmpty() == false)
- {
- for (TestAttachment bean : beans)
- addTestComponent(unit, bean);
- }
+ return deployment.getAttachments();
}
- public void undeploy(DeploymentUnit unit, TestAttachments deployment)
+ protected Class<TestAttachment> getComponentType()
{
- List<TestAttachment> beans = deployment.getAttachments();
- if (beans != null && beans.isEmpty() == false)
- {
- for (TestAttachment bean : beans)
- removeTestComponent(unit, bean);
- }
+ return TestAttachment.class;
}
+
+ protected String getComponentName(TestAttachment attachment)
+ {
+ return attachment.getName().toString();
+ }
}
/**
* TestAttachmentVisitor.
*/
- public static class TesAttachmentVisitor implements DeploymentVisitor<TestAttachment>
+ public static class TesAttachmentVisitor extends AbstractComponentVisitor<TestAttachment>
{
public Class<TestAttachment> getVisitorType()
{
return TestAttachment.class;
}
- public void deploy(DeploymentUnit unit, TestAttachment deployment) throws DeploymentException
+ protected String getComponentName(TestAttachment attachment)
{
- addTestComponent(unit, deployment);
+ return attachment.getName().toString();
}
-
- public void undeploy(DeploymentUnit unit, TestAttachment deployment)
- {
- removeTestComponent(unit, deployment);
- }
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/scope/support/TestComponentDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/scope/support/TestComponentDeployer.java 2008-10-07 13:09:11 UTC (rev 79219)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/scope/support/TestComponentDeployer.java 2008-10-07 13:31:30 UTC (rev 79220)
@@ -23,10 +23,9 @@
import java.util.List;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
/**
* TestDeploymentDeployer.
@@ -42,69 +41,39 @@
setComponentVisitor(new TestComponentMetaDataVisitor());
}
- protected static void addTestComponent(DeploymentUnit unit, TestComponentMetaData test)
+ public class TestComponentMetaDataContainerVisitor extends AbstractDeploymentVisitor<TestComponentMetaData, TestComponentMetaDataContainer>
{
- DeploymentUnit component = unit.addComponent(test.name);
- component.addAttachment(TestComponentMetaData.class, test);
- }
-
- protected static void removeTestComponent(DeploymentUnit unit, TestComponentMetaData test)
- {
- unit.removeComponent(test.name);
- }
-
- public class TestComponentMetaDataContainerVisitor implements DeploymentVisitor<TestComponentMetaDataContainer>
- {
public Class<TestComponentMetaDataContainer> getVisitorType()
{
return TestComponentMetaDataContainer.class;
}
- public void deploy(DeploymentUnit unit, TestComponentMetaDataContainer deployment) throws DeploymentException
+ protected List<? extends TestComponentMetaData> getComponents(TestComponentMetaDataContainer deployment)
{
- try
- {
- List<TestComponentMetaData> tests = deployment.componentMetaData;
- if (tests == null || tests.isEmpty())
- return;
-
- for (TestComponentMetaData test : tests)
- addTestComponent(unit, test);
- }
- catch (Throwable t)
- {
- throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + deployment, t);
- }
+ return deployment.componentMetaData;
}
- public void undeploy(DeploymentUnit unit, TestComponentMetaDataContainer deployment)
+ protected Class<TestComponentMetaData> getComponentType()
{
- List<TestComponentMetaData> tests = deployment.componentMetaData;
- if (tests == null)
- return;
-
- for (TestComponentMetaData test : tests)
- {
- unit.removeComponent(test.name);
- }
+ return TestComponentMetaData.class;
}
+
+ protected String getComponentName(TestComponentMetaData attachment)
+ {
+ return attachment.name;
+ }
}
- public static class TestComponentMetaDataVisitor implements DeploymentVisitor<TestComponentMetaData>
+ public static class TestComponentMetaDataVisitor extends AbstractComponentVisitor<TestComponentMetaData>
{
public Class<TestComponentMetaData> getVisitorType()
{
return TestComponentMetaData.class;
}
- public void deploy(DeploymentUnit unit, TestComponentMetaData deployment) throws DeploymentException
+ protected String getComponentName(TestComponentMetaData attachment)
{
- addTestComponent(unit, deployment);
+ return attachment.name;
}
-
- public void undeploy(DeploymentUnit unit, TestComponentMetaData deployment)
- {
- removeTestComponent(unit, deployment);
- }
}
}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java 2008-10-07 13:09:11 UTC (rev 79219)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java 2008-10-07 13:31:30 UTC (rev 79220)
@@ -21,13 +21,14 @@
*/
package org.jboss.deployers.vfs.deployer.kernel;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
import org.jboss.beans.metadata.spi.NamedAliasMetaData;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
import org.jboss.kernel.spi.deployment.KernelDeployment;
/**
@@ -46,66 +47,49 @@
setComponentVisitor(new AliasMetaDataVisitor());
}
- protected static void addAliasComponent(DeploymentUnit unit, NamedAliasMetaData alias)
- {
- DeploymentUnit component = unit.addComponent(alias.getAliasValue().toString());
- component.addAttachment(NamedAliasMetaData.class.getName(), alias);
- }
-
- protected static void removeAliasComponent(DeploymentUnit unit, NamedAliasMetaData alias)
- {
- unit.removeComponent(alias.getAliasValue().toString());
- }
-
/**
* KernelDeploymentVisitor.
*/
- public static class KernelDeploymentVisitor implements DeploymentVisitor<KernelDeployment>
+ public static class KernelDeploymentVisitor extends AbstractDeploymentVisitor<NamedAliasMetaData, KernelDeployment>
{
public Class<KernelDeployment> getVisitorType()
{
return KernelDeployment.class;
}
- public void deploy(DeploymentUnit unit, KernelDeployment deployment) throws DeploymentException
+ protected List<? extends NamedAliasMetaData> getComponents(KernelDeployment deployment)
{
Set<NamedAliasMetaData> aliases = deployment.getAliases();
if (aliases != null && aliases.isEmpty() == false)
- {
- for (NamedAliasMetaData alias : aliases)
- addAliasComponent(unit, alias);
- }
+ return new ArrayList<NamedAliasMetaData>(aliases);
+ else
+ return null;
}
- public void undeploy(DeploymentUnit unit, KernelDeployment deployment)
+ protected Class<NamedAliasMetaData> getComponentType()
{
- Set<NamedAliasMetaData> aliases = deployment.getAliases();
- if (aliases != null && aliases.isEmpty() == false)
- {
- for (NamedAliasMetaData alias : aliases)
- removeAliasComponent(unit, alias);
- }
+ return NamedAliasMetaData.class;
}
+
+ protected String getComponentName(NamedAliasMetaData attachment)
+ {
+ return attachment.getAliasValue().toString();
+ }
}
/**
* AliasMetaDataVisitor.
*/
- public static class AliasMetaDataVisitor implements DeploymentVisitor<NamedAliasMetaData>
+ public static class AliasMetaDataVisitor extends AbstractComponentVisitor<NamedAliasMetaData>
{
- public Class<NamedAliasMetaData> getVisitorType()
+ protected String getComponentName(NamedAliasMetaData attachment)
{
- return NamedAliasMetaData.class;
+ return attachment.getAliasValue().toString();
}
- public void deploy(DeploymentUnit unit, NamedAliasMetaData deployment) throws DeploymentException
+ public Class<NamedAliasMetaData> getVisitorType()
{
- addAliasComponent(unit, deployment);
+ return NamedAliasMetaData.class;
}
-
- public void undeploy(DeploymentUnit unit, NamedAliasMetaData deployment)
- {
- removeAliasComponent(unit, deployment);
- }
}
}
More information about the jboss-cvs-commits
mailing list