[jboss-cvs] JBossAS SVN: r93307 - in projects/jboss-cl/branches/Branch_2_0: classloading/src/main/java/org/jboss/classloading/plugins/metadata and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 9 06:29:33 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-09-09 06:29:32 -0400 (Wed, 09 Sep 2009)
New Revision: 93307
Modified:
projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java
projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java
Log:
[JBCL-24] Circular and self dependencies
Extended the Capability interface such that it allows capability/requirement matching in the context of both modules
Modified: projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloader/src/test/java/org/jboss/test/classloader/jmx/test/JMXUnitTestCase.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -355,7 +355,6 @@
assertEquals(expectedURLs, urls);
}
- @SuppressWarnings("unchecked")
public void testClassLoaderMBean() throws Exception
{
ClassLoaderSystem system = createClassLoaderSystemWithModifiedBootstrap();
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/ModuleCapability.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -29,6 +29,7 @@
* ModuleCapability.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Thomas.Diesler at jboss.com
* @version $Revision: 1.1 $
*/
public class ModuleCapability extends AbstractCapability
@@ -66,7 +67,7 @@
super(name, version);
}
- public boolean resolves(Module module, Requirement requirement)
+ public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
{
if (requirement instanceof ModuleRequirement == false)
return false;
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/plugins/metadata/PackageCapability.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -33,6 +33,7 @@
* PackageCapability.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Thomas.Diesler at jboss.com
* @version $Revision: 1.1 $
*/
public class PackageCapability extends AbstractCapability implements ExportPackages
@@ -114,7 +115,7 @@
this.splitPolicy = policy;
}
- public boolean resolves(Module module, Requirement requirement)
+ public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
{
if (requirement instanceof PackageRequirement == false)
return false;
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/dependency/Domain.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -35,6 +35,7 @@
*
* @author <a href="adrian at jboss.org">Adrian Brock</a>
* @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ * @author Thomas.Diesler at jboss.com
* @version $Revision: 1.1 $
*/
public class Domain
@@ -252,13 +253,13 @@
{
for (Capability capability : capabilities)
{
- if (capability.resolves(module, requirement))
+ if (capability.resolves(other, module, requirement))
{
if (firstMatch != null)
{
String otherName = other.getName() + ":" + other.getVersion();
String firstName = firstMatch.getName() + ":" + firstMatch.getVersion();
- log.warn("Requirement " + requirement + " resolves agaist " + firstName + " and " + otherName + ". Using first.");
+ log.warn("Requirement " + requirement + " resolves agaist " + firstName + " and " + otherName + " - using first.");
}
if (firstMatch == null)
firstMatch = other;
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/main/java/org/jboss/classloading/spi/metadata/Capability.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -29,6 +29,7 @@
* Capability.
*
* @author <a href="adrian at jboss.org">Adrian Brock</a>
+ * @author Thomas.Diesler at jboss.com
* @version $Revision: 1.1 $
*/
public interface Capability extends Serializable
@@ -36,10 +37,11 @@
/**
* Whether this capability resolves the requirement
*
- * @param module the module
+ * @param capModule the capability module
+ * @param reqModule the requirement module
* @param requirement the requirement
* @throws IllegalArgumentException for a null requirement
* @return true when it is resolves the requirement
*/
- boolean resolves(Module module, Requirement requirement);
+ boolean resolves(Module capModule, Module reqModule, Requirement requirement);
}
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/metadata/xml/support/TestCapability.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -44,7 +44,7 @@
super(name, version);
}
- public boolean resolves(Module module, Requirement requirement)
+ public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
{
return false;
}
Modified: projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java 2009-09-09 06:04:21 UTC (rev 93306)
+++ projects/jboss-cl/branches/Branch_2_0/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/TestCapability.java 2009-09-09 10:29:32 UTC (rev 93307)
@@ -44,7 +44,7 @@
super(name, version);
}
- public boolean resolves(Module module, Requirement requirement)
+ public boolean resolves(Module capModule, Module reqModule, Requirement requirement)
{
return false;
}
More information about the jboss-cvs-commits
mailing list