Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 41022 invoked from network); 6 Dec 2010 14:19:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Dec 2010 14:19:16 -0000 Received: (qmail 10951 invoked by uid 500); 6 Dec 2010 14:19:15 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 10858 invoked by uid 500); 6 Dec 2010 14:19:15 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 10824 invoked by uid 99); 6 Dec 2010 14:19:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Dec 2010 14:19:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Dec 2010 14:19:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 60A842388994; Mon, 6 Dec 2010 14:18:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1042654 - in /incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly: ./ api/ Date: Mon, 06 Dec 2010 14:18:50 -0000 To: aries-commits@incubator.apache.org From: davidb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101206141850.60A842388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davidb Date: Mon Dec 6 14:18:49 2010 New Revision: 1042654 URL: http://svn.apache.org/viewvc?rev=1042654&view=rev Log: Renamed some classes. Added: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java - copied, changed from r1042653, incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MyWeavingHook.java incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java - copied, changed from r1042653, incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/SPIBundleTrackerCustomizer.java Removed: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MyWeavingHook.java incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/SPIBundleTrackerCustomizer.java incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/api/SPIClassloaderAdviceService.java Modified: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/TCCLSetterVisitor.java Modified: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java?rev=1042654&r1=1042653&r2=1042654&view=diff ============================================================================== --- incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java (original) +++ incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java Mon Dec 6 14:18:49 2010 @@ -50,12 +50,12 @@ public class Activator implements Bundle lst = new LogServiceTracker(context); lst.open(); - WeavingHook wh = new MyWeavingHook(context); + WeavingHook wh = new ClientWeavingHook(context); weavingHookService = context.registerService(WeavingHook.class, wh, null); bt = new BundleTracker>>(context, - Bundle.ACTIVE, new SPIBundleTrackerCustomizer(this, context.getBundle())); + Bundle.ACTIVE, new ProviderBundleTrackerCustomizer(this, context.getBundle())); bt.open(); activator = this; Copied: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java (from r1042653, incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MyWeavingHook.java) URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java?p2=incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java&p1=incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MyWeavingHook.java&r1=1042653&r2=1042654&rev=1042654&view=diff ============================================================================== --- incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MyWeavingHook.java (original) +++ incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java Mon Dec 6 14:18:49 2010 @@ -27,10 +27,10 @@ import org.osgi.framework.hooks.weaving. import org.osgi.framework.hooks.weaving.WovenClass; import org.osgi.service.log.LogService; -public class MyWeavingHook implements WeavingHook { +public class ClientWeavingHook implements WeavingHook { private final String addedImport; - MyWeavingHook(BundleContext context) { + ClientWeavingHook(BundleContext context) { Bundle b = context.getBundle(); String bver = b.getVersion().toString(); String bsn = b.getSymbolicName(); Copied: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java (from r1042653, incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/SPIBundleTrackerCustomizer.java) URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java?p2=incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java&p1=incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/SPIBundleTrackerCustomizer.java&r1=1042653&r2=1042654&rev=1042654&view=diff ============================================================================== --- incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/SPIBundleTrackerCustomizer.java (original) +++ incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java Mon Dec 6 14:18:49 2010 @@ -33,11 +33,11 @@ import org.osgi.framework.ServiceRegistr import org.osgi.service.log.LogService; import org.osgi.util.tracker.BundleTrackerCustomizer; -public class SPIBundleTrackerCustomizer implements BundleTrackerCustomizer>> { +public class ProviderBundleTrackerCustomizer implements BundleTrackerCustomizer>> { final Activator activator; final Bundle spiBundle; - public SPIBundleTrackerCustomizer(Activator a, Bundle b) { + public ProviderBundleTrackerCustomizer(Activator a, Bundle b) { activator = a; spiBundle = b; Modified: incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/TCCLSetterVisitor.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/TCCLSetterVisitor.java?rev=1042654&r1=1042653&r2=1042654&view=diff ============================================================================== --- incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/TCCLSetterVisitor.java (original) +++ incubator/aries/trunk/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/TCCLSetterVisitor.java Mon Dec 6 14:18:49 2010 @@ -27,6 +27,10 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; +/** + * This class implements an ASM ClassVisitor which puts the appropriate ThreadContextClassloader + * calls around applicable method invocations. + */ public class TCCLSetterVisitor extends ClassAdapter implements ClassVisitor, Opcodes { private static final String GENERATED_METHOD_NAME = "$$FCCL$$";