[jboss-cvs] JBossAS SVN: r100373 - in projects/jboss-deployers/branches/vfs3: .settings and 34 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 3 15:07:39 EST 2010
Author: johnbailey
Date: 2010-02-03 15:07:37 -0500 (Wed, 03 Feb 2010)
New Revision: 100373
Added:
projects/jboss-deployers/branches/vfs3/.settings/
projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs
projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs
projects/jboss-deployers/branches/vfs3/build/.settings/
Removed:
projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs
projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-deployers/branches/vfs3/build/.project
projects/jboss-deployers/branches/vfs3/build/pom.xml
projects/jboss-deployers/branches/vfs3/deployers-client/src/test/java/org/jboss/test/deployers/deploymentfactory/AbstractDeploymentFactoryTest.java
projects/jboss-deployers/branches/vfs3/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java
projects/jboss-deployers/branches/vfs3/deployers-impl/.settings/org.eclipse.jdt.core.prefs
projects/jboss-deployers/branches/vfs3/deployers-impl/pom.xml
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java
projects/jboss-deployers/branches/vfs3/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/pom.xml
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java
projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java
projects/jboss-deployers/branches/vfs3/pom.xml
Log:
Merged changes from trunk -r 99214:100352
Copied: projects/jboss-deployers/branches/vfs3/.settings (from rev 100352, projects/jboss-deployers/trunk/.settings)
Deleted: projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-deployers/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-03 16:04:57 UTC (rev 100352)
+++ projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs 2010-02-03 20:07:37 UTC (rev 100373)
@@ -1,5 +0,0 @@
-#Thu Jan 28 17:47:18 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Copied: projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs (from rev 100352, projects/jboss-deployers/trunk/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-deployers/branches/vfs3/.settings/org.eclipse.jdt.core.prefs 2010-02-03 20:07:37 UTC (rev 100373)
@@ -0,0 +1,5 @@
+#Thu Jan 28 17:47:18 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Deleted: projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-deployers/trunk/.settings/org.maven.ide.eclipse.prefs 2010-02-03 16:04:57 UTC (rev 100352)
+++ projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs 2010-02-03 20:07:37 UTC (rev 100373)
@@ -1,9 +0,0 @@
-#Thu Jan 28 17:46:35 CET 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
Copied: projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs (from rev 100352, projects/jboss-deployers/trunk/.settings/org.maven.ide.eclipse.prefs)
===================================================================
--- projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-deployers/branches/vfs3/.settings/org.maven.ide.eclipse.prefs 2010-02-03 20:07:37 UTC (rev 100373)
@@ -0,0 +1,9 @@
+#Thu Jan 28 17:46:35 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-deployers/branches/vfs3/build/.project
===================================================================
--- projects/jboss-deployers/branches/vfs3/build/.project 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/build/.project 2010-02-03 20:07:37 UTC (rev 100373)
@@ -1,11 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>build</name>
+ <name>jboss-deployers</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Copied: projects/jboss-deployers/branches/vfs3/build/.settings (from rev 100352, projects/jboss-deployers/trunk/build/.settings)
Modified: projects/jboss-deployers/branches/vfs3/build/pom.xml
===================================================================
--- projects/jboss-deployers/branches/vfs3/build/pom.xml 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/build/pom.xml 2010-02-03 20:07:37 UTC (rev 100373)
@@ -13,34 +13,34 @@
<description> The JBoss Deployment Distribution Build. </description>
<profiles>
- <profile>
- <id>dist</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>jboss-deployers-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/dist-with-deps.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profile>
+ <id>dist</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>jboss-deployers-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/dist-with-deps.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
Modified: projects/jboss-deployers/branches/vfs3/deployers-client/src/test/java/org/jboss/test/deployers/deploymentfactory/AbstractDeploymentFactoryTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-client/src/test/java/org/jboss/test/deployers/deploymentfactory/AbstractDeploymentFactoryTest.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-client/src/test/java/org/jboss/test/deployers/deploymentfactory/AbstractDeploymentFactoryTest.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -126,18 +126,16 @@
public void testCreateClassPathEntryPath()
{
- DeploymentFactory factory = createDeploymentFactory();
- ClassPathEntry entry = factory.createClassPathEntry("path");
+ ClassPathEntry entry = DeploymentFactory.createClassPathEntry("path");
assertEquals("path", entry.getPath());
assertNull(entry.getSuffixes());
}
public void testCreateClassPathEntryPathErrors()
{
- DeploymentFactory factory = createDeploymentFactory();
try
{
- factory.createClassPathEntry(null);
+ DeploymentFactory.createClassPathEntry(null);
fail("Should not be here!");
}
catch (Exception e)
@@ -148,22 +146,20 @@
public void testCreateClassPathEntryPathAndSuffixes()
{
- DeploymentFactory factory = createDeploymentFactory();
- ClassPathEntry entry = factory.createClassPathEntry("path", "suffixes");
+ ClassPathEntry entry = DeploymentFactory.createClassPathEntry("path", "suffixes");
assertEquals("path", entry.getPath());
assertEquals("suffixes", entry.getSuffixes());
- entry = factory.createClassPathEntry("path", null);
+ entry = DeploymentFactory.createClassPathEntry("path", null);
assertEquals("path", entry.getPath());
assertNull(entry.getSuffixes());
}
public void testCreateClassPathEntryPathAndSuffixesErrors()
{
- DeploymentFactory factory = createDeploymentFactory();
try
{
- factory.createClassPathEntry(null, "suffixes");
+ DeploymentFactory.createClassPathEntry(null, "suffixes");
fail("Should not be here!");
}
catch (Exception e)
@@ -174,18 +170,16 @@
public void testCreateClassPathPath()
{
- DeploymentFactory factory = createDeploymentFactory();
- List<ClassPathEntry> expected = Collections.singletonList(factory.createClassPathEntry("path"));
- List<ClassPathEntry> classPath = factory.createClassPath("path");
+ List<ClassPathEntry> expected = Collections.singletonList(DeploymentFactory.createClassPathEntry("path"));
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("path");
assertEquals(expected, classPath);
}
public void testCreateClassPathPathErrors()
{
- DeploymentFactory factory = createDeploymentFactory();
try
{
- factory.createClassPath(null);
+ DeploymentFactory.createClassPath(null);
fail("Should not be here!");
}
catch (Exception e)
@@ -196,18 +190,16 @@
public void testCreateClassPathPathAndSuffixes()
{
- DeploymentFactory factory = createDeploymentFactory();
- List<ClassPathEntry> expected = Collections.singletonList(factory.createClassPathEntry("path", "suffixes"));
- List<ClassPathEntry> classPath = factory.createClassPath("path", "suffixes");
+ List<ClassPathEntry> expected = Collections.singletonList(DeploymentFactory.createClassPathEntry("path", "suffixes"));
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("path", "suffixes");
assertEquals(expected, classPath);
}
public void testCreateClassPathPathAndSuffixesErrors()
{
- DeploymentFactory factory = createDeploymentFactory();
try
{
- factory.createClassPath(null, "suffixes");
+ DeploymentFactory.createClassPath(null, "suffixes");
fail("Should not be here!");
}
catch (Exception e)
@@ -255,7 +247,7 @@
{
DeploymentFactory factory = createDeploymentFactory();
Deployment deployment = createDeployment();
- List<ClassPathEntry> classPath = factory.createClassPath("ClassPath");
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("ClassPath");
ContextInfo context = factory.addContext(deployment, "path", classPath);
assertEquals("path", context.getPath());
assertDefaultMetaDataPath(context);
@@ -277,7 +269,7 @@
{
DeploymentFactory factory = createDeploymentFactory();
Deployment deployment = createDeployment();
- List<ClassPathEntry> classPath = factory.createClassPath("ClassPath");
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("ClassPath");
try
{
factory.addContext(null, "path", classPath);
@@ -302,7 +294,7 @@
{
DeploymentFactory factory = createDeploymentFactory();
Deployment deployment = createDeployment();
- List<ClassPathEntry> classPath = factory.createClassPath("ClassPath");
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("ClassPath");
ContextInfo context = factory.addContext(deployment, "path", "metaDataPath", classPath);
assertEquals("path", context.getPath());
assertDefaultMetaDataPath(context.getMetaDataPath());
@@ -324,7 +316,7 @@
{
DeploymentFactory factory = createDeploymentFactory();
Deployment deployment = createDeployment();
- List<ClassPathEntry> classPath = factory.createClassPath("ClassPath");
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("ClassPath");
try
{
factory.addContext(null, "path", "metaData", classPath);
@@ -405,7 +397,7 @@
DeploymentFactory factory = createDeploymentFactory();
Deployment deployment = createDeployment();
- List<ClassPathEntry> classPath = factory.createClassPath("ClassPath");
+ List<ClassPathEntry> classPath = DeploymentFactory.createClassPath("ClassPath");
ContextInfo context1 = factory.addContext(deployment, "path1", "metaDataPath", classPath);
assertEquals("path1", context1.getPath());
assertDefaultMetaDataPath(context1.getMetaDataPath());
Modified: projects/jboss-deployers/branches/vfs3/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/MetaDataEntryImpl.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/.settings/org.eclipse.jdt.core.prefs 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/.settings/org.eclipse.jdt.core.prefs 2010-02-03 20:07:37 UTC (rev 100373)
@@ -1,5 +1,6 @@
-#Fri Sep 21 17:50:11 BST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+#Fri Jan 29 18:38:17 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/pom.xml
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/pom.xml 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/pom.xml 2010-02-03 20:07:37 UTC (rev 100373)
@@ -48,12 +48,12 @@
<phase>test</phase>
<configuration>
<tasks unless="maven.test.skip">
- <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}"/>
- <property name="report.dir" value="${project.build.directory}/surefire-reports"/>
- <property name="testOutputDirectory" value="${project.build.testOutputDirectory}"/>
+ <property name="byteman.path" value="${maven.dependency.org.jboss.byteman.byteman.jar.path}" />
+ <property name="report.dir" value="${project.build.directory}/surefire-reports" />
+ <property name="testOutputDirectory" value="${project.build.testOutputDirectory}" />
- <ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
- <target name="asynchronous-tests"/>
+ <ant antfile="${project.build.testOutputDirectory}/build.xml" inheritrefs="true">
+ <target name="asynchronous-tests" />
</ant>
</tasks>
</configuration>
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractClassLoaderDescribeDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -32,8 +32,13 @@
/**
* AbstractClassLoaderDescribeDeployer.
+ *
+ * This deployer creates Module instance from ClassLoadingMetaData.
+ * For non top level deployments we only create Module if there is
+ * an explicit ClassLoadingMetaData attachment present.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractClassLoaderDescribeDeployer extends AbstractOptionalRealDeployer<ClassLoadingMetaData>
@@ -48,6 +53,7 @@
{
super(ClassLoadingMetaData.class);
setStage(DeploymentStages.DESCRIBE);
+ addInput(Module.class); // we check for Module
addOutput(Module.class); // we produce Module
}
@@ -84,12 +90,17 @@
public void deploy(DeploymentUnit unit, ClassLoadingMetaData deployment) throws DeploymentException
{
+ // Do nothing if another deployer has already created the module
+ ClassLoaderPolicyModule module = unit.getAttachment(Module.class.getName(), ClassLoaderPolicyModule.class);
+ if (module != null)
+ return;
+
// We only look at non top level deployments that have classloading metadata
if (unit.isTopLevel() == false)
{
if (deployment == null)
return;
-
+
// For non top level classloaders, we need to control the domain
// since the parent is the deployment classloader
String unitName = unit.getName();
@@ -98,21 +109,21 @@
if (deployment.getParentDomain() == null)
{
deployment.setDomain(unitName);
- log.debug("Will use synthetic domain for classloader of subdeployment: " + unitName);
+ log.debugf("Will use synthetic domain for classloader of subdeployment: %1s", unitName);
}
else
{
- log.debug("Will create top level classloader for subdeployment: " + unitName);
+ log.debugf("Will create top level classloader for subdeployment: %1s", unitName);
}
}
else
{
- log.debug("Asked to create top level classloader for subdeployment: " + unitName);
+ log.debugf("Asked to create top level classloader for subdeployment: %1s", unitName);
}
}
-
+
// Create the module
- ClassLoaderPolicyModule module = createModule(unit, deployment);
+ module = createModule(unit, deployment);
if (module != null)
{
classLoading.addModule(module);
@@ -123,10 +134,9 @@
public void undeploy(DeploymentUnit unit, ClassLoadingMetaData deployment)
{
Module module = unit.removeAttachment(Module.class);
- if (module == null)
- return;
- classLoading.removeModule(module);
+ if (module != null && classLoading != null)
+ classLoading.removeModule(module);
}
-
+
protected abstract ClassLoaderPolicyModule createModule(DeploymentUnit unit, ClassLoadingMetaData metaData) throws DeploymentException;
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -85,7 +85,7 @@
if (contextName.equals(context.getName()) == false)
{
Set<Object> aliases = context.getAliases();
- if (aliases == null || (aliases != null && aliases.contains(contextName) == false))
+ if (aliases == null || (aliases.contains(contextName) == false))
{
Controller controller = context.getController();
if (addAlias)
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployerWrapper.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -181,7 +181,7 @@
}
catch (Throwable t)
{
- log.debug("Error during deploy: " + unit.getName(), t);
+ log.debugf(t, "Error during deploy: %1s", unit.getName());
throw DeploymentException.rethrowAsDeploymentException("Error during deploy: " + unit.getName(), t);
}
finally
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -362,7 +362,8 @@
String stageName = stage.getName();
deployersByStage.removeDeployer(stageName, wrapper);
- log.debug("Removed deployer " + deployer + " from stage " + stageName);
+ if (isTraceAddDeployer())
+ log.trace("Removed deployer " + deployer + " from stage " + stageName);
}
/**
@@ -408,7 +409,8 @@
controller.addState(ControllerState.newState(stageName), preceeds);
stages.put(stageName, stage);
- log.debug("Added stage " + stageName + " before " + preceeds);
+ if (log.isTraceEnabled())
+ log.trace("Added stage " + stageName + " before " + preceeds);
}
/**
@@ -504,7 +506,8 @@
public void setMgtObjectCreator(ManagedObjectCreator mgtObjectCreator)
{
this.mgtObjectCreator = mgtObjectCreator;
- log.debug("setMgtObjectCreator, " + mgtObjectCreator);
+ if (log.isTraceEnabled())
+ log.trace("setMgtObjectCreator, " + mgtObjectCreator);
}
/**
@@ -782,11 +785,11 @@
DeploymentContext context = undeploy.get(i);
if (DeploymentState.ERROR.equals(context.getState()) == false)
context.setState(DeploymentState.UNDEPLOYING);
- log.debug("Undeploying " + context.getName());
+ log.debugf("Undeploying %1s", context.getName());
DeploymentControllerContext deploymentControllerContext = context.getTransientAttachments().getAttachment(ControllerContext.class.getName(), DeploymentControllerContext.class);
if (deploymentControllerContext == null)
{
- log.debug("DeploymentContext has no DeploymentControllerContext during undeploy request, ignoring: " + context);
+ log.debugf("DeploymentContext has no DeploymentControllerContext during undeploy request, ignoring: %1s", context);
}
else
{
@@ -839,7 +842,7 @@
unregisterMBean(context);
removeClassLoader(context);
cleanup(context);
- log.debug("Fully Undeployed " + context.getName());
+ log.debugf("Fully Undeployed %1s", context.getName());
}
catch (Throwable t)
{
@@ -864,7 +867,7 @@
{
controller.install(deploymentControllerContext);
context.setState(DeploymentState.DEPLOYING);
- log.debug("Deploying " + context.getName());
+ log.debugf("Deploying %1s", context.getName());
if (scopeBuilder != null)
context.getTransientAttachments().addAttachment(ScopeBuilder.class, scopeBuilder);
if (repository != null)
@@ -1348,7 +1351,7 @@
{
if (ControllerState.INSTALLED.equals(toState) && DeploymentState.DEPLOYING.equals(deploymentContext.getState()))
{
- log.debug("Fully Deployed " + context.getName());
+ log.debugf("Fully Deployed %1s", context.getName());
setState(deploymentContext, DeploymentState.DEPLOYED, null);
}
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/main/MainDeployerImpl.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -357,7 +357,7 @@
throw new DeploymentException("The main deployer is shutdown");
String name = deployment.getName();
- log.debug("Add deployment: " + name);
+ log.debugf("Add deployment: %1s", name);
// only try to recognize non re-deployments
if (checkExistingTopLevelDeployment(deployment, addToDeploy) == false)
@@ -385,7 +385,7 @@
DeploymentContext previous = topLevelDeployments.get(name);
if (previous != null)
{
- log.debug("Removing previous deployment: " + previous.getName());
+ log.debugf("Removing previous deployment: %1s", previous.getName());
toRedeploy.put(name, deployment);
return true;
}
@@ -482,7 +482,7 @@
if (shutdown.get())
throw new IllegalStateException("The main deployer is shutdown");
- log.debug("Remove deployment context: " + name);
+ log.debugf("Remove deployment context: %1s", name);
DeploymentContext context = topLevelDeployments.remove(name);
if (context == null)
@@ -521,7 +521,7 @@
Deployment deployment = deployments[i];
addDeployment(deployment, false);
DeploymentContext context = getTopLevelDeploymentContext(deployment.getName());
- if (contexts == null)
+ if (context == null)
throw new DeploymentException("Deployment context not found: " + deployment.getName());
deployers.process(Collections.singletonList(context), null);
@@ -1001,12 +1001,12 @@
allDeployments.put(context.getName(), context);
if (context.getState() == DeploymentState.ERROR)
{
- log.debug("Not scheduling addition of context already in error: " + context.getName() + " reason=" + context.getProblem());
+ log.debugf("Not scheduling addition of context already in error: %1s, reason= %2s", context.getName(), context.getProblem());
return;
}
context.setState(DeploymentState.DEPLOYING);
DeploymentContext parent = context.getParent();
- log.debug("Scheduling deployment: " + context.getName() + " parent=" + parent);
+ log.debugf("Scheduling deployment: %1s, parent=%2s", context.getName(), parent);
// Process the top level only
if (context.isTopLevel() && addToDeploy)
@@ -1036,7 +1036,7 @@
if (DeploymentState.ERROR.equals(context.getState()) == false)
context.setState(DeploymentState.UNDEPLOYING);
DeploymentContext parent = context.getParent();
- log.debug("Scheduling undeployment: " + name + " parent=" + parent);
+ log.debugf("Scheduling undeployment: %1s, parent=%2s", name, parent);
// Process the top level only
if (context.isTopLevel() && addToUndeploy)
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/KahnDeployerSorter.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -253,6 +253,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/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/SortedDeployers.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -133,7 +133,6 @@
}
}
- @SuppressWarnings("unchecked")
public void testSimpleClassUsage() throws Exception
{
DeployerClient deployer = getMainDeployer();
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/annotations/test/AnnotationsTest.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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.dependency.policy.mock.MockClassLoadingMetaData;
@@ -170,8 +171,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[]{JavaOnlyClassFilter.INSTANCE, javassistFilter});
- ParentPolicy parentPolicy = new ParentPolicy(before, NothingClassFilter.INSTANCE);
+ 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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/asynchronous/support/TestControllerContext.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/support/MockExtendedDeploymentVisitor.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/helpers/test/ExactAttachmentDeployerWithVisitorTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/AbstractDeployerFlowUnitTest.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -21,6 +21,9 @@
*/
package org.jboss.test.deployers.deployer.test;
+import java.util.LinkedList;
+import java.util.List;
+
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.plugins.deployers.DeployersImpl;
@@ -1233,7 +1236,140 @@
main.removeDeployment(deployment);
main.process();
}
+
+ /*
+ * Tests algorithm performance on complete oriented graph.
+ * All dependencies are specified using inputs/outputs.
+ */
+ public void testAlgorithmPerformance() throws Exception
+ {
+
+ DeployerClient main = createMainDeployer();
+ TestFlowDeployer deployer;
+ final int COUNT_OF_DEPLOYERS = 500;
+ List<TestFlowDeployer> deployers = new LinkedList<TestFlowDeployer>();
+
+ for (int i = 0; i < COUNT_OF_DEPLOYERS; i++)
+ {
+ deployer = new TestFlowDeployer( String.valueOf(i) );
+ deployer.setOutputs( String.valueOf(i) );
+ for (int j = 0; j < i; j++) deployer.addInput( String.valueOf(j) );
+ deployers.add(deployer);
+ }
+
+ long start = System.currentTimeMillis();
+ for (TestFlowDeployer d : deployers)
+ {
+ addDeployer(main, d);
+ }
+ long end = System.currentTimeMillis();
+
+ System.out.println("------------------------------------------------------------------------");
+ System.out.println("Exhaustive deployer sorting 1 (" + getClass().getSimpleName() + ") took: " + (end - start) + " milliseconds");
+ System.out.println("------------------------------------------------------------------------");
+
+ // test proper deployers order
+ Deployment deployment = createSimpleDeployment( "exhaustiveDeployersOrderTest" );
+
+ main.addDeployment(deployment);
+ main.process();
+
+ for (int i = 0; i < COUNT_OF_DEPLOYERS; i++)
+ {
+ deployer = deployers.get(i);
+ assertEquals(i + 1, deployer.getDeployOrder());
+ assertEquals(-1, deployer.getUndeployOrder());
+ }
+
+ main.removeDeployment(deployment);
+ main.process();
+
+ for (int i = 0; i < COUNT_OF_DEPLOYERS; i++)
+ {
+ deployer = deployers.get(i);
+ assertEquals(i + 1, deployer.getDeployOrder());
+ assertEquals(2*COUNT_OF_DEPLOYERS - i, deployer.getUndeployOrder());
+ }
+ }
+
+ /*
+ * 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.
+ */
+ public void testAlgorithmPerformance2() throws Exception
+ {
+ DeployerClient main = createMainDeployer();
+ TestFlowDeployer deployer;
+ final int COUNT_OF_DEPLOYERS = 1000;
+ final int MODULO = 50; // count of deployers in particular vertex
+
+ List<TestFlowDeployer> deployers = new LinkedList<TestFlowDeployer>();
+
+ for (int i = 0; i < COUNT_OF_DEPLOYERS; i++)
+ {
+ deployer = new TestFlowDeployer( String.valueOf(i) );
+ deployer.setOutputs( String.valueOf(i / MODULO) );
+ deployer.setRelativeOrder(i % MODULO);
+ for (int j = 0; j < i/MODULO; j++)
+ deployer.addInput( String.valueOf(j) );
+
+ deployers.add(deployer);
+ }
+
+ long start = System.currentTimeMillis();
+ for (TestFlowDeployer d : deployers)
+ {
+ addDeployer(main, d);
+ }
+ long end = System.currentTimeMillis();
+
+ System.out.println("------------------------------------------------------------------------");
+ System.out.println("Exhaustive deployer sorting 2 (" + getClass().getSimpleName() + ") took: " + (end - start) + " milliseconds");
+ System.out.println("------------------------------------------------------------------------");
+
+ // test proper deployers order
+ Deployment deployment = createSimpleDeployment( "exhaustiveDeployersOrderTest" );
+
+ main.addDeployment(deployment);
+ main.process();
+
+ int deployerDeployOrder;
+ int deployerUndeployOrder;
+ int deployerDeployOrderInModulo;
+ int deployerUndeployOrderInModulo;
+ int level;
+ for (int i = 0; i < COUNT_OF_DEPLOYERS; i++)
+ {
+ level = i / MODULO;
+ deployer = deployers.get(i);
+ deployerDeployOrder = deployer.getDeployOrder();
+ deployerDeployOrderInModulo = (deployerDeployOrder - 1) / MODULO;
+ deployerUndeployOrder = deployer.getUndeployOrder();
+ assertTrue("Wrong deployer(" + i + ") deploy order: " + deployerDeployOrder, level <= deployerDeployOrderInModulo && deployerDeployOrderInModulo < (level + 1));
+ assertEquals(i + 1, deployerDeployOrder); // remove if [JBDEPLOY-233] will be fixed
+ assertEquals(-1, deployerUndeployOrder);
+ }
+
+ main.removeDeployment(deployment);
+ main.process();
+
+ for (int i = 0; i < COUNT_OF_DEPLOYERS; i++)
+ {
+ level = i / MODULO;
+ deployer = deployers.get(i);
+ deployerDeployOrder = deployer.getDeployOrder();
+ deployerDeployOrderInModulo = (deployerDeployOrder - 1) / MODULO;
+ deployerUndeployOrder = deployer.getUndeployOrder();
+ deployerUndeployOrderInModulo = (deployerUndeployOrder - 1) / MODULO;
+ assertTrue("Wrong deployer(" + i + ") deploy order: " + deployerDeployOrder, level <= deployerDeployOrderInModulo && deployerDeployOrderInModulo < (level + 1));
+ assertEquals(i + 1, deployer.getDeployOrder()); // remove if [JBDEPLOY-233] will be fixed
+ assertTrue("Wrong deployer(" + i + ") undeploy order: " + deployerUndeployOrder, (2 * COUNT_OF_DEPLOYERS - level) >= deployerUndeployOrderInModulo && deployerUndeployOrderInModulo < (2 * COUNT_OF_DEPLOYERS - (level + 1)));
+ assertEquals(2 * COUNT_OF_DEPLOYERS - i, deployer.getUndeployOrder()); // remove if [JBDEPLOY-233] will be fixed
+ }
+ }
+
public void testRealWorldAS6DeployersScenario() throws Exception
{
// THIS IS REAL WORLD SCENARIO - AS deployers with their dependencies
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DeployerDependencyUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicDeploymentRelativeOrderUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/HeuristicRussionDollUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/ComplexException.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/exceptions/support/SimpleException.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/MockProfileService.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestManagedObjectDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -41,7 +41,7 @@
*/
public class TestManagedObjectDeployer extends AbstractDeployer implements ManagedObjectCreator
{
- public static TestAttachment lastAttachment;
+ public TestAttachment lastAttachment;
public void deploy(DeploymentUnit unit) throws DeploymentException
{
Modified: projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -115,7 +115,7 @@
Element config = parsed.getConfig();
if (config == null)
{
- log.debug("Service deployment has no services: " + parsed.getName());
+ log.debugf("Service deployment has no services: %1s", parsed.getName());
return parsed;
}
if (log.isDebugEnabled())
@@ -152,7 +152,7 @@
String codebase = path.getCodeBase();
String archives = path.getArchives();
- log.debug("Processing classpath: " + unit.getName() + " codebase=" + codebase + " archives=" + archives);
+ log.debugf("Processing classpath: %1s codebase=%2s archives=%3s", unit.getName(), codebase, archives);
VirtualFile codebaseFile = unit.getRoot();
if (".".equals(codebase) == false)
{
@@ -168,7 +168,7 @@
if (archives == null)
{
classpath.add(codebaseFile);
- log.debug("Using codebase as classpath: " + unit.getName());
+ log.debugf("Using codebase as classpath: %1s", unit.getName());
}
else
{
Modified: projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/ServiceDeploymentDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -90,7 +90,7 @@
Element config = deployment.getConfig();
if (config == null)
{
- log.debug("Service deployment has no services: " + deployment.getName());
+ log.debugf("Service deployment has no services: %1s", deployment.getName());
return;
}
if (log.isDebugEnabled())
Modified: projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -102,7 +102,7 @@
Class<?> originalClass = moClass;
ManagementObjectClass moc = (ManagementObjectClass)sam.getAnnotationInstance(loader);
moClass = moc.code();
- log.debug("Using alternate class '" + moClass + "' for class " + originalClass);
+ log.debugf("Using alternate class '%1s' for class %2s", moClass, originalClass);
break;
}
}
@@ -169,12 +169,12 @@
}
catch(Exception e2)
{
- log.debug("Failed to get value from mbean for: "+attribute, e2);
+ log.debugf(e2, "Failed to get value from mbean for: %1s", attribute);
}
}
catch(Exception e)
{
- log.debug("Failed to get value from mbean for: "+name, e);
+ log.debugf(e, "Failed to get value from mbean for: %1s", name);
}
}
@@ -198,8 +198,7 @@
}
catch(Exception e)
{
- log.debug("Failed to get property value for bean: "+beanInfo.getName()
- +", property: "+propertyInfo.getName(), e);
+ log.debugf(e, "Failed to get property value for bean: %1s, property: %2s", beanInfo.getName(), propertyInfo.getName());
mvalue = metaValueFactory.create(null, propertyInfo.getType());
return mvalue;
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/ExactAttachmentDeployerWithVisitor.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -550,7 +550,7 @@
public void setClassLoader(ClassLoader classLoader)
{
this.classLoader = classLoader;
- if (classLoader != null)
+ if (classLoader != null && log.isTraceEnabled())
log.trace("ClassLoader for " + name + " is " + classLoader);
}
@@ -723,7 +723,8 @@
components.add(component);
if (server != null)
registerMBeans(component, true, true);
- log.debug("Added component " + component.getName() + " to " + getName());
+ if (log.isTraceEnabled())
+ log.trace("Added component " + component.getName() + " to " + getName());
}
public boolean removeComponent(DeploymentContext component)
@@ -738,8 +739,8 @@
log.warn("Removing component " + name + " which still has components " + componentComponents);
boolean result = components.remove(component);
component.cleanup();
- if (result)
- log.debug("Removed component " + component.getName() + " from " + getName());
+ if (result && log.isTraceEnabled())
+ log.trace("Removed component " + component.getName() + " from " + getName());
return result;
}
@@ -1067,7 +1068,8 @@
}
catch (Exception e)
{
- log.trace("Unable to unregister deployment mbean " + context.getName(), e);
+ if (log.isTraceEnabled())
+ log.trace("Unable to unregister deployment mbean " + context.getName(), e);
}
}
if (unregisterSubDeployments)
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/pom.xml
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/pom.xml 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/pom.xml 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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>
@@ -293,6 +297,32 @@
<groupId>org.jboss.classpool</groupId>
<artifactId>jboss-classpool-jbosscl</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -167,7 +167,7 @@
}
catch (Exception e)
{
- log.debug("Unable to retrieve classloader for deployment: " + unit.getName() + " reason=" + e.toString());
+ log.debugf("Unable to retrieve classloader for deployment: %1s reason=%2s", unit.getName(), e);
}
}
KernelControllerContext context = createControllerContext(unit, deployment);
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/KernelControllerContextComparator.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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.vfs.VirtualFile;
@@ -48,7 +49,7 @@
@SuppressWarnings("unchecked")
private Map<String, VirtualFile> cache = Collections.synchronizedMap(new SoftValueHashMap());
/** By default exclude jdk classes */
- private ClassFilter excludeFilter = JavaOnlyClassFilter.INSTANCE;
+ private ClassFilter excludeFilter = ClassFilterUtils.JAVA_ONLY;
public DeploymentUnitClassPath(VFSDeploymentUnit unit)
{
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -52,7 +52,7 @@
{
ResourceFilter previousRecurse = unit.addAttachment(ResourceFilter.class.getName() + ".recurse", recurse, ResourceFilter.class);
if (previousRecurse != null)
- log.debug("Overridding previous recurse filter: " + previousRecurse);
+ log.debugf("Overridding previous recurse filter: %1s", previousRecurse);
}
// resource
@@ -61,7 +61,7 @@
{
ResourceFilter previousFilter = unit.addAttachment(ResourceFilter.class.getName() + ".resource", filter, ResourceFilter.class);
if (previousFilter != null)
- log.debug("Overridding previous resource filter: " + previousFilter);
+ log.debugf("Overridding previous resource filter: %1s", previousFilter);
}
}
return true;
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContext.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -149,7 +149,7 @@
if (child.exists())
locations.put(child, entry.getType());
else
- log.debug("Meta data path does not exist: root=" + root.getPathName() + " path=" + path);
+ log.debugf("Meta data path does not exist: root=%1s path=%2s", root.getPathName(), path);
}
setMetaDataLocationsMap(locations);
}
@@ -350,7 +350,7 @@
}
catch (Exception e)
{
- log.debug("Error retrieving meta data: filter=" + filter, e);
+ log.debugf(e, "Error retrieving meta data: filter=%1s", filter);
return Collections.emptyList();
}
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructuralDeployersImpl.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -120,7 +120,7 @@
if (deployer == null)
throw new IllegalArgumentException("Null deployer");
structureDeployers.add(new StructureDeployerWrapper(deployer));
- log.debug("Added structure deployer " + deployer);
+ log.debugf("Added structure deployer %1s", deployer);
}
/**
@@ -133,7 +133,7 @@
if (deployer == null)
throw new IllegalArgumentException("Null deployer");
structureDeployers.remove(deployer);
- log.debug("Removed structure deployer " + deployer);
+ log.debugf("Removed structure deployer %1s", deployer);
}
public boolean determineStructure(VirtualFile file, StructureContext parentContext) throws DeploymentException
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -79,7 +79,7 @@
}
catch (Exception e)
{
- log.debug("Exception checking child context (" + child + ") for modification, cause: " + e);
+ log.debugf("Exception checking child context (%1s) for modification, cause: %2s", child, e);
}
}
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTestDelegate.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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;
@@ -64,6 +65,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(
@@ -92,7 +96,7 @@
}
};
- parentPolicy = new ParentPolicy(classFilter, NothingClassFilter.INSTANCE, "BEFORE");
+ parentPolicy = new ParentPolicy(classFilter, ClassFilterUtils.NOTHING, "BEFORE");
}
public BootstrapDeployersTestDelegate(Class<?> clazz) throws Exception
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -24,9 +24,9 @@
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.facelets.FaceletsTestSuite;
@@ -40,6 +40,7 @@
import org.jboss.test.deployers.vfs.matchers.VFSMatchersTestSuite;
import org.jboss.test.deployers.vfs.metadata.VFSMetaDataTestSuite;
import org.jboss.test.deployers.vfs.parsing.test.ParsingTestSuite;
+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/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SpecialBeanMetaDataDeployerPlugin.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanScanningUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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;
@@ -96,8 +97,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[]{JavaOnlyClassFilter.INSTANCE, mcAnnFilter});
- ParentPolicy policy = new ParentPolicy(filter, NothingClassFilter.INSTANCE);
+ 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/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/metadata/test/MetaDataUnitTestCase.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -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/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXBDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -168,7 +168,7 @@
if (file == null)
throw new IllegalArgumentException("Null file");
- log.debug("Parsing: " + file.getName());
+ log.debugf("Parsing: %1s", file.getName());
Unmarshaller unmarshaller = context.createUnmarshaller();
unmarshaller.setEventHandler(validationEventHandler);
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/JAXPDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -203,7 +203,7 @@
if (file == null)
throw new IllegalArgumentException("Null file");
- log.debug("Parsing: " + file.getName());
+ log.debugf("Parsing: %1s", file.getName());
InputSource source = new VFSInputSource(file);
DocumentBuilderFactory factory = getDocumentBuilderFactory();
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/deployer/XSLDeployer.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -113,7 +113,7 @@
StreamSource ss = new StreamSource(is);
ss.setSystemId(xslPath);
templates = tf.newTemplates(ss);
- log.debug("Created templates: " + templates);
+ log.debugf("Created templates: %1s", templates);
}
finally
{
@@ -155,7 +155,7 @@
document = (Document) r.getNode();
String docStr = DOMWriter.printNode(document, true);
- log.debug("Transformed " + file.getPathName() + " into " + docStr);
+ log.debugf("Transformed %1s into %2s", file.getPathName(), docStr);
return parse(unit, file, document);
}
Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/AbstractCandidateStructureVisitor.java 2010-02-03 20:07:37 UTC (rev 100373)
@@ -147,7 +147,7 @@
}
catch (Exception e)
{
- log.debug("Ignoring " + file + " reason=" + e);
+ log.debugf("Ignoring %1s reason=%2s", file, e);
}
}
}
Modified: projects/jboss-deployers/branches/vfs3/pom.xml
===================================================================
--- projects/jboss-deployers/branches/vfs3/pom.xml 2010-02-03 18:48:42 UTC (rev 100372)
+++ projects/jboss-deployers/branches/vfs3/pom.xml 2010-02-03 20:07:37 UTC (rev 100373)
@@ -22,17 +22,17 @@
<properties>
<version.jboss.vfs>3.0.0.CR1-SNAPSHOT</version.jboss.vfs>
- <version.jboss.reflect>2.2.0.Alpha1</version.jboss.reflect>
- <version.jboss.classpool>1.0.0.Alpha1</version.jboss.classpool>
- <version.jboss.man>2.1.1.GA</version.jboss.man>
+ <version.jboss.reflect>2.2.0.Alpha2</version.jboss.reflect>
+ <version.jboss.classpool>1.0.0.Alpha2</version.jboss.classpool>
+ <version.jboss.man>2.1.1.SP1</version.jboss.man>
<version.jboss.mdr>2.2.0-SNAPSHOT</version.jboss.mdr>
- <version.jboss.kernel>2.2.0-SNAPSHOT</version.jboss.kernel>
<version.jboss.classloader>2.2.0-SNAPSHOT</version.jboss.classloader>
+ <version.jboss.kernel>2.2.0.Alpha1</version.jboss.kernel>
<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>
<version.jboss.logging.log4j>2.2.0.CR1</version.jboss.logging.log4j>
- <version.jbossxb>2.0.2.Beta3</version.jbossxb>
+ <version.jbossxb>2.0.2.Beta4</version.jbossxb>
<version.jboss.aop>2.1.0.CR3</version.jboss.aop>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
More information about the jboss-cvs-commits
mailing list