db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r219570 - in /incubator/jdo/trunk: README.txt fostore20/project.properties fostore20/test/conf/jndi.properties lib/ lib/ext/ ri11/project.properties ri11/test/conf/jndi.properties tck20/project.properties tck20/test/conf/alltests.conf
Date Mon, 18 Jul 2005 21:41:59 GMT
Author: mbo
Date: Mon Jul 18 14:40:32 2005
New Revision: 219570

URL: http://svn.apache.org/viewcvs?rev=219570&view=rev
Log:
moved jndi jar files to trunk/lib/ext and updated JNDI section in README.txt

Added:
    incubator/jdo/trunk/lib/
    incubator/jdo/trunk/lib/ext/
Modified:
    incubator/jdo/trunk/README.txt
    incubator/jdo/trunk/fostore20/project.properties
    incubator/jdo/trunk/fostore20/test/conf/jndi.properties
    incubator/jdo/trunk/ri11/project.properties
    incubator/jdo/trunk/ri11/test/conf/jndi.properties
    incubator/jdo/trunk/tck20/project.properties
    incubator/jdo/trunk/tck20/test/conf/alltests.conf

Modified: incubator/jdo/trunk/README.txt
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/README.txt?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/README.txt (original)
+++ incubator/jdo/trunk/README.txt Mon Jul 18 14:40:32 2005
@@ -39,20 +39,19 @@
 it to your local maven repository:
   cp antlr-2.7.3.jar $HOME/.maven/repository/antlr/jars/antlr-2.7.3.jar
 
-- JNDI implementation
-- fscontext.jar and providerutil.jar
-The JDORI JNDI test case in ri11 and fostore20 needs a JNDI implementation. 
-To configure this please update the property jndi in ri11/project.properties 
-and fostore20/project.properties to include all jars of your JNDI 
-implementation. The properties file jndi.properties under ri11/test
-should define all the necessary properties of your JNDI implemenation.
-The defaults setting in project.properties and jndi.properties use Sun's File 
-System Service Provider implementation (fscontext.jar and providerutil.jar) and 
-assume to find both jars in the directory ri11. For donwload please go to 
-http://java.sun.com/products/jndi/downloads/index.html, click the Download 
-button at 'Download JNDI 1.2.1 & More', accept a license agreement, download 
-'File System Service Provider, 1.2 Beta 3' and then unpack the downloaded zip.
- It includes the jars fscontext.jar and providerutil.jar.
+- JNDI implementation (fscontext.jar and providerutil.jar)
+The JNDI test cases in ri11, fostore20 and tck20 need a JNDI implementation.
+To configure this please check the property jndi in project.properties of ri11,
+fostore20 and tck20. It lists all jars of your JNDI implementation in a 
+path-like syntax. Furthermore, the three subprojects have a properties file 
+test/conf/jndi.properties defining all the necessary properties of the JNDI 
+implemenation. The default setting in project.properties and jndi.properties 
+use Sun's File System Service Provider implementation (fscontext.jar and 
+providerutil.jar) and assume to find both jars in the directory trunk/lib/ext. 
+For donwload please go to http://java.sun.com/products/jndi/downloads/index.html,
+click the Download button at 'Download JNDI 1.2.1 & More', accept a license 
+agreement, download 'File System Service Provider, 1.2 Beta 3' and then unpack
+the downloaded zip. It includes the jars fscontext.jar and providerutil.jar.
 
 - JPOX
 The Reference Implementation for JDO 2.0 is JPOX. To run tck20 you must
@@ -67,7 +66,8 @@
   cp jpox-c3p0-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-c3p0-SNAPSHOT.jar
   cp jpox-dbcp-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-dbcp-SNAPSHOT.jar
 
-Finally, you must download c3p0-0.9.0-pre6.bin.zip, unzip it and copy c3p0-0.9.0-pre6.jar
to $HOME/.maven/repository/c3p0/jars.
+Finally, you must download c3p0-0.9.0-pre6.bin.zip, unzip it and copy 
+c3p0-0.9.0-pre6.jar to $HOME/.maven/repository/c3p0/jars.
 
 - derby
 To use Derby as the datastore for tck20, download version 10.0.2.1 from

Modified: incubator/jdo/trunk/fostore20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/fostore20/project.properties?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/fostore20/project.properties (original)
+++ incubator/jdo/trunk/fostore20/project.properties Mon Jul 18 14:40:32 2005
@@ -31,9 +31,10 @@
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
 logging.jarfile = ${pom.getDependencyPath('commons-logging')}
