You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/03/01 04:35:31 UTC
svn commit: r513119 - in
/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config:
DirFinder.java Finder.java JarFinder.java
Author: smishura
Date: Wed Feb 28 19:35:31 2007
New Revision: 513119
URL: http://svn.apache.org/viewvc?view=rev&rev=513119
Log:
Fix jndi module compilation
Modified:
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/DirFinder.java
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/Finder.java
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/JarFinder.java
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/DirFinder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/DirFinder.java?view=diff&rev=513119&r1=513118&r2=513119
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/DirFinder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/DirFinder.java Wed Feb 28 19:35:31 2007
@@ -44,7 +44,7 @@
protected void doSearch() {
for (Iterator iter = super.allObjects.iterator(); iter.hasNext();) {
File element = (File) iter.next();
- if (element.getAbsolutePath().endsWith(ClassFinder.cFile)) {
+ if (element.getAbsolutePath().endsWith(Finder.cFile)) {
foundThis(element.getAbsoluteFile());
}
}
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/Finder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/Finder.java?view=diff&rev=513119&r1=513118&r2=513119
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/Finder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/Finder.java Wed Feb 28 19:35:31 2007
@@ -31,6 +31,12 @@
public abstract class Finder {
/**
+ * relative path to the Configuration File
+ */
+ public static final String cFile = "META-INF" + File.separator + "services"
+ + File.separator + "javax.naming.ldap.StartTlsResponse";
+
+ /**
* In order to store the found objects
*/
protected List foundObjects;
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/JarFinder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/JarFinder.java?view=diff&rev=513119&r1=513118&r2=513119
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/JarFinder.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/tls/config/JarFinder.java Wed Feb 28 19:35:31 2007
@@ -69,14 +69,14 @@
try {
jarFile = new JarFile(element);
entry = jarFile
- .getJarEntry(ClassFinder.cFile);
+ .getJarEntry(Finder.cFile);
} catch (IOException e) {
}
if (entry != null) {
foundThis(element.getAbsoluteFile());
} else {
throw new Exception(
- ClassFinder.cFile + Messages.getString("ldap.23")
+ Finder.cFile + Messages.getString("ldap.23")
+ element.getAbsolutePath());
}
}