[jboss-cvs] JBossAS SVN: r104643 - in projects/reloaded/trunk/vdf-bootstrap-minimal/src: main/resources and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 10 19:01:48 EDT 2010
Author: ALRubinger
Date: 2010-05-10 19:01:48 -0400 (Mon, 10 May 2010)
New Revision: 104643
Removed:
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/org/jboss/reloaded/shrinkwrap/api/
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/java/org/jboss/reloaded/shrinkwrap/impl/
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_ShrinkWrapDeployer.xml
projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_TempFileProvider.xml
projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/ShrinkWrapDeployerUnitTest.java
Log:
[RELOADED-14] Remove prototyping for ShrinkWrapDeployer; now moved to ShrinkWrap as part of SHRINKWRAP-167
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_ShrinkWrapDeployer.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_ShrinkWrapDeployer.xml 2010-05-10 23:01:02 UTC (rev 104642)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_ShrinkWrapDeployer.xml 2010-05-10 23:01:48 UTC (rev 104643)
@@ -1,18 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
- Creates the ShrinkWrap Deployer, which delegates to the specified
- MainDeployer and uses a supplied TempFileProvder
- -->
- <bean name="ShrinkWrapDeployer" class="org.jboss.reloaded.shrinkwrap.impl.ShrinkWrapDeployerImpl">
- <constructor>
- <parameter name="deployer">
- <inject />
- </parameter>
- <parameter name="tempFileProvider">
- <inject />
- </parameter>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_TempFileProvider.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_TempFileProvider.xml 2010-05-10 23:01:02 UTC (rev 104642)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_TempFileProvider.xml 2010-05-10 23:01:48 UTC (rev 104643)
@@ -1,49 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Deployment configuration for a VFS TempFileProvider
-
- <threads xmlns="urn:jboss:threads:2.0">
- <thread-factory name="org.jboss.reloaded.TempFileThreadFactory"/>
- <scheduled-thread-pool-executor name="org.jboss.reloaded.TempFileExecutorService">
- <max-threads count="1" per-cpu="1"/>
- <thread-factory name="org.jboss.reloaded.TempFileThreadFactory"/>
- </scheduled-thread-pool-executor>
- </threads>
-
- Currently fails with:
-
- org.jboss.joinpoint.spi.JoinpointException: Constructor not found
- org.jboss.threads.QueuelessExecutor[int, java.util.concurrent.ThreadFactory] in
- [ReflectConstructorInfoImpl at 11afd9cc{[ReflectClassInfoImpl at 3003e926{name=java.util.concurrent.ThreadFactory},
- ReflectClassInfoImpl at 50bfd66a{name=org.jboss.threads.DirectExecutor},
- ReflectClassInfoImpl at 6295f290{name=java.util.concurrent.Executor}, long]}]
-
- FIXME: Example on http://community.jboss.org/wiki/ThreadPoolConfiguration might need to be updated
- Ask DML
-
- -->
-
- <!--
- Define the Executor, but this should really be done in threads.xsd
- format above
- TODO Remove this when the above works
- -->
- <bean name="org.jboss.reloaded.TempFileExecutorService" class="org.jboss.threads.JBossScheduledThreadPoolExecutor">
- <constructor>
- <parameter>1</parameter>
- </constructor>
- </bean>
-
- <bean name="org.jboss.reloaded.TempFileProvider" class="org.jboss.vfs.TempFileProvider">
- <constructor factoryClass="org.jboss.vfs.TempFileProvider"
- factoryMethod="create">
- <parameter>shrinkwrap-</parameter>
- <parameter>
- <inject bean="org.jboss.reloaded.TempFileExecutorService" />
- </parameter>
- </constructor>
- </bean>
-
-
-
-</deployment>
\ No newline at end of file
Deleted: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/ShrinkWrapDeployerUnitTest.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/ShrinkWrapDeployerUnitTest.java 2010-05-10 23:01:02 UTC (rev 104642)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/ShrinkWrapDeployerUnitTest.java 2010-05-10 23:01:48 UTC (rev 104643)
@@ -1,131 +0,0 @@
-package org.jboss.reloaded.api;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.jboss.bootstrap.api.descriptor.BootstrapDescriptor;
-import org.jboss.bootstrap.api.mc.server.MCServer;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.logging.Logger;
-import org.jboss.reloaded.shrinkwrap.api.ShrinkWrapDeployer;
-import org.jboss.reloaded.shrinkwrap.api.ShrinkWrapReloadedDescriptors;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.Test;
-
-/**
- * Ensures that the {@link ShrinkWrapDeployer} supports deployment
- * and undeployment of ShrinkWrap {@link Archive}s.
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class ShrinkWrapDeployerUnitTest extends ReloadedMCServerTestBase
-{
-
- //-------------------------------------------------------------------------------------||
- // Class Members ----------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Logger
- */
- private static final Logger log = Logger.getLogger(ShrinkWrapDeployerUnitTest.class);
-
- /**
- * MC bean name of the {@link ShrinkWrapDeployer}
- */
- private static final String NAME_MC_SHRINKWRAP_DEPLOYER = "ShrinkWrapDeployer";
-
- /**
- * Name of a ShrinkWrap {@link Archive} we'll deploy
- */
- private static final String NAME_ARCHIVE = "testDeployment.jar";
-
- //-------------------------------------------------------------------------------------||
- // Required Implementations -----------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * {@inheritDoc}
- * @see org.jboss.reloaded.api.ReloadedMCServerTestBase#configureServer(org.jboss.bootstrap.api.mc.server.MCServer)
- */
- @Override
- protected void configureServer(final MCServer server)
- {
- // Add the required bootstrap descriptors
- final List<BootstrapDescriptor> descriptors = server.getConfiguration().getBootstrapDescriptors();
- descriptors.add(ReloadedDescriptors.getClassLoadingDescriptor());
- descriptors.add(ReloadedDescriptors.getVdfDescriptor());
- descriptors.add(ReloadedDescriptors.getThreadsDescriptor());
- descriptors.add(ShrinkWrapReloadedDescriptors.getTempFileProviderDescriptor());
- descriptors.add(ShrinkWrapReloadedDescriptors.getShrinkWrapDeployerDescriptor());
- }
-
- //-------------------------------------------------------------------------------------||
- // Tests ------------------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Ensures that a ShrinkWrap {@link Archive} may be directly deployed into
- * the {@link ShrinkWrapDeployer}
- */
- @Test
- public void testShrinkWrapDeployment() throws Throwable
- {
- // Get the KernelController
- final KernelController controller = server.getKernel().getController();
-
- // Get the MainDeployer (should have been installed via the lifecycle)
- final ShrinkWrapDeployer shrinkwrapDeployer = (ShrinkWrapDeployer) controller.getInstalledContext(
- NAME_MC_SHRINKWRAP_DEPLOYER).getTarget();
- TestCase.assertNotNull(ShrinkWrapDeployer.class.getName() + " instance was not installed into MC",
- shrinkwrapDeployer);
-
- // Ensure preconditions (state STOPPED)
- LifecyclePojo.State currentState = LifecyclePojo.state;
- log.info("Current State of Lifecycle POJO: " + currentState);
- Assert.assertEquals("Lifecycle POJO state should be stopped before deployment", LifecyclePojo.State.STOPPED,
- currentState);
-
- // Construct a test JAR to install the Lifecycle POJO
- final Asset deploymentXmlAsset = new Asset()
- {
-
- @Override
- public InputStream openStream()
- {
- return new ByteArrayInputStream(new String(
- "<deployment xmlns=\"urn:jboss:bean-deployer:2.0\"><bean name=\"LifecyclePojo\" class=\""
- + LifecyclePojo.class.getName() + "\" /></deployment>").getBytes());
- }
- };
- final JavaArchive testJar = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).addClass(LifecyclePojo.class).add(
- deploymentXmlAsset, ArchivePaths.create("pojo-jboss-beans.xml"));
-
- // Deploy the test JAR
- shrinkwrapDeployer.deploy(testJar);
-
- // Ensure deployed
- currentState = LifecyclePojo.state;
- log.info("Current State of Lifecycle POJO: " + currentState);
- Assert.assertEquals("Lifecycle POJO state should be started after deployment", LifecyclePojo.State.STARTED,
- currentState);
-
- // Undeploy
- shrinkwrapDeployer.undeploy(testJar);
-
- // Ensure undeployed
- currentState = LifecyclePojo.state;
- log.info("Current State of Lifecycle POJO: " + currentState);
- Assert.assertEquals("Lifecycle POJO state should be stopped after undeployment", LifecyclePojo.State.STOPPED,
- LifecyclePojo.state);
- }
-}
More information about the jboss-cvs-commits
mailing list