[jboss-cvs] JBossAS SVN: r102525 - in projects/reloaded/trunk/naming-deployers: src/main/java/org/jboss/reloaded/naming/deployers and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 17 13:04:29 EDT 2010
Author: wolfc
Date: 2010-03-17 13:04:26 -0400 (Wed, 17 Mar 2010)
New Revision: 102525
Added:
projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/ExceptionDeployer.java
projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/simple/ExceptionTestCase.java
Modified:
projects/reloaded/trunk/naming-deployers/pom.xml
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/AppNamingDeployer.java
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ComponentNamingDeployer.java
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/AbstractNameSpace.java
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEApplication.java
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEComponent.java
projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEModule.java
projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/AbstractNamingDeployersTestCase.java
projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyContainer.java
projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyDeployer.java
projects/reloaded/trunk/naming-deployers/src/test/resources/dummy-deployers-beans.xml
projects/reloaded/trunk/naming-deployers/src/test/resources/log4j.xml
Log:
RELOADED-12: removed all notions of MC scoping
Modified: projects/reloaded/trunk/naming-deployers/pom.xml
===================================================================
--- projects/reloaded/trunk/naming-deployers/pom.xml 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/pom.xml 2010-03-17 17:04:26 UTC (rev 102525)
@@ -15,17 +15,21 @@
The integration point between Naming and VDF.
</description>
+ <properties>
+ <version.org.jboss.deployers>2.2.0.Alpha1</version.org.jboss.deployers>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>2.0.9.GA</version>
+ <version>${version.org.jboss.deployers}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-spi</artifactId>
- <version>2.0.9.GA</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -34,9 +38,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.9.GA</version>
+ <version>2.2.0.Alpha2</version>
</dependency>
<dependency>
<groupId>org.jboss.reloaded</groupId>
@@ -44,4 +48,4 @@
<version>0.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/AppNamingDeployer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/AppNamingDeployer.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/AppNamingDeployer.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -27,12 +27,9 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.metadata.plugins.scope.ApplicationScope;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEApplicationInformer;
import org.jboss.reloaded.naming.deployers.mc.MCJavaEEApplication;
-import static org.jboss.reloaded.naming.deployers.util.AnnotationHelper.annotation;
-
/**
* The AppNamingDeployer installs a JavaEEApplication MC bean under the name of java:app
* within an application scope with the JavaEE application name.
@@ -53,7 +50,7 @@
throw new NullPointerException("informer is null");
this.informer = informer;
setInputs(informer.getRequiredAttachments());
- setOutputs("java:app");
+// setOutputs("java:app");
setOutput(BeanMetaData.class);
}
@@ -67,9 +64,10 @@
// because BeanMetaDataDeployer.undeploy needs an unique name
String name = "jboss.naming:application=" + appName;
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, MCJavaEEApplication.class.getName())
- .addAnnotation(annotation(ApplicationScope.class, appName))
+ //.addAnnotation(annotation(ApplicationScope.class, appName))
.addConstructorParameter(String.class.getName(), appName)
- .addAlias("java:app");
+ //.addAlias("java:app")
+ ;
builder.addPropertyMetaData("nameSpaces", builder.createInject("NameSpaces"));
deploymentUnit.addAttachment(BeanMetaData.class + "." + name, builder.getBeanMetaData());
}
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ComponentNamingDeployer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ComponentNamingDeployer.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ComponentNamingDeployer.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -28,16 +28,10 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.metadata.plugins.scope.ApplicationScope;
-import org.jboss.metadata.plugins.scope.DeploymentScope;
-import org.jboss.metadata.plugins.scope.InstanceScope;
-import org.jboss.reloaded.naming.deployers.dependency.ParentsLookupStrategy;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer;
import org.jboss.reloaded.naming.deployers.mc.MCJavaEEComponent;
import org.jboss.reloaded.naming.spi.JavaEEModule;
-import static org.jboss.reloaded.naming.deployers.util.AnnotationHelper.annotation;
-
/**
* @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
*/
@@ -49,7 +43,7 @@
{
this.informer = informer;
setInputs(informer.getRequiredAttachments());
- addInput("java:module");
+// addInput("java:module");
setOutput(BeanMetaData.class);
// if we don't work on components only you'll see a duplicate install of java:module
// because AbstractDeploymentUnit.getAttachments inherits attachments from the parent.
@@ -72,14 +66,16 @@
name += "application=" + appName + ",";
name += "module=" + moduleName + ",component=" + componentName;
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, MCJavaEEComponent.class.getName())
- .addAnnotation(annotation(DeploymentScope.class, moduleName))
- .addAnnotation(annotation(InstanceScope.class, componentName))
+// .addAnnotation(annotation(DeploymentScope.class, moduleName))
+// .addAnnotation(annotation(InstanceScope.class, componentName))
.addConstructorParameter(String.class.getName(), componentName)
- .addAlias("java:comp");
- if(appName != null)
- builder.addAnnotation(annotation(ApplicationScope.class, appName));
- AbstractInjectionValueMetaData javaModule = new AbstractInjectionValueMetaData("java:module");
- javaModule.setSearch(new ParentsLookupStrategy());
+// .addAlias("java:comp")
+ ;
+// if(appName != null)
+// builder.addAnnotation(annotation(ApplicationScope.class, appName));
+// AbstractInjectionValueMetaData javaModule = new AbstractInjectionValueMetaData("java:module");
+// javaModule.setSearch(new ParentsLookupStrategy());
+ AbstractInjectionValueMetaData javaModule = new AbstractInjectionValueMetaData("jboss.naming:" + (appName != null ? "application=" + appName + "," : "") + "module=" + moduleName);
builder.addConstructorParameter(JavaEEModule.class.getName(), javaModule);
builder.addPropertyMetaData("nameSpaces", builder.createInject("NameSpaces"));
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/ModuleNamingDeployer.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -29,7 +29,6 @@
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.plugins.scope.ApplicationScope;
-import org.jboss.metadata.plugins.scope.DeploymentScope;
import org.jboss.reloaded.naming.deployers.dependency.ParentsLookupStrategy;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer;
import org.jboss.reloaded.naming.deployers.mc.MCJavaEEModule;
@@ -56,7 +55,7 @@
{
this.informer = informer;
setInputs(informer.getRequiredAttachments());
- addInput("java:app");
+// addInput("java:app");
setOutput(BeanMetaData.class);
}
@@ -76,14 +75,16 @@
name += "application=" + appName + ",";
name += "module=" + moduleName;
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, MCJavaEEModule.class.getName())
- .addAnnotation(annotation(DeploymentScope.class, moduleName))
+// .addAnnotation(annotation(DeploymentScope.class, moduleName))
.addConstructorParameter(String.class.getName(), moduleName)
- .addAlias("java:module");
+// .addAlias("java:module")
+ ;
if(appName != null)
{
- builder.addAnnotation(annotation(ApplicationScope.class, appName));
- AbstractInjectionValueMetaData javaApp = new AbstractInjectionValueMetaData("java:app");
- javaApp.setSearch(new ParentsLookupStrategy());
+// builder.addAnnotation(annotation(ApplicationScope.class, appName));
+// AbstractInjectionValueMetaData javaApp = new AbstractInjectionValueMetaData("java:app");
+// javaApp.setSearch(new ParentsLookupStrategy());
+ AbstractInjectionValueMetaData javaApp = new AbstractInjectionValueMetaData("jboss.naming:application=" + appName);
builder.addConstructorParameter(JavaEEApplication.class.getName(), javaApp);
}
else
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/AbstractNameSpace.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/AbstractNameSpace.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/AbstractNameSpace.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -31,7 +31,7 @@
*/
public abstract class AbstractNameSpace
{
- protected String name;
+ protected final String name;
protected NameSpaces nameSpaces;
protected Context context;
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEApplication.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEApplication.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEApplication.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -53,4 +53,12 @@
nameSpaces.getGlobalContext().unbind(name);
context = null;
}
+
+ @Override
+ public String toString()
+ {
+ return "MCJavaEEApplication{" +
+ "name='" + name + '\'' +
+ '}';
+ }
}
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEComponent.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEComponent.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEComponent.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -61,4 +61,13 @@
{
context = null;
}
+
+ @Override
+ public String toString()
+ {
+ return "MCJavaEEComponent{" +
+ "module=" + module +
+ ", name='" + name + '\'' +
+ '}';
+ }
}
Modified: projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEModule.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEModule.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/main/java/org/jboss/reloaded/naming/deployers/mc/MCJavaEEModule.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -66,4 +66,13 @@
context = null;
parentContext = null;
}
+
+ @Override
+ public String toString()
+ {
+ return "MCJavaEEModule{" +
+ "application=" + application +
+ ", name='" + name + '\'' +
+ '}';
+ }
}
Modified: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/AbstractNamingDeployersTestCase.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/AbstractNamingDeployersTestCase.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/AbstractNamingDeployersTestCase.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -44,7 +44,7 @@
*/
public abstract class AbstractNamingDeployersTestCase
{
- private static Kernel kernel;
+ protected static Kernel kernel;
private static BasicXMLDeployer deployer;
protected static MainDeployer mainDeployer;
protected static InitialContext ctx;
Modified: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyContainer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyContainer.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyContainer.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -37,7 +37,7 @@
{
private static Logger log = Logger.getLogger(DummyContainer.class);
- private JavaEEComponent component;
+ private final JavaEEComponent component;
private InitialContext ctx;
public DummyContainer(JavaEEComponent component)
@@ -105,4 +105,12 @@
log.info("Stopped container " + this);
}
+
+ @Override
+ public String toString()
+ {
+ return "DummyContainer{" +
+ "component=" + component +
+ '}';
+ }
}
Modified: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyDeployer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyDeployer.java 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/DummyDeployer.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -25,13 +25,10 @@
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.dependency.plugins.graph.Search;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.plugins.scope.ApplicationScope;
-import org.jboss.metadata.plugins.scope.DeploymentScope;
-import org.jboss.metadata.plugins.scope.InstanceScope;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer;
import org.jboss.reloaded.naming.spi.JavaEEComponent;
@@ -65,13 +62,15 @@
name += "application=" + appName + ",";
name += "module=" + moduleName + ",component=" + componentName;
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, DummyContainer.class.getName())
- .addAnnotation(annotation(DeploymentScope.class, moduleName))
- .addAnnotation(annotation(InstanceScope.class, componentName))
- .addAlias(componentName);
- if(appName != null)
- builder.addAnnotation(annotation(ApplicationScope.class, appName));
- AbstractInjectionValueMetaData javaComponent = new AbstractInjectionValueMetaData("java:comp");
- javaComponent.setSearch(Search.LOCAL);
+// .addAnnotation(annotation(DeploymentScope.class, moduleName))
+// .addAnnotation(annotation(InstanceScope.class, componentName))
+// .addAlias(componentName)
+ ;
+// if(appName != null)
+// builder.addAnnotation(annotation(ApplicationScope.class, appName));
+// AbstractInjectionValueMetaData javaComponent = new AbstractInjectionValueMetaData("java:comp");
+// javaComponent.setSearch(Search.LOCAL);
+ AbstractInjectionValueMetaData javaComponent = new AbstractInjectionValueMetaData("jboss.naming:" + (appName != null ? "application=" + appName + "," : "") + "module=" + moduleName + ",component=" + componentName);
builder.addConstructorParameter(JavaEEComponent.class.getName(), javaComponent);
unit.getParent().addAttachment(BeanMetaData.class.getName() + "." + name, builder.getBeanMetaData());
Added: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/ExceptionDeployer.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/ExceptionDeployer.java (rev 0)
+++ projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/ExceptionDeployer.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright (c) 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.reloaded.naming.deployers.test.common;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public class ExceptionDeployer extends AbstractSimpleRealDeployer<Exception>
+{
+ public ExceptionDeployer()
+ {
+ super(Exception.class);
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit, Exception deployment) throws DeploymentException
+ {
+ throw new DeploymentException(deployment);
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit unit, Exception deployment)
+ {
+ log.info("undeploy " + unit);
+ }
+}
Property changes on: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/common/ExceptionDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/simple/ExceptionTestCase.java
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/simple/ExceptionTestCase.java (rev 0)
+++ projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/simple/ExceptionTestCase.java 2010-03-17 17:04:26 UTC (rev 102525)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright (c) 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.reloaded.naming.deployers.test.simple;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.vfs.plugins.client.AbstractVFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.reloaded.naming.deployers.test.common.AbstractNamingDeployersTestCase;
+import org.jboss.reloaded.naming.deployers.test.common.DummiesMetaData;
+import org.jboss.virtual.AssembledDirectory;
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+/**
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public class ExceptionTestCase extends AbstractNamingDeployersTestCase
+{
+ @Test
+ public void test1() throws Exception
+ {
+ AssembledDirectory root = AssembledDirectory.createAssembledDirectory("components", "components.jar");
+ VFSDeployment deployment = new AbstractVFSDeployment(root);
+ ((MutableAttachments) deployment.getPredeterminedManagedObjects()).addAttachment(DummiesMetaData.class, DummiesMetaData.create("A", "B"));
+ ((MutableAttachments) deployment.getPredeterminedManagedObjects()).addAttachment(Exception.class, new Exception("fail"));
+ try
+ {
+ mainDeployer.deploy(deployment);
+ fail("Expected DeploymentException");
+ }
+ catch(DeploymentException e)
+ {
+ // good
+ }
+
+ AssembledDirectory root2 = AssembledDirectory.createAssembledDirectory("components2", "components2.jar");
+ VFSDeployment deployment2 = new AbstractVFSDeployment(root2);
+ ((MutableAttachments) deployment2.getPredeterminedManagedObjects()).addAttachment(DummiesMetaData.class, DummiesMetaData.create("A", "B"));
+ mainDeployer.deploy(deployment2);
+
+ mainDeployer.undeploy(deployment2);
+ }
+}
Property changes on: projects/reloaded/trunk/naming-deployers/src/test/java/org/jboss/reloaded/naming/deployers/test/simple/ExceptionTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/reloaded/trunk/naming-deployers/src/test/resources/dummy-deployers-beans.xml
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/resources/dummy-deployers-beans.xml 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/test/resources/dummy-deployers-beans.xml 2010-03-17 17:04:26 UTC (rev 102525)
@@ -5,4 +5,6 @@
<bean name="DummyDeployer" class="org.jboss.reloaded.naming.deployers.test.common.DummyDeployer">
<property name="javaEEComponentInformer"><inject bean="JavaEEComponentInformer"/></property>
</bean>
+
+ <bean name="ExceptionDeployer" class="org.jboss.reloaded.naming.deployers.test.common.ExceptionDeployer"/>
</deployment>
\ No newline at end of file
Modified: projects/reloaded/trunk/naming-deployers/src/test/resources/log4j.xml
===================================================================
--- projects/reloaded/trunk/naming-deployers/src/test/resources/log4j.xml 2010-03-17 16:53:15 UTC (rev 102524)
+++ projects/reloaded/trunk/naming-deployers/src/test/resources/log4j.xml 2010-03-17 17:04:26 UTC (rev 102525)
@@ -128,6 +128,16 @@
<priority value="INFO"/>
</category>
+ <!--
+ <category name="org.jboss.dependency">
+ <priority value="ALL"/>
+ </category>
+
+ <category name="org.jboss.kernel">
+ <priority value="ALL"/>
+ </category>
+ -->
+
<category name="org.jboss.reloaded.naming.deployers">
<priority value="DEBUG"/>
</category>
More information about the jboss-cvs-commits
mailing list