Index: project.properties
===================================================================
--- project.properties	(revision 381775)
+++ project.properties	(working copy)
@@ -77,9 +77,6 @@
 pool.jarfile = ${pom.getDependencyPath('commons-pool')}
 collections.jarfile = ${pom.getDependencyPath('commons-collections')}
 
-# jndi dependencies
-jndi = ${basedir}/../lib/ext/fscontext.jar${path.separator}${basedir}/../lib/ext/providerutil.jar
-
 # jpox dependencies
 
 jdo.tck.pcclasses.sources = \
Index: maven.xml
===================================================================
--- maven.xml	(revision 381775)
+++ maven.xml	(working copy)
@@ -604,6 +604,11 @@
         <fileset dir="${basedir}/iut_jars" includes="*.jar"/>
     </path>
 
+    <!-- Jar files for third party libraries, including JNDI -->
+    <path id="jndi" >
+        <fileset dir="${basedir}/../lib/ext" includes="*.jar"/>
+    </path>
+
     <!-- Jar files for the Reference Implementation -->
     <path id="jdo.jdori.classpath">
         <pathelement location="${jpox.jdori.jarfile}" />
@@ -658,7 +663,7 @@
         <!-- Jar files for connection pooling -->
         <path refid="jdo.connectionpooling.classpath" />
         <!-- Jar files for jndi -->
-        <pathelement path="${jndi}"/>
+        <path refid="jndi"/>
         <!-- Jar files for database -->
         <pathelement location="${derby.jarfile}" />
     </path>