From jdo-commits-return-2703-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Thu Sep 24 22:40:31 2009 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 66010 invoked from network); 24 Sep 2009 22:40:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 22:40:31 -0000 Received: (qmail 70657 invoked by uid 500); 24 Sep 2009 22:40:30 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 70648 invoked by uid 99); 24 Sep 2009 22:40:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 22:40:30 +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; Thu, 24 Sep 2009 22:40:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6BDDC2388906; Thu, 24 Sep 2009 22:40:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818646 - in /db/jdo/trunk: api2/src/java/javax/jdo/Constants.java tck2/project.properties tck2/src/conf/jdo-2_3-signatures.txt Date: Thu, 24 Sep 2009 22:40:06 -0000 To: jdo-commits@db.apache.org From: clr@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924224006.6BDDC2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clr Date: Thu Sep 24 22:40:05 2009 New Revision: 818646 URL: http://svn.apache.org/viewvc?rev=818646&view=rev Log: JDO-621 Adapted TCK2 to use javax.jdo.Enhancer when running with RI Modified: db/jdo/trunk/api2/src/java/javax/jdo/Constants.java db/jdo/trunk/tck2/project.properties db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt Modified: db/jdo/trunk/api2/src/java/javax/jdo/Constants.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/Constants.java?rev=818646&r1=818645&r2=818646&view=diff ============================================================================== --- db/jdo/trunk/api2/src/java/javax/jdo/Constants.java (original) +++ db/jdo/trunk/api2/src/java/javax/jdo/Constants.java Thu Sep 24 22:40:05 2009 @@ -570,7 +570,7 @@ * @see JDOEnhancer#getProperties() * @since 2.3 */ - static String PROPERTY_ENHANCER_VENDOR_NAME + public final static String PROPERTY_ENHANCER_VENDOR_NAME = "VendorName"; /** @@ -579,23 +579,23 @@ * @see JDOEnhancer#getProperties() * @since 2.3 */ - static String PROPERTY_ENHANCER_VERSION_NUMBER + public final static String PROPERTY_ENHANCER_VERSION_NUMBER = "VersionNumber"; /** Exit value for no enhancer found * @since 2.3 * */ - public static int ENHANCER_NO_JDO_ENHANCER_FOUND = 2; + public final static int ENHANCER_NO_JDO_ENHANCER_FOUND = 2; /** Exit value for usage error * @since 2.3 * */ - public static int ENHANCER_USAGE_ERROR = 3; + public final static int ENHANCER_USAGE_ERROR = 3; /** Exit value for an exception from the JDOEnhancer * @since 2.3 * */ - public static int ENHANCER_EXCEPTION = 1; + public final static int ENHANCER_EXCEPTION = 1; /** * "javax.jdo.option.Optimistic" Modified: db/jdo/trunk/tck2/project.properties URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?rev=818646&r1=818645&r2=818646&view=diff ============================================================================== --- db/jdo/trunk/tck2/project.properties (original) +++ db/jdo/trunk/tck2/project.properties Thu Sep 24 22:40:05 2009 @@ -84,8 +84,8 @@ # JDORI enhancer jdori.enhanced.dir = ${maven.build.dir}/enhanced/jdori -jdori.enhancer.main = org.datanucleus.enhancer.DataNucleusEnhancer -jdori.enhancer.options = -enhancerName asm -v -d "${enhanced.dir}" +jdori.enhancer.main = javax.jdo.Enhancer +jdori.enhancer.options = -v -d "${enhanced.dir}" jdori.enhancer.args = ${jdo.tck.jdometadata.files} # connection pooling dependencies Modified: db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt?rev=818646&r1=818645&r2=818646&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt (original) +++ db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt Thu Sep 24 22:40:05 2009 @@ -245,6 +245,11 @@ public static final String TX_REPEATABLE_READ = "repeatable-read"; public static final String TX_SNAPSHOT = "snapshot"; public static final String TX_SERIALIZABLE = "serializable"; + public static final String PROPERTY_ENHANCER_VENDOR_NAME = "VendorName"; + public static final String PROPERTY_ENHANCER_VERSION_NUMBER = "VersionNumber"; + public static final int ENHANCER_EXCEPTION = 1; + public static final int ENHANCER_NO_JDO_ENHANCER_FOUND = 2; + public static final int ENHANCER_USAGE_ERROR = 3; } public interface javax.jdo.datastore.DataStoreCache {