-# JNDI implementation
-jndi = ${basedir}/fscontext.jar${path.separator}${basedir}/providerutil.jar
 xmlparser = 
+
+# jndi dependencies
+jndi = ${basedir}/../lib/ext/fscontext.jar${path.separator}${basedir}/../lib/ext/providerutil.jar
 
 jdo.testclasses.dir = ${maven.build.dir}/test-classes
 jdo.pcclasses.jarfile = ${maven.build.dir}/test-classes/pcclasses.jar

Modified: incubator/jdo/trunk/fostore20/test/conf/jndi.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/fostore20/test/conf/jndi.properties?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/fostore20/test/conf/jndi.properties (original)
+++ incubator/jdo/trunk/fostore20/test/conf/jndi.properties Mon Jul 18 14:40:32 2005
@@ -14,4 +14,3 @@
 # limitations under the License.
 
 java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory
-java.naming.provider.url=file:.

Modified: incubator/jdo/trunk/ri11/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/project.properties?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/ri11/project.properties (original)
+++ incubator/jdo/trunk/ri11/project.properties Mon Jul 18 14:40:32 2005
@@ -33,9 +33,10 @@
 antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
 jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
 logging.jarfile = ${pom.getDependencyPath('commons-logging')}
-# JNDI implementation
-jndi = ${basedir}/fscontext.jar${path.separator}${basedir}/providerutil.jar
 xmlparser =
+
+# jndi dependencies
+jndi = ${basedir}/../lib/ext/fscontext.jar${path.separator}${basedir}/../lib/ext/providerutil.jar
 
 jdo.antlr.src.dir = ${basedir}/src/java/org/apache/jdo/impl/jdoql/jdoqlc
 jdo.testclasses.dir = ${maven.build.dir}/test-classes

Modified: incubator/jdo/trunk/ri11/test/conf/jndi.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/test/conf/jndi.properties?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/ri11/test/conf/jndi.properties (original)
+++ incubator/jdo/trunk/ri11/test/conf/jndi.properties Mon Jul 18 14:40:32 2005
@@ -14,4 +14,3 @@
 # limitations under the License.
 
 java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory
-java.naming.provider.url=file:.

Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Mon Jul 18 14:40:32 2005
@@ -82,7 +82,7 @@
 collections.jarfile = ${pom.getDependencyPath('commons-collections')}
 
 # jndi dependencies
-jndi = ${basedir}/lib/ext/fscontext.jar${path.separator}${basedir}/lib/ext/providerutil.jar
+jndi = ${basedir}/../lib/ext/fscontext.jar${path.separator}${basedir}/../lib/ext/providerutil.jar
 
 jdo.tck.pcclasses.sources = \
     org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java \

Modified: incubator/jdo/trunk/tck20/test/conf/alltests.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/alltests.conf?rev=219570&r1=219569&r2=219570&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/alltests.conf (original)
+++ incubator/jdo/trunk/tck20/test/conf/alltests.conf Mon Jul 18 14:40:32 2005
@@ -150,6 +150,14 @@
 org.apache.jdo.tck.api.persistencemanagerfactory.Close \
 org.apache.jdo.tck.api.persistencemanagerfactory.CloseFailsIfTransactionActive \
 org.apache.jdo.tck.api.persistencemanagerfactory.CloseWithoutPermissionThrowsSecurityException
\
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFile \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFileAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResource \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResourceAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStream \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStreamAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocation \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocationAndClassLoader \
 org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManager \
 org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerFactoryByPropertiesInstance
\
 org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerForUser \
@@ -346,13 +354,5 @@
 org.apache.jdo.tck.transactions.SetRetainValuesCalledDuringTxCompletion \
 org.apache.jdo.tck.transactions.SetRetainValuesTrueWhenNotSupported \
 org.apache.jdo.tck.transactions.SetSynchronization \
-org.apache.jdo.tck.transactions.SetSynchronizationToNull \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFile \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFileAndClassLoader \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResource \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResourceAndClassLoader \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStream \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStreamAndClassLoader \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocation \
-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocationAndClassLoader 
+org.apache.jdo.tck.transactions.SetSynchronizationToNull
 



Mime
View raw message