Return-Path: 
 <cayenne-commits-return-1353-apmail-incubator-cayenne-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cayenne-commits-archive@locus.apache.org
Received: (qmail 55288 invoked from network); 10 Oct 2006 15:04:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Oct 2006 15:04:03 -0000
Received: (qmail 62279 invoked by uid 500); 10 Oct 2006 15:04:03 -0000
Delivered-To: apmail-incubator-cayenne-commits-archive@incubator.apache.org
Received: (qmail 62259 invoked by uid 500); 10 Oct 2006 15:04:03 -0000
Mailing-List: contact cayenne-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:cayenne-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cayenne-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cayenne-commits@incubator.apache.org>
List-Id: <cayenne-commits.incubator.apache.org>
Reply-To: cayenne-dev@incubator.apache.org
Delivered-To: mailing list cayenne-commits@incubator.apache.org
Received: (qmail 62250 invoked by uid 99); 10 Oct 2006 15:04:03 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2006 08:04:03 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Oct 2006 08:04:03 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id B63CF1A981D; Tue, 10 Oct 2006 08:03:42 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r454771 - in
 /incubator/cayenne/main/trunk/core/cayenne-jpa:
 pom.xml
 src/main/java/org/apache/cayenne/jpa/instrument/InstrumentingUnit.java
Date: Tue, 10 Oct 2006 15:03:42 -0000
To: cayenne-commits@incubator.apache.org
From: aadamchik@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061010150342.B63CF1A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: aadamchik
Date: Tue Oct 10 08:03:41 2006
New Revision: 454771

URL: http://svn.apache.org/viewvc?view=rev&rev=454771
Log:
CAY-684 - removing direct dependency on CayenneAgent; using reflection-based InstrumentUtil

Modified:
    incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
    incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/instrument/InstrumentingUnit.java

Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml?view=diff&rev=454771&r1=454770&r2=454771
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml Tue Oct 10 08:03:41 2006
@@ -53,13 +53,6 @@
 			<artifactId>cayenne-jdk1.5</artifactId>
 			<version>${version}</version>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.cayenne.core</groupId>
-			<artifactId>cayenne-agent</artifactId>
-			<version>${version}</version>
-			<scope>provided</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>cglib</groupId>

Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/instrument/InstrumentingUnit.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/instrument/InstrumentingUnit.java?view=diff&rev=454771&r1=454770&r2=454771
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/instrument/InstrumentingUnit.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/instrument/InstrumentingUnit.java Tue Oct 10 08:03:41 2006
@@ -25,7 +25,7 @@
 
 import javax.persistence.spi.ClassTransformer;
 
-import org.apache.cayenne.instrument.CayenneAgent;
+import org.apache.cayenne.instrument.InstrumentUtil;
 import org.apache.cayenne.jpa.spi.JpaUnit;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -44,7 +44,7 @@
     public void addTransformer(final ClassTransformer transformer) {
 
         // sanity check
-        if (CayenneAgent.getInstrumentation() == null) {
+        if (!InstrumentUtil.isAgentLoaded()) {
             getLogger().warn(
                     "*** No instrumentation instance present. "
                             + "Check the -javaagent: option");
@@ -71,7 +71,7 @@
         };
 
         getLogger().info("*** Adding transformer: " + transformer);
-        CayenneAgent.getInstrumentation().addTransformer(transformerWrapper);
+        InstrumentUtil.addTransformer(transformerWrapper);
     }
 
     protected Log getLogger() {