Changeset 7437

Timestamp:

05/02/08 22:12:02 (5 years ago)

Author:

stedwar2

Message:

Fixed the search path setup to support an overriding library
of wavedev components.

Files:

• ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/OWDPlugin.java (modified) (2 diffs)

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/OWDPlugin.java

@@ -119 +119 @@
                         Properties pythonParams = new Properties();
                         pythonParams.setProperty("python.path",
-                                        getPluginFolder() + "/WaveDev"
-                                        + System.getProperty("path.separator")
-                                        + getPluginFolder() + "/PythonSrc"
-                                        + System.getProperty("path.separator")
-                                        + getPluginFolder());
+                            getPluginFolder() + "/PythonSrc"
+                + System.getProperty("path.separator")
+                + getPluginFolder() + "/PythonSrc/WaveDev/wavedev"
+                + System.getProperty("path.separator")
+                + getPluginFolder()
+                + System.getProperty("path.separator")
+                + getPluginFolder() + "/WaveDev/wavedev");
                         pythonParams.setProperty(
                             "python.home", getPluginFolder() + "/jython2.2.1");
@@ -132 +134 @@
                         try
                         {
-                                interpreter.exec(
-                                    "from PythonSrc.MainFrameGlue import MainFrameGlue");
+                            // Patch the PythonSrc versions of WaveDev and WaveDev.wavedev
+                            // so that Jython will also search the OSSIE dirs, but
+                            // we can override OSSIE modules with our own versions
+                            // when necessary.
+                interpreter.exec(
+                    "import WaveDev\n"
+                    + "WaveDev.__path__.append('"
+                    + getPluginFolder() + "/WaveDev')"
+                    // + "\nprint 'WaveDev.__path__ = ', WaveDev.__path__"
+                    );
+                interpreter.exec(
+                    "import WaveDev.wavedev\n"
+                    + "WaveDev.wavedev.__path__.append('"
+                    + getPluginFolder() + "/WaveDev/wavedev')"
+                    // + "\nprint 'WaveDev.wavedev.__path__ = ', "
+                    // + "WaveDev.wavedev.__path__"
+                    );
+                interpreter.exec(
+                    "from MainFrameGlue import MainFrameGlue");
                         }
                         catch (Exception e)