remm 01/03/14 21:34:56
Modified: catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
- Add org.apache.naming as a prefix in the
javax.naming.Context.URL_PKG_PREFIXES property.
Revision Changes Path
1.17 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Catalina.java 2001/02/26 03:52:47 1.16
+++ Catalina.java 2001/03/15 05:34:56 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.16 2001/02/26 03:52:47 glenn Exp $
- * $Revision: 1.16 $
- * $Date: 2001/02/26 03:52:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.17 2001/03/15 05:34:56 remm Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/03/15 05:34:56 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.16 $ $Date: 2001/02/26 03:52:47 $
+ * @version $Revision: 1.17 $ $Date: 2001/03/15 05:34:56 $
*/
public class Catalina {
@@ -673,7 +673,7 @@
String oldValue =
System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
if (oldValue != null) {
- value = oldValue + ":" + value;
+ value = value + ":" + oldValue;
}
System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, value);
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,