[Jython-checkins] SF.net SVN: jython:[6068] branches/modjy/src/com/xhaus/modjy/ModjyJServlet. java

[<am...@us...>]

Revision: 6068
          http://jython.svn.sourceforge.net/jython/?rev=6068&view=rev
Author:   amak
Date:     2009-03-05 15:43:01 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Modification to the ModjyJServlet to reflect that it is now part of the jython distribution, rather than a standalone product.

Modified Paths:
--------------
    branches/modjy/src/com/xhaus/modjy/ModjyJServlet.java

Modified: branches/modjy/src/com/xhaus/modjy/ModjyJServlet.java
===================================================================
--- branches/modjy/src/com/xhaus/modjy/ModjyJServlet.java	2009-03-05 13:18:55 UTC (rev 6067)
+++ branches/modjy/src/com/xhaus/modjy/ModjyJServlet.java	2009-03-05 15:43:01 UTC (rev 6068)
@@ -84,12 +84,12 @@
 			PythonInterpreter.initialize(System.getProperties(), props, new String[0]);
 			PySystemState systemState = new PySystemState();
 			interp = new PythonInterpreter(null, systemState);
-			String modjyJarLocation = setupEnvironment(interp, props, systemState);
+			setupEnvironment(interp, props, systemState);
 			try
-				{ interp.exec("from modjy import "+MODJY_PYTHON_CLASSNAME); }
+				{ interp.exec("from modjy.modjy import "+MODJY_PYTHON_CLASSNAME); }
 			catch (PyException ix)
-				{ throw new ServletException("Unable to import '"+MODJY_PYTHON_CLASSNAME+"' from "+modjyJarLocation+
-					": do you maybe need to set the 'modjy_jar.location' parameter?", ix);}
+				{ throw new ServletException("Unable to import '"+MODJY_PYTHON_CLASSNAME+
+					"': maybe you need to set the 'python.home' parameter?", ix);}
 			PyObject pyServlet = ((PyType)interp.get(MODJY_PYTHON_CLASSNAME)).__call__();
 			Object temp = pyServlet.__tojava__(HttpServlet.class);
 			if (temp == Py.NoConversion)
@@ -128,43 +128,12 @@
 	* @returns A String giving the path to the modjy.jar file (which is used only for error reporting)
 	*/
 
-	protected String setupEnvironment(PythonInterpreter interp, Properties props, PySystemState systemState)
+	protected void setupEnvironment(PythonInterpreter interp, Properties props, PySystemState systemState)
 	{
-		String modjyJarLocation = locateModjyJar(props);
-		systemState.path.append(new PyString(modjyJarLocation));
 		processPythonLib(interp, systemState);
-		return modjyJarLocation;
 	}
 
 	/**
-	* Find out the location of "modjy.jar", so that it can
-	* be added to the sys.path and thus imported
-	*
-	* @param The properties from which config options are found
-	* @returns A String giving the path to the modjy.jar file
-	*/
-
-	protected String locateModjyJar ( Properties props )
-	{
-		// Give priority to modjy_jar.location
-		if (props.get("modjy_jar.location") != null)
-			return (String)props.get("modjy_jar.location");
-		// Then try to find it in WEB-INF/lib
-		String location = getServletContext().getRealPath("/WEB-INF/lib/modjy.jar");
-		if (location != null)
-		{
-			File f = new File(location);
-			if (f.exists())
-				return location;
-		}
-		// Try finding the archive that this class was loaded from
-		try
-			{ return this.getClass().getProtectionDomain().getCodeSource().getLocation().getFile(); }
-		catch (Exception x)
-			{ return null;}
-	}
-
-	/**
 	* Do all processing in relation to the lib-python subdirectory of WEB-INF
 	*
 	* @param interp - The PythinInterpreter used to service requests


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.