[jboss-cvs] JBossAS SVN: r78858 - in projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop: asintegration and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 25 10:56:02 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-09-25 10:56:02 -0400 (Thu, 25 Sep 2008)
New Revision: 78858
Removed:
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/JBossIntegration.java
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/core/
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/classpool/
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/deployers/
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java
projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/junit/
Log:
[JBAOP-652] Remove files not belonging in asintegration-jmx
Deleted: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/JBossIntegration.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/JBossIntegration.java 2008-09-25 14:45:58 UTC (rev 78857)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/asintegration/JBossIntegration.java 2008-09-25 14:56:02 UTC (rev 78858)
@@ -1,69 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.asintegration;
-
-import java.io.File;
-
-import javassist.scopedpool.ScopedClassPoolFactory;
-
-import org.jboss.aop.ClassLoaderValidation;
-import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
-
-/**
- * AOPIntegration.<p>
- *
- * This class is intended to identify all the integration
- * points AOP is making with the JBoss appserver.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public interface JBossIntegration extends ClassLoaderValidation
-{
- /**
- * Create the AOPClassLoaderScopingPolicy
- *
- * @return the policy
- */
- AOPClassLoaderScopingPolicy createAOPClassLoaderScopingPolicy();
-
- /**
- * Create a scoped classpool factory
- *
- * TODO JBAOP-107 need to review whether ScopedClassPool should also be replaced with
- * some other policy, e.g. javassist ClassPath notion is closer to new classloader?
- * @param tmpDir the temporary directory for classes
- * @return the factory
- * @throws Exception for any error
- */
- ScopedClassPoolFactory createScopedClassPoolFactory(File tmpDir) throws Exception;
-
- /**
- * Attach the depreacted translator
- */
- void attachDeprecatedTranslator();
-
- /**
- * Detach the deprecated translator
- */
- void detachDeprecatedTranslator();
-}
Deleted: projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java 2008-09-25 14:45:58 UTC (rev 78857)
+++ projects/aop/trunk/asintegration-jmx/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java 2008-09-25 14:56:02 UTC (rev 78858)
@@ -1,126 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.domain;
-
-import java.lang.ref.WeakReference;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.Domain;
-import org.jboss.aop.InterceptionMarkers;
-import org.jboss.aop.advice.AspectDefinition;
-
-
-/**
- * A domain that is used for scoped classloaders
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @author adrian at jboss.org
- * @version $Revision: 1.1 $
- */
-public abstract class ScopedClassLoaderDomain extends Domain
-{
-
- private WeakReference<ClassLoader> loader;
- protected boolean parentDelegation;
- protected ConcurrentHashMap<String, Object> myPerVMAspects = new ConcurrentHashMap<String, Object>();
- protected ConcurrentHashMap<String, Boolean> notMyPerVMAspects = new ConcurrentHashMap<String, Boolean>();
- protected InterceptionMarkers interceptionMarkers = new InterceptionMarkers();
- protected String classLoaderString;
-
- public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
- {
- super(manager, name, parentFirst);
- if (loader == null)
- throw new IllegalArgumentException("Null classloader");
- this.loader = new WeakReference<ClassLoader>(loader);
- this.parentDelegation = parentDelegation;
- classLoaderString = loader.toString();
- super.inheritsBindings = true;
- super.inheritsDeclarations = true;
- }
-
- protected ClassLoader getClassLoader()
- {
- ClassLoader cl = loader.get();
- if (cl != null)
- {
- return cl;
- }
- return null;
- }
-
- // FIXME: JBAOP-107 REMOVE THIS HACK
- @Override
- public abstract boolean isValid();
-
- @Override
- public void removeAspectDefinition(String name)
- {
- AspectDefinition def = super.internalRemoveAspectDefintion(name);
- if (def != null)
- {
- myPerVMAspects.remove(name);
- }
- }
-
- @Override
- public Object getPerVMAspect(AspectDefinition def)
- {
- return getPerVMAspect(def.getName());
- }
-
- @Override
- public InterceptionMarkers getInterceptionMarkers()
- {
- return interceptionMarkers;
- }
-
- @Override
- public Object getPerVMAspect(String def)
- {
- if (parentDelegation == true)
- {
- //We will alway be loading up the correct class
- Object aspect = super.getPerVMAspect(def);
- return aspect;
- }
- else
- {
- return getPerVmAspectWithNoParentDelegation(def);
- }
- }
-
- @Override
- protected Object createPerVmAspect(String def, AspectDefinition adef, ClassLoader scopedClassLoader)
- {
- return super.createPerVmAspect(def, adef, getClassLoader());
- }
-
- protected Object getSuperPerVmAspect(String def)
- {
- return super.getPerVMAspect(def);
- }
-
- protected abstract Object getPerVmAspectWithNoParentDelegation(String def);
-
-}
More information about the jboss-cvs-commits
mailing list