[Jython-checkins] CVS: jython/org/python/util PyServlet.java,1.4,1.5

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/util
In directory usw-pr-cvs1:/tmp/cvs-serv29529

Modified Files:
	PyServlet.java 
Log Message:
Search the <context>/WEB-INF/lib & classes for java packages independent
of python.home.



Index: PyServlet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PyServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** PyServlet.java	2001/02/13 09:58:03	1.4
--- PyServlet.java	2001/02/14 09:17:21	1.5
***************
*** 79,98 ****
                                               "WEB-INF" + File.separator +
                                               "lib");
  
!             props.setProperty("python.packages.directories",
!                               "java.ext.dirs,pyservlet.lib");
!             props.setProperty("pyservlet.lib",
!                               rootPath + File.separator +
!                               "WEB-INF" + File.separator +
!                               "lib");
  
!             props.setProperty("python.packages.paths",
!                               "java.class.path,sun.boot.class.path,"+
!                               "pyservlet.classes");
!             props.setProperty("pyservlet.classes",
!                               rootPath + File.separator +
!                               "WEB-INF" + File.separator +
!                               "classes");
!         }
          PythonInterpreter.initialize(System.getProperties(), props, new String[0]);
          reset();
--- 79,99 ----
                                               "WEB-INF" + File.separator +
                                               "lib");
+         }
  
!         props.setProperty("python.packages.directories",
!                           "java.ext.dirs,pyservlet.lib");
!         props.setProperty("pyservlet.lib",
!                           rootPath + File.separator +
!                           "WEB-INF" + File.separator +
!                           "lib");
  
!         props.setProperty("python.packages.paths",
!                           "java.class.path,sun.boot.class.path,"+
!                           "pyservlet.classes");
!         props.setProperty("pyservlet.classes",
!                           rootPath + File.separator +
!                           "WEB-INF" + File.separator +
!                           "classes");
!  
          PythonInterpreter.initialize(System.getProperties(), props, new String[0]);
          reset();