[jboss-cvs] JBossAS SVN: r99753 - in projects/jboss-deployers/trunk: deployers-core/src/main/java/org/jboss/deployers/plugins/structure and 19 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 21 10:10:48 EST 2010
Author: adrian at jboss.org
Date: 2010-01-21 10:10:47 -0500 (Thu, 21 Jan 2010)
New Revision: 99753
Modified:
projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java
projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java
projects/jboss-deployers/trunk/deployers-vfs/pom.xml
projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java
projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java
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/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java
projects/jboss-deployers/trunk/pom.xml
Log:
Update to jboss-cl 2.2.0 snapshot and some source code tidyup
Modified: projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -33,7 +33,7 @@
*/
public class MetaDataEntryImpl implements MetaDataEntry, Serializable
{
- private static long serialVersionUID = 1l;
+ private static final long serialVersionUID = 1l;
private String path;
private MetaDataType type;
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -254,6 +254,11 @@
/**
* Break the cyclic graph by processing transient deployers. Basically choosing one edge which we want removed.
+ *
+ * @param s the deployers
+ * @param inputCache the input cache
+ * @param outputCache the output cache
+ * @param edgeCache the edge cache
*/
public void processTransientDeployers(List<Deployer> s, Map<String, Collection<Deployer>> inputCache, Map<String, Collection<Deployer>> outputCache, Map<Deployer, Set<Edge>> edgeCache)
{
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -117,7 +117,7 @@
}
insertAfterInputs(n);
- IdentityHashMap visited = new IdentityHashMap();
+ IdentityHashMap<Entry, Entry> visited = new IdentityHashMap<Entry, Entry>();
traverseOutputs(n, visited);
relativeOrdering();
@@ -177,7 +177,7 @@
return deployers;
}
- private void traverseOutputs(Entry n, IdentityHashMap visited)
+ private void traverseOutputs(Entry n, IdentityHashMap<Entry, Entry> visited)
{
if (n.getOutputs() == null) return;
if (visited.containsKey(n))
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -133,7 +133,6 @@
}
}
- @SuppressWarnings("unchecked")
public void testSimpleClassUsage() throws Exception
{
DeployerClient deployer = getMainDeployer();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -29,6 +29,7 @@
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.dependency.ClassLoading;
import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
@@ -168,8 +169,8 @@
ClassLoaderSystem system = new InterceptionClassLoaderSystem();
// we need to see javassist
ClassFilter javassistFilter = new PackageClassFilter(new String[]{"org.jboss.reflect.plugins.javassist"});
- ClassFilter before = new CombiningClassFilter(false, new ClassFilter[]{ClassFilter.JAVA_ONLY, javassistFilter});
- ParentPolicy parentPolicy = new ParentPolicy(before, ClassFilter.NOTHING);
+ ClassFilter before = new CombiningClassFilter(false, new ClassFilter[]{ClassFilterUtils.JAVA_ONLY, javassistFilter});
+ ParentPolicy parentPolicy = new ParentPolicy(before, ClassFilterUtils.NOTHING);
system.getDefaultDomain().setParentPolicy(parentPolicy);
deployer1 = new MockClassLoaderDescribeDeployer();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -22,7 +22,6 @@
package org.jboss.test.deployers.asynchronous.support;
import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
import org.jboss.dependency.plugins.AbstractControllerContext;
import org.jboss.dependency.plugins.AbstractControllerContextActions;
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -72,7 +72,6 @@
public static final List<String> BAA = makeList(NameB, NameA, NameA);
public static final List<String> BABA = makeList(NameB, NameA, NameB, NameA);
- @SuppressWarnings("unchecked")
protected static <T> List<T> makeList(T... objects)
{
List<T> result = new ArrayList<T>();
@@ -124,7 +123,7 @@
}
catch (Exception e)
{
- checkThrowable(IllegalStateException.class, e);
+ checkThrowable(ClassNotFoundException.class, e);
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -124,6 +124,7 @@
private class RenamingDeploymentContext extends AbstractDeploymentContext
{
+ @SuppressWarnings("unused")
public RenamingDeploymentContext()
{
}
@@ -142,6 +143,7 @@
private class RenamingDeploymentUnit extends AbstractDeploymentUnit
{
+ @SuppressWarnings("unused")
public RenamingDeploymentUnit()
{
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -30,10 +30,10 @@
/**
* MockExtendedDeploymentVisitor
*
- * A mock implementation of {@link ExtendedDeploymentVisitor}, to be used in testing
+ * A mock implementation of {@link DeploymentVisitor}, to be used in testing
* the {@link org.jboss.deployers.spi.deployer.helpers.ExactAttachmentDeployerWithVisitor}
*
- *
+ * @param <T> the type
* @author Jaikiran Pai
* @version $Revision: $
*/
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -59,7 +59,7 @@
}
/**
- * Tests that the {@link org.jboss.deployers.spi.deployer.helpers.ExactAttachmentDeployerWithVisitor} works correctly with an {@link ExtendedDeploymentVisitor}
+ * Tests that the {@link org.jboss.deployers.spi.deployer.helpers.ExactAttachmentDeployerWithVisitor} works correctly with an {@link DeploymentVisitor}
* when the unit being processed contains the expected attachment
*
* @throws Exception for any error
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -1237,7 +1237,7 @@
main.process();
}
- /**
+ /*
* Tests algorithm performance on complete oriented graph.
* All dependencies are specified using inputs/outputs.
*/
@@ -1293,7 +1293,7 @@
}
}
- /**
+ /*
* Tests algorithm performance on complete oriented graph
* where vertex in this graph is represented as set of deployers.
* Deployers that are in specific vertex are ordered using deployer ordering feature.
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -70,7 +70,6 @@
public static List<String> CAB = makeList("A/C", "A", "B");
public static List<String> BCA = makeList("B", "A/C", "A");
- @SuppressWarnings("unchecked")
private static <T> List<T> makeList(T... objects)
{
List<T> result = new ArrayList<T>();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -59,7 +59,6 @@
private static List<String> C2C1P = makeList(C2, C1, P);
private static List<String> C1C2P = makeList(C1, C2, P);
- @SuppressWarnings("unchecked")
private static <T> List<T> makeList(T... objects)
{
List<T> result = new ArrayList<T>();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -113,7 +113,6 @@
private static TestComponentMetaDataContainer child1md = new TestComponentMetaDataContainer(child1md1, child1md2);
private static TestComponentMetaDataContainer child2md = new TestComponentMetaDataContainer(child2md1, child2md2);
- @SuppressWarnings("unchecked")
private static <T> List<T> makeList(T... objects)
{
List<T> result = new ArrayList<T>();
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -26,6 +26,9 @@
*/
public class ComplexException extends SimpleException
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public ComplexException(String message, Throwable cause)
{
super(message, cause);
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -29,6 +29,9 @@
*/
public class SimpleException extends Exception
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public static final Set<Object> failures = new HashSet<Object>();
public SimpleException(String message, Throwable cause)
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -121,7 +121,6 @@
* @param mo
* @param md -
*/
- @SuppressWarnings("unchecked")
protected void processManagedObject(ManagedObject mo, ManagedDeployment md)
{
String key = mo.getName() + "/" + mo.getNameType();
@@ -252,7 +251,6 @@
}
}
- @SuppressWarnings("unchecked")
protected Object getRefName(Object value)
{
if (value instanceof MetaValue)
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -137,7 +137,6 @@
* Validate the ManagedObjectFactory for DSMetaData class
*
*/
- @SuppressWarnings("unchecked")
public void testDSMetaDataManagedObjectFactory()
{
ManagedObjectFactory mof = ManagedObjectFactory.getInstance();
@@ -182,7 +181,6 @@
* Validate the ManagedObjectFactory for DSMetaData instance
*
*/
- @SuppressWarnings("unchecked")
public void testDSMetaDataManagedObjectFactoryInit()
{
ManagedObjectFactory mof = ManagedObjectFactory.getInstance();
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -176,7 +176,6 @@
*
* @param input the input
*/
- @SuppressWarnings("unchecked")
public void setInput(Class<?> input)
{
addInput(input);
@@ -193,7 +192,6 @@
*
* @param output the outputs
*/
- @SuppressWarnings("unchecked")
public void setOutput(Class<?> output)
{
addOutput(output);
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -41,6 +41,7 @@
* {@link #setStage(org.jboss.deployers.spi.deployer.DeploymentStage)} during the construction of the
* deployer
*
+ * @param <T> the attachement type
* @author Jaikiran Pai
* @author Ales Justin
* @version $Revision: $
Modified: projects/jboss-deployers/trunk/deployers-vfs/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/pom.xml 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/pom.xml 2010-01-21 15:10:47 UTC (rev 99753)
@@ -102,6 +102,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-core</artifactId>
<exclusions>
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -31,7 +31,7 @@
/**
* Compares two KernelControllerContextCreators' relative orders
* @param o1 The first KernelContextCreator
- * @param o1 The second KernelContextCreator
+ * @param o2 The second KernelContextCreator
* @return An integer as per the {@link Comparator#compare(Object, Object)} contract
*/
public int compare(BeanMetaDataDeployerPlugin o1, BeanMetaDataDeployerPlugin o2)
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -32,6 +32,7 @@
import javassist.NotFoundException;
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.util.collection.SoftValueHashMap;
import org.jboss.virtual.VirtualFile;
@@ -47,7 +48,7 @@
@SuppressWarnings("unchecked")
private Map<String, VirtualFile> cache = Collections.synchronizedMap(new SoftValueHashMap());
/** By default exclude jdk classes */
- private ClassFilter excludeFilter = ClassFilter.JAVA_ONLY;
+ private ClassFilter excludeFilter = ClassFilterUtils.JAVA_ONLY;
public DeploymentUnitClassPath(VFSDeploymentUnit unit)
{
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -31,6 +31,7 @@
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData10;
import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
import org.jboss.dependency.spi.ControllerState;
@@ -63,6 +64,9 @@
// TODO add a negating class filter to jboss-classloader
ClassFilter classFilter = new ClassFilter()
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
String packageName = BootstrapDeployersTest.class.getPackage().getName();
String packagePath = ClassLoaderUtils.packageNameToPath(BootstrapDeployersTest.class.getName());
ClassFilter patternFilter = new PatternClassFilter(
@@ -91,7 +95,7 @@
}
};
- parentPolicy = new ParentPolicy(classFilter, ClassFilter.NOTHING, "BEFORE");
+ parentPolicy = new ParentPolicy(classFilter, ClassFilterUtils.NOTHING, "BEFORE");
}
public BootstrapDeployersTestDelegate(Class<?> clazz) throws Exception
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-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -24,12 +24,11 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.jboss.test.deployers.vfs.annotations.AnnotationScanningTestSuite;
import org.jboss.test.deployers.vfs.classloader.ClassLoaderTestSuite;
-import org.jboss.test.deployers.vfs.reflect.ReflectTestSuite;
import org.jboss.test.deployers.vfs.dependency.DependencyTestSuite;
import org.jboss.test.deployers.vfs.deployer.bean.BeanDeployerTestSuite;
-import org.jboss.test.deployers.vfs.deployer.bean.test.BeanMetaDataDeployerPluginTestCase;
import org.jboss.test.deployers.vfs.deployer.facelets.FaceletsTestSuite;
import org.jboss.test.deployers.vfs.deployer.jaxp.JAXPDeployerTestSuite;
import org.jboss.test.deployers.vfs.deployer.merge.MergeDeployerTestSuite;
@@ -42,6 +41,7 @@
import org.jboss.test.deployers.vfs.metadata.VFSMetaDataTestSuite;
import org.jboss.test.deployers.vfs.parsing.test.ParsingTestSuite;
import org.jboss.test.deployers.vfs.redeploy.RedeployTestSuite;
+import org.jboss.test.deployers.vfs.reflect.ReflectTestSuite;
import org.jboss.test.deployers.vfs.structure.VFSStructureTestSuite;
import org.jboss.test.deployers.vfs.structurebuilder.VFSStructureBuilderTestSuite;
import org.jboss.test.deployers.vfs.structureprocessor.VFSStructureProcessorTestSuite;
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -27,6 +27,7 @@
import junit.framework.Test;
+import org.jboss.classloader.spi.ShutdownPolicy;
import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ExportAll;
@@ -93,7 +94,7 @@
assertNotNull(mo);
getLog().debug("ManagedObject: " + mo + " properties=" + mo.getProperties());
- List<String> expectedProperties = Arrays.asList("name", "version", "domain", "parentDomain", "topLevelClassLoader", "exportAll", "included", "excluded", "excludedExport", "importAll", "parentFirst", "cache", "blackList", "capabilities", "requirements");
+ List<String> expectedProperties = Arrays.asList("name", "version", "domain", "parentDomain", "topLevelClassLoader", "exportAll", "shutdown", "included", "excluded", "excludedExport", "importAll", "parentFirst", "cache", "blackList", "capabilities", "requirements");
Set<String> actualProperties = mo.getPropertyNames();
for (String expected : expectedProperties)
{
@@ -112,6 +113,7 @@
assertManagedProperty(mo, "parentDomain", String.class, null);
assertManagedProperty(mo, "topLevelClassLoader", boolean.class, false);
assertManagedProperty(mo, "exportAll", ExportAll.class, null);
+ assertManagedProperty(mo, "shutdown", ShutdownPolicy.class, null);
assertManagedProperty(mo, "included", String.class, null);
assertManagedProperty(mo, "excluded", String.class, null);
assertManagedProperty(mo, "excludedExport", String.class, null);
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -77,7 +77,6 @@
public static final List<String> XBAA = makeList(NameB, NameA, NameA);
public static final List<String> XBABA = makeList(NameB, NameA, NameB, NameA);
- @SuppressWarnings("unchecked")
protected static <T> List<T> makeList(T... objects)
{
List<T> result = new ArrayList<T>();
@@ -147,7 +146,7 @@
}
catch (Exception e)
{
- checkThrowable(IllegalStateException.class, e);
+ checkThrowable(ClassNotFoundException.class, e);
}
}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.deployers.vfs.deployer.bean.support;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.dependency.spi.Controller;
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -31,6 +31,7 @@
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.dependency.ClassLoading;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
@@ -94,8 +95,8 @@
ClassLoaderSystem system = new DefaultClassLoaderSystem();
// allow MC annotations, so that both, deployer and tester see the same
ClassFilter mcAnnFilter = new PackageClassFilter(new String[]{"org.jboss.beans.metadata.api.annotations"});
- ClassFilter filter = new CombiningClassFilter(false, new ClassFilter[]{ClassFilter.JAVA_ONLY, mcAnnFilter});
- ParentPolicy policy = new ParentPolicy(filter, ClassFilter.NOTHING);
+ ClassFilter filter = new CombiningClassFilter(false, new ClassFilter[]{ClassFilterUtils.JAVA_ONLY, mcAnnFilter});
+ ParentPolicy policy = new ParentPolicy(filter, ClassFilterUtils.NOTHING);
system.getDefaultDomain().setParentPolicy(policy);
AbstractLevelClassLoaderSystemDeployer clsd = new AbstractLevelClassLoaderSystemDeployer();
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java 2010-01-21 15:10:47 UTC (rev 99753)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.deployers.vfs.metadata.test;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -29,8 +28,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.deployers.spi.structure.MetaDataEntry;
-import org.jboss.deployers.spi.structure.StructureMetaDataFactory;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
import org.jboss.test.deployers.BaseDeployersVFSTest;
import org.jboss.test.deployers.vfs.metadata.support.ServicesFilter;
Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml 2010-01-21 15:05:18 UTC (rev 99752)
+++ projects/jboss-deployers/trunk/pom.xml 2010-01-21 15:10:47 UTC (rev 99753)
@@ -27,7 +27,7 @@
<version.jboss.man>2.1.1.SP1</version.jboss.man>
<version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr>
<version.jboss.kernel>2.2.0.Alpha1</version.jboss.kernel>
- <version.jboss.classloader>2.0.8.GA</version.jboss.classloader>
+ <version.jboss.classloader>2.2.0-SNAPSHOT</version.jboss.classloader>
<version.jboss.classloading.spi>5.1.0.SP1</version.jboss.classloading.spi>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
More information about the jboss-cvs-commits
mailing list