svn commit: r1721155 - in /turbine/core/trunk: pom.xml src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java

[tv]

Author: tv
Date: Mon Dec 21 13:42:33 2015
New Revision: 1721155

URL: http://svn.apache.org/viewvc?rev=1721155&view=rev
Log:
Update dependencies

Modified:
    turbine/core/trunk/pom.xml
    
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java

Modified: turbine/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1721155&r1=1721154&r2=1721155&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Mon Dec 21 13:42:33 2015
@@ -807,13 +807,13 @@
     <dependency>
        <groupId>commons-codec</groupId>
        <artifactId>commons-codec</artifactId>
-      <version>1.8</version>
+      <version>1.10</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.2</version>
       <type>jar</type>
     </dependency>
     <dependency>
@@ -843,13 +843,13 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>1.2</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.8.3</version>
+      <version>1.9.2</version>
       <type>jar</type>
     </dependency>
     <dependency>
@@ -932,14 +932,6 @@
             <groupId>avalon-logkit</groupId>
             <artifactId>avalon-logkit</artifactId>
         </exclusion>
-         <exclusion>
-           <groupId>commons-configuration</groupId>
-           <artifactId>commons-configuration</artifactId>
-         </exclusion>
-         <exclusion>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -964,12 +956,6 @@
       <version>2.2.1</version>
       <type>jar</type>
       <optional>true</optional>
-       <exclusions>
-        <exclusion>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.containerkit</groupId>
@@ -979,9 +965,9 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jython</groupId>
+      <groupId>org.python</groupId>
       <artifactId>jython</artifactId>
-      <version>2.1</version>
+      <version>2.7.0</version>
       <type>jar</type>
       <optional>true</optional>
     </dependency>
@@ -1033,34 +1019,14 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.15</version>
+      <version>1.2.17</version>
       <type>jar</type>
-      <exclusions>
-        <exclusion>
-            <groupId>com.sun.jdmk</groupId>
-            <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-            <groupId>com.sun.jmx</groupId>
-            <artifactId>jmxri</artifactId>
-        </exclusion>
-        <exclusion>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>1.7</version>
       <type>jar</type>
-      <exclusions>
-        <exclusion>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java?rev=1721155&r1=1721154&r2=1721155&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
 Mon Dec 21 13:42:33 2015
@@ -99,10 +99,12 @@ public abstract class PythonBaseFactory<
 
         if (f.exists())
         {
+            PythonInterpreter interp = null;
+
             try
             {
                 // We try to open the Py Interpreter
-                PythonInterpreter interp = new PythonInterpreter();
+                interp = new PythonInterpreter();
 
                 // Make sure the Py Interpreter use the right classloader
                 // This is necessary for servlet engines generally has
@@ -111,8 +113,7 @@ public abstract class PythonBaseFactory<
                 // load java package
                 // org.apache.turbine.services.assemblerbroker.util.python;
                 // the new classes to it as well.
-                Py.getSystemState().setClassLoader(
-                        this.getClass().getClassLoader());
+                
Py.getSystemState().setClassLoader(this.getClass().getClassLoader());
 
                 // We import the Python SYS module. Now we don't need to do 
this
                 // explicitly in the script.  We always use the sys module to
@@ -154,6 +155,13 @@ public abstract class PythonBaseFactory<
                 log.error("PYTHON SCRIPT SCREEN LOADER ERROR:", e);
                 throw e;
             }
+            finally
+            {
+                if (interp != null)
+                {
+                    interp.close();
+                }
+            }
         }
         return assembler;
     }