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

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

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

Modified Files:
	PyServlet.java 
Log Message:
Added search of <context>/WEB-INF/lib and <context>/WEB-INF/classes for
java packages.



Index: PyServlet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PyServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PyServlet.java	2001/02/10 11:12:13	1.3
--- PyServlet.java	2001/02/13 09:58:03	1.4
***************
*** 79,82 ****
--- 79,97 ----
                                               "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]);
***************
*** 149,157 ****
              end = path.length();
          String name = path.substring(start, end);
- 
- //        PyString dir = new PyString(file.getParent());
- //        PySystemState sys = Py.getSystemState();
- //        if (!sys.path.__contains__(dir))
- //           sys.path.append(dir);
  
          try {
--- 164,167 ----