[jboss-cvs] Fwd: jboss-cvs-commits Digest, Vol 47, Issue 134
Ales Justin
ales.justin at gmail.com
Thu May 13 17:17:21 EDT 2010
Why this wildcard work on the branch?
I already implemented this in trunk.
If there are any issues with my current impl, let me know.
Sent from my iPod
Begin forwarded message:
> From: jboss-cvs-commits-request at lists.jboss.org
> Date: 13. maj 2010 22:55:00 GMT+0200
> To: jboss-cvs-commits at lists.jboss.org
> Subject: jboss-cvs-commits Digest, Vol 47, Issue 134
> Reply-To: jboss-cvs-commits at lists.jboss.org
>
> Send jboss-cvs-commits mailing list submissions to
> jboss-cvs-commits at lists.jboss.org
>
> To subscribe or unsubscribe via the World Wide Web, visit
> https://lists.jboss.org/mailman/listinfo/jboss-cvs-commits
> or, via email, send a message with subject or body 'help' to
> jboss-cvs-commits-request at lists.jboss.org
>
> You can reach the person managing the list at
> jboss-cvs-commits-owner at lists.jboss.org
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of jboss-cvs-commits digest..."
>
>
> Today's Topics:
>
> 1. JBossAS SVN: r104778 - in projects/jboss-cl/trunk:
> classloading/src/main/java/org/jboss/classloading/spi/
> dependency/policy
> and 1 other directory. (jboss-cvs-commits at lists.jboss.org)
> 2. JBossAS SVN: r104779 -
> projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy.
> (jboss-cvs-commits at lists.jboss.org)
> 3. JBossAS SVN: r104780 - in
> projects/jboss-cl/branches/tdi/jbosgi323:
> classloading/src/main/java/org/jboss/classloading/spi/dependency
> and 1 other directories. (jboss-cvs-commits at lists.jboss.org)
> 4. JBossAS SVN: r104781 -
> projects/jboss-cl/branches/tdi/jbosgi323.
> (jboss-cvs-commits at lists.jboss.org)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Thu, 13 May 2010 16:16:51 -0400
> From: jboss-cvs-commits at lists.jboss.org
> Subject: [jboss-cvs] JBossAS SVN: r104778 - in
> projects/jboss-cl/trunk:
> classloading/src/main/java/org/jboss/classloading/spi/dependency/
> policy
> and 1 other directory.
> To: jboss-cvs-commits at lists.jboss.org
> Message-ID:
> <201005132016.o4DKGpHR031400 at svn01.web.mwc.hst.phx2.redhat.com>
> Content-Type: text/plain; charset=UTF-8
>
> Author: alesj
> Date: 2010-05-13 16:16:49 -0400 (Thu, 13 May 2010)
> New Revision: 104778
>
> Removed:
> projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskAwareLoader.java
> projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskInfo.java
> Modified:
> projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/BaseClassLoaderPolicy.java
> projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoaderManager.java
> projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTask.java
> projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
> projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardDelegateLoader.java
> Log:
> Remove public access to BaseClassLoader from delegate loader.
>
> Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/
> jboss/classloader/spi/base/BaseClassLoaderPolicy.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/BaseClassLoaderPolicy.java 2010-05-13
> 18:22:49 UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/BaseClassLoaderPolicy.java 2010-05-13
> 20:16:49 UTC (rev 104778)
> @@ -350,8 +350,23 @@
> shutdownPolicy();
> this.domain = null;
> }
> -
> +
> /**
> + * Get the classloader based on classloading task.
> + *
> + * Since ClassLoadingTask ctor is package protected
> + * this method cannot be easily abused, since the only
> + * code that can instantiate ClassLoadingTask is our
> ClassLoaderManager.
> + *
> + * @param task the classloading task info
> + * @return the classloader
> + */
> + protected synchronized BaseClassLoader getClassLoader
> (ClassLoadingTask task)
> + {
> + return getClassLoader();
> + }
> +
> + /**
> * Get the classloader
> *
> * @return the classloader
>
> Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/
> jboss/classloader/spi/base/ClassLoaderManager.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoaderManager.java 2010-05-13 18:22:49
> UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoaderManager.java 2010-05-13 20:16:49
> UTC (rev 104778)
> @@ -339,18 +339,13 @@
> List<ThreadTask> taskList;
>
> BaseClassLoader classLoader = null;
> - if (loader instanceof ClassLoadingTaskAwareLoader)
> + if (loader instanceof BaseDelegateLoader)
> {
> - ClassLoadingTaskAwareLoader cltal =
> (ClassLoadingTaskAwareLoader) loader;
> - classLoader = cltal.getBaseClassLoader(task);
> - }
> - if (classLoader == null && loader instanceof
> BaseDelegateLoader)
> - {
> BaseDelegateLoader delegateLoader = (BaseDelegateLoader)
> loader;
> BaseClassLoaderPolicy policy = delegateLoader.getPolicy();
> if (policy == null)
> throw new IllegalStateException("Null policy for " +
> delegateLoader);
> - classLoader = policy.getClassLoader();
> + classLoader = policy.getClassLoader(task);
> }
>
> synchronized (loadClassThreads)
>
> Modified: projects/jboss-cl/trunk/classloader/src/main/java/org/
> jboss/classloader/spi/base/ClassLoadingTask.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTask.java 2010-05-13 18:22:49
> UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTask.java 2010-05-13 20:16:49
> UTC (rev 104778)
> @@ -34,13 +34,17 @@
>
> /**
> * ClassLoadingTask.
> + *
> + * Make the class public, so others can use it,
> + * but the ctor is still package protected
> + * so only classes in this package can instantiate it.
> *
> * @author Scott.Stark at jboss.org
> * @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 $
> */
> -class ClassLoadingTask implements ClassLoadingTaskInfo
> +public class ClassLoadingTask
> {
> /** The log */
> protected static Logger log = Logger.getLogger
> ("org.jboss.detailed.classloader.ClassLoadingTask");
> @@ -403,18 +407,13 @@
> BaseClassLoader getClassLoader()
> {
> BaseClassLoader classLoader = null;
> - if (loader instanceof ClassLoadingTaskAwareLoader)
> + if (loader instanceof BaseDelegateLoader)
> {
> - ClassLoadingTaskAwareLoader cltal =
> (ClassLoadingTaskAwareLoader) loader;
> - classLoader = cltal.getBaseClassLoader(getLoadTask());
> - }
> - if (classLoader == null && loader instanceof
> BaseDelegateLoader)
> - {
> BaseDelegateLoader delegateLoader = (BaseDelegateLoader)
> loader;
> BaseClassLoaderPolicy policy = delegateLoader.getPolicy();
> if (policy == null)
> throw new IllegalStateException("Null classloader
> policy for " + loader);
> - classLoader = policy.getClassLoader();
> + classLoader = policy.getClassLoader(getLoadTask());
> }
> return classLoader;
> }
> @@ -452,7 +451,7 @@
> /**
> * Run the class load
> *
> - * @throws ClassNotFoundException
> + * @throws ClassNotFoundException if class cannot be loaded
> */
> void run() throws ClassNotFoundException
> {
>
> Deleted: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskAwareLoader.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskAwareLoader.java 2010-05-13
> 18:22:49 UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskAwareLoader.java 2010-05-13
> 20:16:49 UTC (rev 104778)
> @@ -1,38 +0,0 @@
> -/*
> - * JBoss, Home of Professional Open Source.
> - * Copyright 2010, Red Hat Middleware LLC, and individual
> contributors
> - * as indicated by the @author tags. See the copyright.txt file in
> the
> - * distribution for a full listing of individual contributors.
> - *
> - * This is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU Lesser General Public License as
> - * published by the Free Software Foundation; either version 2.1 of
> - * the License, or (at your option) any later version.
> - *
> - * This software is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this software; if not, write to the Free
> - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> - * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
> - */
> -
> -package org.jboss.classloader.spi.base;
> -
> -/**
> - * Loader that knows how to get BaseClassLoader based on task
> - * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
> - */
> -public interface ClassLoadingTaskAwareLoader
> -{
> - /**
> - * Get classloader.
> - *
> - * @param task the current classloading task
> - * @return matching classloader or null
> - */
> - BaseClassLoader getBaseClassLoader(ClassLoadingTaskInfo task);
> -}
>
> Deleted: projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskInfo.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskInfo.java 2010-05-13
> 18:22:49 UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloader/src/main/java/org/jboss/
> classloader/spi/base/ClassLoadingTaskInfo.java 2010-05-13
> 20:16:49 UTC (rev 104778)
> @@ -1,37 +0,0 @@
> -/*
> - * JBoss, Home of Professional Open Source.
> - * Copyright 2007, Red Hat Middleware LLC, and individual
> contributors
> - * as indicated by the @author tags. See the copyright.txt file in
> the
> - * distribution for a full listing of individual contributors.
> - *
> - * This is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU Lesser General Public License as
> - * published by the Free Software Foundation; either version 2.1 of
> - * the License, or (at your option) any later version.
> - *
> - * This software is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this software; if not, write to the Free
> - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> - * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
> - */
> -package org.jboss.classloader.spi.base;
> -
> -/**
> - * ClassLoadingTaskInfo.
> - *
> - * @author <a href="ales.justin at jboss.org">Ales Justin</a>
> - */
> -public interface ClassLoadingTaskInfo
> -{
> - /**
> - * Get the className.
> - *
> - * @return the className.
> - */
> - String getClassName();
> -}
> \ No newline at end of file
>
> Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/
> jboss/classloading/spi/dependency/policy/
> WildcardClassLoaderPolicy.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
> 2010-05-13 18:22:49 UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
> 2010-05-13 20:16:49 UTC (rev 104778)
> @@ -26,8 +26,10 @@
> import java.util.*;
> import java.util.concurrent.ConcurrentHashMap;
>
> +import org.jboss.classloader.plugins.ClassLoaderUtils;
> import org.jboss.classloader.spi.ClassLoaderPolicy;
> import org.jboss.classloader.spi.base.BaseClassLoader;
> +import org.jboss.classloader.spi.base.ClassLoadingTask;
> import org.jboss.classloader.spi.filter.ClassFilter;
> import org.jboss.classloading.plugins.metadata.PackageRequirement;
> import org.jboss.classloading.spi.dependency.*;
> @@ -237,4 +239,14 @@
> }
> return null;
> }
> +
> + @Override
> + protected BaseClassLoader getClassLoader(ClassLoadingTask task)
> + {
> + if (task == null)
> + throw new IllegalArgumentException("Null task");
> +
> + String path = ClassLoaderUtils.classNameToPath
> (task.getClassName());
> + return getBaseClassLoader(path);
> + }
> }
>
> Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/
> jboss/classloading/spi/dependency/policy/WildcardDelegateLoader.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardDelegateLoader.java
> 2010-05-13 18:22:49 UTC (rev 104777)
> +++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardDelegateLoader.java
> 2010-05-13 20:16:49 UTC (rev 104778)
> @@ -22,12 +22,9 @@
>
> package org.jboss.classloading.spi.dependency.policy;
>
> -import org.jboss.classloader.plugins.ClassLoaderUtils;
> import org.jboss.classloader.spi.ClassLoaderPolicy;
> import org.jboss.classloader.spi.ClassLoaderPolicyFactory;
> import org.jboss.classloader.spi.base.BaseClassLoader;
> -import org.jboss.classloader.spi.base.ClassLoadingTaskAwareLoader;
> -import org.jboss.classloader.spi.base.ClassLoadingTaskInfo;
> import org.jboss.classloader.spi.filter.ClassFilter;
> import org.jboss.classloader.spi.filter.FilteredDelegateLoader;
>
> @@ -36,7 +33,7 @@
> *
> * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
> */
> -public class WildcardDelegateLoader extends FilteredDelegateLoader
> implements ClassLoadingTaskAwareLoader
> +public class WildcardDelegateLoader extends FilteredDelegateLoader
> {
> public WildcardDelegateLoader(ClassLoaderPolicyFactory factory,
> ClassFilter filter)
> {
> @@ -53,10 +50,4 @@
> WildcardClassLoaderPolicy wclp = (WildcardClassLoaderPolicy)
> policy;
> return wclp.getBaseClassLoader(context);
> }
> -
> - public BaseClassLoader getBaseClassLoader(ClassLoadingTaskInfo
> task)
> - {
> - String path = ClassLoaderUtils.classNameToPath
> (task.getClassName());
> - return getBaseClassLoader(null, path);
> - }
> }
>
>
>
> ------------------------------
>
> Message: 2
> Date: Thu, 13 May 2010 16:33:06 -0400
> From: jboss-cvs-commits at lists.jboss.org
> Subject: [jboss-cvs] JBossAS SVN: r104779 -
> projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy.
>
> To: jboss-cvs-commits at lists.jboss.org
> Message-ID:
> <201005132033.o4DKX68H000470 at svn01.web.mwc.hst.phx2.redhat.com>
> Content-Type: text/plain; charset=UTF-8
>
> Author: alesj
> Date: 2010-05-13 16:33:05 -0400 (Thu, 13 May 2010)
> New Revision: 104779
>
> Modified:
> projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
> Log:
> Add null checks.
>
> Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/
> jboss/classloading/spi/dependency/policy/
> WildcardClassLoaderPolicy.java
> ===================================================================
> --- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
> 2010-05-13 20:16:49 UTC (rev 104778)
> +++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/
> classloading/spi/dependency/policy/WildcardClassLoaderPolicy.java
> 2010-05-13 20:33:05 UTC (rev 104779)
> @@ -58,6 +58,12 @@
>
> public WildcardClassLoaderPolicy(Domain domain,
> PackageRequirement requirement, Module module)
> {
> + if (domain == null)
> + throw new IllegalArgumentException("Null domain");
> + if (requirement == null)
> + throw new IllegalArgumentException("Null reqirement");
> + if (module == null)
> + throw new IllegalArgumentException("Null module");
> this.domain = domain;
> this.requirement = requirement;
> this.module = module;
>
>
>
> ------------------------------
>
> Message: 3
> Date: Thu, 13 May 2010 16:38:17 -0400
> From: jboss-cvs-commits at lists.jboss.org
> Subject: [jboss-cvs] JBossAS SVN: r104780 - in
> projects/jboss-cl/branches/tdi/jbosgi323:
> classloading/src/main/java/org/jboss/classloading/spi/
> dependency and 1
> other directories.
> To: jboss-cvs-commits at lists.jboss.org
> Message-ID:
> <201005132038.o4DKcH48000995 at svn01.web.mwc.hst.phx2.redhat.com>
> Content-Type: text/plain; charset=UTF-8
>
> Author: thomas.diesler at jboss.com
> Date: 2010-05-13 16:38:16 -0400 (Thu, 13 May 2010)
> New Revision: 104780
>
> Modified:
> projects/jboss-cl/branches/tdi/jbosgi323/classloader/src/main/java/
> org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
> projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/Domain.java
> projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/
> RequirementDependencyItem.java
> projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/policy/
> ClassLoaderPolicyModule.java
> projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/policy/
> DynamicClassLoaderPolicyFactory.java
> Log:
> [JBOSGI-323] Add logic that finds a loader which can be lazily added
> to the policy
>
> Modified: projects/jboss-cl/branches/tdi/jbosgi323/classloader/src/
> main/java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
> ===================================================================
> --- projects/jboss-cl/branches/tdi/jbosgi323/classloader/src/main/
> java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
> 2010-05-13 20:33:05 UTC (rev 104779)
> +++ projects/jboss-cl/branches/tdi/jbosgi323/classloader/src/main/
> java/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java
> 2010-05-13 20:38:16 UTC (rev 104780)
> @@ -905,8 +905,31 @@
> return delegate;
> }
> }
> +
> + // Process potential delegates that were added lazily to the
> policy
> + // This could for example be done in a {@link
> ClassNotFoundHandler}
> + List<? extends DelegateLoader> policyDelegates =
> info.getPolicy().getDelegates();
> + if (policyDelegates != null && policyDelegates.isEmpty() ==
> false)
> + {
> + for (DelegateLoader delegate : policyDelegates)
> + {
> + if (delegates.contains(delegate) ||
> delegate.getImportType() != type)
> + continue;
> +
> + if (trace)
> + log.trace(this + " trying to load " + name + " from
> delegate added lazily to policy " + delegate + " for " +
> info.getClassLoader());
> +
> + if (delegate.getResource(name) != null)
> + {
> + info.cacheLoader(name, delegate);
> + return delegate;
> + }
> + }
> + }
> +
> if (type == ImportType.AFTER) // TODO -- is this really OK?
> info.blackListClass(name);
> +
> return null;
> }
>
>
> Modified: projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/
> main/java/org/jboss/classloading/spi/dependency/Domain.java
> ===================================================================
> --- projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/Domain.java 2010-05-13
> 20:33:05 UTC (rev 104779)
> +++ projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/Domain.java 2010-05-13
> 20:38:16 UTC (rev 104780)
> @@ -354,7 +354,8 @@
> List<Capability> capabilities = module.getCapabilitiesRaw();
> if (capabilities != null && capabilities.isEmpty() == false)
> {
> - ModuleRequirement requirement = new ModuleRequirement
> (name, range);
> + String auxModuleName = (name != null ? name :
> "auxModuleName");
> + ModuleRequirement requirement = new ModuleRequirement
> (auxModuleName, range);
> for (Capability capability : capabilities)
> {
> if (capability.resolves(module, requirement))
> @@ -366,7 +367,9 @@
> }
> else
> {
> - if (name.equals(module.getName()) && range.isInRange
> (module.getVersion()))
> + boolean nameMatch = (name == null || name.equals
> (module.getName()));
> + boolean versionMatch = range.isInRange(module.getVersion
> ());
> + if (nameMatch && versionMatch)
> {
> result.add(module);
> return;
>
> Modified: projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/
> main/java/org/jboss/classloading/spi/dependency/
> RequirementDependencyItem.java
> ===================================================================
> --- projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/
> RequirementDependencyItem.java 2010-05-13 20:33:05 UTC (rev 104779)
> +++ projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/
> RequirementDependencyItem.java 2010-05-13 20:38:16 UTC (rev 104780)
> @@ -39,7 +39,6 @@
> public class RequirementDependencyItem extends AbstractDependencyItem
> {
> /** The log */
> - @SuppressWarnings("hiding")
> private static final Logger log = Logger.getLogger
> (RequirementDependencyItem.class);
>
> /** The module */
>
> Modified: projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/
> main/java/org/jboss/classloading/spi/dependency/policy/
> ClassLoaderPolicyModule.java
> ===================================================================
> --- projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/policy/
> ClassLoaderPolicyModule.java 2010-05-13 20:33:05 UTC (rev 104779)
> +++ projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/policy/
> ClassLoaderPolicyModule.java 2010-05-13 20:38:16 UTC (rev 104780)
> @@ -266,7 +266,6 @@
> if (requirement instanceof PackageRequirement)
> {
> PackageRequirement pr = (PackageRequirement)requirement;
> - // TODO -- handle wildcards
> return new FilteredDelegateLoader(factory, pr.toClassFilter
> ());
> }
> else
>
> Modified: projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/
> main/java/org/jboss/classloading/spi/dependency/policy/
> DynamicClassLoaderPolicyFactory.java
> ===================================================================
> --- projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/policy/
> DynamicClassLoaderPolicyFactory.java 2010-05-13 20:33:05 UTC (rev
> 104779)
> +++ projects/jboss-cl/branches/tdi/jbosgi323/classloading/src/main/
> java/org/jboss/classloading/spi/dependency/policy/
> DynamicClassLoaderPolicyFactory.java 2010-05-13 20:38:16 UTC (rev
> 104780)
> @@ -23,10 +23,13 @@
>
> import org.jboss.classloader.spi.ClassLoaderPolicy;
> import org.jboss.classloader.spi.ClassLoaderPolicyFactory;
> +import org.jboss.classloading.plugins.metadata.PackageRequirement;
> import org.jboss.classloading.spi.dependency.Domain;
> import org.jboss.classloading.spi.dependency.Module;
> import
> org.jboss.classloading.spi.dependency.RequirementDependencyItem;
> +import org.jboss.classloading.spi.metadata.Requirement;
> import org.jboss.dependency.spi.Controller;
> +import org.jboss.logging.Logger;
>
> /**
> * DynamicClassLoaderPolicyFactory.
> @@ -36,12 +39,15 @@
> */
> public class DynamicClassLoaderPolicyFactory implements
> ClassLoaderPolicyFactory
> {
> + /** The log */
> + private static final Logger log = Logger.getLogger
> (DynamicClassLoaderPolicyFactory.class);
> +
> /** The controller */
> private Controller controller;
>
> /** The domain */
> private Domain domain;
> -
> +
> /** The requirement dependency item */
> private RequirementDependencyItem item;
>
> @@ -67,13 +73,38 @@
>
> public ClassLoaderPolicy createClassLoaderPolicy()
> {
> + Requirement req = item.getRequirement();
> + if (req instanceof PackageRequirement == false)
> + return getWiredModuleClassLoaderPolicy();
> +
> + PackageRequirement preq = (PackageRequirement)req;
> + if (preq.isWildcard())
> + {
> + return getWildcardClassLoaderPolicy();
> + }
> + else
> + {
> + return getWiredModuleClassLoaderPolicy();
> + }
> + }
> +
> + private ClassLoaderPolicy getWildcardClassLoaderPolicy()
> + {
> + // [TODO] A dynamic import with wildcard at the end does not
> wire to
> + // a dependent module. We need to figure out how to handle
> this case.
> + log.warn("Cannot obtain policy for: " + item.getRequirement());
> + return null;
> + }
> +
> + private ClassLoaderPolicy getWiredModuleClassLoaderPolicy()
> + {
> // Still undetermined
> - String name = (String) item.getIDependOn();
> + String name = (String)item.getIDependOn();
> if (name == null)
> {
> // Try to resolve
> item.resolve(controller);
> - name = (String) item.getIDependOn();
> + name = (String)item.getIDependOn();
> if (name == null)
> return null;
> }
> @@ -85,7 +116,8 @@
> // Get the policy for the module
> if (iDependOnModule instanceof ClassLoaderPolicyModule == false)
> throw new IllegalStateException("Unable to determine
> ClassLoaderPolicy from module: " + iDependOnModule);
> - ClassLoaderPolicyModule classLoaderPolicyModule =
> (ClassLoaderPolicyModule) iDependOnModule;
> +
> + ClassLoaderPolicyModule classLoaderPolicyModule =
> (ClassLoaderPolicyModule)iDependOnModule;
> return classLoaderPolicyModule.getPolicy();
> }
> }
>
>
>
> ------------------------------
>
> Message: 4
> Date: Thu, 13 May 2010 16:54:30 -0400
> From: jboss-cvs-commits at lists.jboss.org
> Subject: [jboss-cvs] JBossAS SVN: r104781 -
> projects/jboss-cl/branches/tdi/jbosgi323.
> To: jboss-cvs-commits at lists.jboss.org
> Message-ID:
> <201005132054.o4DKsUUL003264 at svn01.web.mwc.hst.phx2.redhat.com>
> Content-Type: text/plain; charset=UTF-8
>
> Author: thomas.diesler at jboss.com
> Date: 2010-05-13 16:54:29 -0400 (Thu, 13 May 2010)
> New Revision: 104781
>
> Modified:
> projects/jboss-cl/branches/tdi/jbosgi323/pom.xml
> Log:
> Remove deprecated repository definitions and switch to nexus
>
> Modified: projects/jboss-cl/branches/tdi/jbosgi323/pom.xml
> ===================================================================
> --- projects/jboss-cl/branches/tdi/jbosgi323/pom.xml 2010-05-13
> 20:38:16 UTC (rev 104780)
> +++ projects/jboss-cl/branches/tdi/jbosgi323/pom.xml 2010-05-13
> 20:54:29 UTC (rev 104781)
> @@ -4,7 +4,7 @@
> <parent>
> <groupId>org.jboss</groupId>
> <artifactId>jboss-parent</artifactId>
> - <version>4</version>
> + <version>5</version>
> </parent>
>
> <groupId>org.jboss.cl</groupId>
> @@ -109,42 +109,6 @@
> </pluginManagement>
> </build>
>
> - <repositories>
> - <repository>
> - <id>repository.jboss.org</id>
> - <name>JBoss Repository</name>
> - <layout>default</layout>
> - <url>http://repository.jboss.org/maven2/</url>
> - <snapshots>
> - <enabled>false</enabled>
> - </snapshots>
> - </repository>
> - <repository>
> - <id>snapshots.jboss.org</id>
> - <name>JBoss Snapshots Repository</name>
> - <layout>default</layout>
> - <url>http://snapshots.jboss.org/maven2/</url>
> - <snapshots>
> - <enabled>true</enabled>
> - </snapshots>
> - <releases>
> - <enabled>false</enabled>
> - </releases>
> - </repository>
> - <!-- APIviz repository -->
> - <repository>
> - <id>apiviz.release</id>
> - <name>APIviz releases</name>
> - <url>http://apiviz.googlecode.com/svn/site/repo/mvn/release</
> url>
> - <releases>
> - <enabled>true</enabled>
> - </releases>
> - <snapshots>
> - <enabled>false</enabled>
> - </snapshots>
> - </repository>
> - </repositories>
> -
> <reporting>
> <plugins>
> <plugin>
>
>
>
> ------------------------------
>
> _______________________________________________
> jboss-cvs-commits mailing list
> jboss-cvs-commits at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/jboss-cvs-commits
>
>
> End of jboss-cvs-commits Digest, Vol 47, Issue 134
> **************************************************
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/jboss-cvs-commits/attachments/20100513/13836f77/attachment.html
More information about the jboss-cvs-commits
mailing list