07-18-05 10:45 PM
Hi, Michael,
This looks good to me.
-- Michelle
Michael Bouschen wrote:
> Hi Craig,
>
>
>
> There are three subprojects having a JNDI related test case: ri11,
> fostore20 and tck20. All of them need an JNDI implementation (e.g.
> providerutil.jar and fscontext.jar) and it would be best to store them
> in a directory that is available for all subprojects. I propose
> putting them under trunk/lib/ext instead of trunk/tck20/lib/ext.
>
> Attached you find a patch for review. I changed the project.properties
> in ri11, fostore20 and tck20 to refer to ../lib/ext. I also updated
> the JNDI section in README.txt. What do you think?
>
>
>
> I removed java.naming.provider.url=file:. from all the jndi.properties.
>
> Regards Michael
>
>
>
>------------------------------------------------------------------------
>
>Index: tck20/test/conf/alltests.conf
> ========================================
===========================
>--- tck20/test/conf/alltests.conf (revision 219378)
>+++ tck20/test/conf/alltests.conf (working copy)
>@@ -150,6 +150,14 @@
> org.apache.jdo.tck.api.persistencemanagerfactory.Close \
> org.apache.jdo.tck.api.persistencemanagerfactory.CloseFailsIfTransactionAc
tive \
> org.apache.jdo.tck.api.persistencemanagerfactory.CloseWithoutPermissionThr
owsSecurityException \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFile \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFileAndClassLoade
r \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResource \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResourceAndClassL
oader \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStream \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStreamAndClassLoa
der \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocation \
>+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocationAndCl
assLoader \
> org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManager \
> org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerFact
oryByPropertiesInstance \
> org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerForU
ser \
>@@ -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.GetPMFByFileAndClassLoade
r \
>-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResource \
>-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResourceAndClassL
oader \
>-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStream \
>-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStreamAndClassLoa
der \
>-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocation \
>-org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocationAndCl
assLoader
>+org.apache.jdo.tck.transactions.SetSynchronizationToNull
>
>Index: tck20/project.properties
> ========================================
===========================
>--- tck20/project.properties (revision 219378)
>+++ tck20/project.properties (working copy)
>@@ -82,7 +82,7 @@
> collections.jarfile = ${pom.getDependencyPath('commons-collections')}
>
> # jndi dependencies
>-jndi = ${basedir}/lib/ext/fscontext.jar${path.separator}${b
asedir}/lib/ext/providerutil.jar
>+jndi = ${basedir}/../lib/ext/fscontext.jar${path.separator}$
3;basedir}/../lib/ext/providerutil.jar
>
> jdo.tck.pcclasses.sources = \
> org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java \
>Index: fostore20/test/conf/jndi.properties
> ========================================
===========================
>--- fostore20/test/conf/jndi.properties (revision 219378)
>+++ fostore20/test/conf/jndi.properties (working copy)
>@@ -14,4 +14,3 @@
> # limitations under the License.
>
> java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory
>-java.naming.provider.url=file:.
>Index: fostore20/project.properties
> ========================================
===========================
>--- fostore20/project.properties (revision 219378)
>+++ fostore20/project.properties (working copy)
>@@ -31,10 +31,11 @@
> antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
> jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jt
a')}
> 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}$
3;basedir}/../lib/ext/providerutil.jar
>+
> jdo.testclasses.dir = ${maven.build.dir}/test-classes
> jdo.pcclasses.jarfile = ${maven.build.dir}/test-classes/pcclasses.jar
> jdo.testclasses.jarfile = ${maven.build.dir}/test-classes/jdo-ri-test
s.jar
>Index: btree/project.properties
> ========================================
===========================
>--- btree/project.properties (revision 219378)
>+++ btree/project.properties (working copy)
>@@ -20,9 +20,9 @@
> # http://www.netbeans.org/community/sources for more info.
> # If you are inside SWAN you can use a proxy cvsnetbeansorg.sfbay.sun.com.
>
>-netbeans.cvsroot=:pserver:anoncvs@cvs.netbeans.org:/cvs
>+#netbeans.cvsroot=:pserver:anoncvs@cvs.netbeans.org:/cvs
> # SWAN proxy
>-#netbeans.cvsroot=:pserver:anoncvs@cvsnetbeansorg.sfbay.sun.com:/cvs
>+netbeans.cvsroot=:pserver:anoncvs@cvsnetbeansorg.sfbay.sun.com:/cvs
>
> # We need btree sources that compile with -target 1.3,
> # so use a specific btree version
>Index: README.txt
> ========================================
===========================
>--- README.txt (revision 219378)
>+++ README.txt (working copy)
>@@ -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.properti
es
>-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 F
ile
>-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, downlo
ad
>-'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 implementatio
n.
>+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 fil
e
>+test/conf/jndi.properties defining all the necessary properties of the JND
I
>+implemenation. The default setting in project.properties and jndi.properti
es
>+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/d...x.html
,
>+click the Download button at 'Download JNDI 1.2.1 & More', accept a licens
e
>+agreement, download 'File System Service Provider, 1.2 Beta 3' and then un
pack
>+the downloaded zip. It includes the jars fscontext.jar and providerutil.ja
r.
>
> - 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-S
NAPSHOT.jar
> cp jpox-dbcp-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-dbcp-S
NAPSHOT.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
>Index: ri11/test/conf/jndi.properties
> ========================================
===========================
>--- ri11/test/conf/jndi.properties (revision 219378)
>+++ ri11/test/conf/jndi.properties (working copy)
>@@ -14,4 +14,3 @@
> # limitations under the License.
>
> java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory
>-java.naming.provider.url=file:.
>Index: ri11/project.properties
> ========================================
===========================
>--- ri11/project.properties (revision 219378)
>+++ ri11/project.properties (working copy)
>@@ -33,10 +33,11 @@
> antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
> jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jt
a')}
> 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}$
3;basedir}/../lib/ext/providerutil.jar
>+
> jdo.antlr.src.dir = ${basedir}/src/java/org/apache/jdo/impl/jdoql/jdo
qlc
> jdo.testclasses.dir = ${maven.build.dir}/test-classes
> jdo.pcclasses.jarfile = ${maven.build.dir}/test-classes/pcclasses.jar
>
>
>
[ Post a follow-up to this message ]
| 
