[jboss-cvs] JBossAS SVN: r101786 - in projects/jboss-deployers/trunk: deployers-vfs/src/test/java/org/jboss/test/deployers and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 3 11:53:56 EST 2010
Author: alesj
Date: 2010-03-03 11:53:54 -0500 (Wed, 03 Mar 2010)
New Revision: 101786
Added:
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/ClassLoadingTestSuite.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloading/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloading/test/
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.xml
Modified:
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
Log:
[JBDEPLOY-248]; jboss-deployment.xml tests.
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java 2010-03-03 16:50:20 UTC (rev 101785)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java 2010-03-03 16:53:54 UTC (rev 101786)
@@ -30,6 +30,8 @@
import org.jboss.deployers.spi.deployer.DeploymentStage;
import org.jboss.deployers.spi.deployer.DeploymentStageXmlAdapter;
import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+import org.jboss.xb.annotations.JBossXmlAttribute;
import org.jboss.xb.annotations.JBossXmlSchema;
/**
@@ -47,22 +49,23 @@
private DeploymentStage requiredStage = DeploymentStages.DESCRIBE;
private boolean lazyResolve;
private boolean lazyStart;
- private Set<String> filters;
+ private Set<FilterMetaData> filters;
+ @XmlTransient // TODO -- fix this once XB support it
public DeploymentStage getRequiredStage()
{
return requiredStage;
}
- @XmlAttribute(name = "required-stage")
- @XmlJavaTypeAdapter(DeploymentStageXmlAdapter.class)
- public void setRequiredStage(DeploymentStage requiredStage)
- {
- if (requiredStage == null)
- requiredStage = DeploymentStages.DESCRIBE;
-
- this.requiredStage = requiredStage;
- }
+// @XmlAttribute(name = "required-stage")
+// @XmlJavaTypeAdapter(DeploymentStageXmlAdapter.class)
+// public void setRequiredStage(DeploymentStage requiredStage)
+// {
+// if (requiredStage == null)
+// requiredStage = DeploymentStages.DESCRIBE;
+//
+// this.requiredStage = requiredStage;
+// }
public boolean isLazyResolve()
{
@@ -86,14 +89,14 @@
this.lazyStart = lazyStart;
}
- public Set<String> getFilters()
+ public Set<FilterMetaData> getFilters()
{
return filters;
}
- @XmlElement(name = "lazy-start-filter")
- public void setFilters(Set<String> filters)
+ @XmlElement(name = "lazy-start-filter", type = FilterMetaData.class)
+ public void setFilters(Set<FilterMetaData> filters)
{
this.filters = filters;
- }
+ }
}
\ No newline at end of file
Copied: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java (from rev 101744, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java 2010-03-03 16:53:54 UTC (rev 101786)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Inc., 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.deployers.plugins.classloading;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+import java.io.Serializable;
+
+/**
+ * Filter meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+ at XmlRootElement(name="lazy-start-filter")
+ at XmlType(name="lazyStartFilterType")
+public class FilterMetaData implements Serializable
+{
+ private static final long serialVersionUID = 1l;
+
+ private boolean recurse;
+ private String value;
+
+ public boolean isRecurse()
+ {
+ return recurse;
+ }
+
+ @XmlAttribute
+ public void setRecurse(boolean recurse)
+ {
+ this.recurse = recurse;
+ }
+
+ public String getValue()
+ {
+ if (value == null)
+ throw new IllegalArgumentException("Null value");
+
+ return value;
+ }
+
+ @XmlValue
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ @Override
+ public int hashCode()
+ {
+
+ return getValue().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ return false;
+
+ if (obj == this)
+ return true;
+
+ if (obj instanceof FilterMetaData == false)
+ return false;
+
+ FilterMetaData other = (FilterMetaData) obj;
+ return recurse == other.isRecurse() && getValue().equals(other.getValue());
+ }
+}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2010-03-03 16:50:20 UTC (rev 101785)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2010-03-03 16:53:54 UTC (rev 101786)
@@ -27,6 +27,7 @@
import org.jboss.test.deployers.vfs.annotations.AnnotationScanningTestSuite;
import org.jboss.test.deployers.vfs.classloader.ClassLoaderTestSuite;
+import org.jboss.test.deployers.vfs.classloading.ClassLoadingTestSuite;
import org.jboss.test.deployers.vfs.dependency.DependencyTestSuite;
import org.jboss.test.deployers.vfs.deployer.bean.BeanDeployerTestSuite;
import org.jboss.test.deployers.vfs.deployer.facelets.FaceletsTestSuite;
@@ -76,6 +77,7 @@
suite.addTest(VFSManagedTestSuite.suite());
suite.addTest(NonMetadataDeployersTestSuite.suite());
suite.addTest(ClassLoaderTestSuite.suite());
+ suite.addTest(ClassLoadingTestSuite.suite());
suite.addTest(VFSMatchersTestSuite.suite());
suite.addTest(JBossXBDeployersTestSuite.suite());
suite.addTest(MergeDeployerTestSuite.suite());
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/ClassLoadingTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/ClassLoadingTestSuite.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/ClassLoadingTestSuite.java 2010-03-03 16:53:54 UTC (rev 101786)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 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.test.deployers.vfs.classloading;
+
+import org.jboss.test.deployers.vfs.classloading.test.DeploymentMetaDataUnitTestCase;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * ClassLoading test suite.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ClassLoadingTestSuite
+{
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("VFS ClassLoading Tests");
+
+ suite.addTest(DeploymentMetaDataUnitTestCase.suite());
+
+ return suite;
+ }
+}
Copied: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java (from rev 101744, projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/UndeployOrderClassLoaderUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java 2010-03-03 16:53:54 UTC (rev 101786)
@@ -0,0 +1,75 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.deployers.vfs.classloading.test;
+
+import java.util.Set;
+
+import org.jboss.deployers.plugins.classloading.DeploymentMetaData;
+import org.jboss.deployers.plugins.classloading.FilterMetaData;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.BootstrapDeployersTest;
+
+import junit.framework.Test;
+
+/**
+ * Deployment metadata test case.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DeploymentMetaDataUnitTestCase extends BootstrapDeployersTest
+{
+ public DeploymentMetaDataUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(DeploymentMetaDataUnitTestCase.class);
+ }
+
+ public void testXmlParsing() throws Exception
+ {
+ DeploymentUnit du = addDeployment("/classloading", "smoke");
+ try
+ {
+ DeploymentMetaData dmd = du.getAttachment(DeploymentMetaData.class);
+ assertNotNull(dmd);
+ assertTrue(dmd.isLazyResolve());
+ assertTrue(dmd.isLazyStart());
+ Set<FilterMetaData> filters = dmd.getFilters();
+ assertNotNull(filters);
+ assertEquals(2, filters.size());
+ for (FilterMetaData fmd : filters)
+ {
+ if (fmd.isRecurse())
+ assertEquals("com.acme.somepackage", fmd.getValue());
+ else
+ assertEquals("org.foo.bar", fmd.getValue());
+ }
+ }
+ finally
+ {
+ undeploy(du);
+ }
+ }
+}
\ No newline at end of file
Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloading/smoke/META-INF/jboss-deployment.xml 2010-03-03 16:53:54 UTC (rev 101786)
@@ -0,0 +1,7 @@
+<deployment xmlns="urn:jboss:deployment:1.0" required-stage="PRE_DESCRIBE" lazy-resolve="true">
+
+ <lazy-start-filter recurse="false">org.foo.bar</lazy-start-filter>
+ <lazy-start-filter recurse="true">com.acme.somepackage</lazy-start-filter>
+
+</deployment>
+
Copied: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.xml (from rev 101744, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloader/test/IntegrationDeployerUnitTestCase.xml)
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.xml (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.xml 2010-03-03 16:53:54 UTC (rev 101786)
@@ -0,0 +1,11 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="DMDDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.deployers.plugins.classloading.DeploymentMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-deployment.xml</property>
+ <property name="registerWithJBossXB">true</property>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list