Issue #24 - merging jep changes into git thinclient branch.

Former-commit-id: 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac
2012-01-23 13:25:11 -06:00 · 2012-01-23 13:25:11 -06:00 · cf4d56d0a0
commit cf4d56d0a0
parent ff44a81ceb
21 changed files with 2297 additions and 1387 deletions
--- a/cots/org.jep.linux32/libjep.so
+++ b/cots/org.jep.linux32/libjep.so
--- a/cots/org.jep.linux64/libjep.so
+++ b/cots/org.jep.linux64/libjep.so
--- a/cots/org.jep.win32/jep.dll
+++ b/cots/org.jep.win32/jep.dll
--- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyembed.c
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyembed.c
@ -505,6 +505,7 @@ static PyObject* pyembed_jimport(PyObject* self, PyObject *arg) {
    PyObject     *pvalue = NULL;
    PyObject     *ptrace = NULL;
    char *cname;
+	jstring member;

    jepThread = pyembed_get_jepthread();
    if(!jepThread) {
@ -552,7 +553,7 @@ static PyObject* pyembed_jimport(PyObject* self, PyObject *arg) {
 			}
 		}

-		jstring member = (*env)->NewStringUTF(env, cname);
+		member = (*env)->NewStringUTF(env, cname);

 		Py_UNBLOCK_THREADS;
 		objclazz = (jclass) (*env)->CallObjectMethod(env,
@ -1542,11 +1543,15 @@ void pyembed_setnumeric_array(JNIEnv *env,
    PyThreadState *prevThread;
    PyObject      *pymodule;

+	jclass floatArrayClass;
+	jclass intArrayClass;
+	jclass byteArrayClass;
+
    GET_COMMON;

-    jclass floatArrayClass = (*env)->FindClass(env, "[F");
-    jclass intArrayClass = (*env)->FindClass(env, "[I");
-    jclass byteArrayClass = (*env)->FindClass(env, "[B");
+    floatArrayClass = (*env)->FindClass(env, "[F");
+    intArrayClass = (*env)->FindClass(env, "[I");
+    byteArrayClass = (*env)->FindClass(env, "[B");

    if(obj == NULL) {
        Py_INCREF(Py_None);
--- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjclass.c
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjclass.c
@ -136,7 +136,7 @@ PyJclass_Object* pyjclass_new(JNIEnv *env, PyObject *pyjob) {

    // caching below added by njensen
    pyc->numArgsPerConstructor = malloc(sizeof(int) * pyc->initLen);
-    pyc->constructorArgTypes = (int *) malloc(sizeof(int*) * pyc->initLen);
+    pyc->constructorArgTypes = (int **) malloc(sizeof(int*) * pyc->initLen);
    for(i = 0; i < pyc->initLen; i++) {
        jmethodID     methodId;

@ -247,6 +247,7 @@ PyObject* pyjclass_call(PyJclass_Object *self,
    jvalue        *jargs       = NULL;
    int            foundArray  = 0;
    PyThreadState *_save;
+	int pyArgLength;

    classCallCount = classCallCount + 1;
    if(!PyTuple_Check(args)) {
@ -269,7 +270,7 @@ PyObject* pyjclass_call(PyJclass_Object *self,


    // njensen changed below to use cached constructor arguments
-    int pyArgLength = PyTuple_Size(args);
+    pyArgLength = PyTuple_Size(args);
    for(initPos = 0; initPos < self->initLen; initPos++) {
    	jmethodID     methodId;

--- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethod.c
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethod.c
@ -441,7 +441,7 @@ PyObject* pyjmethod_call_internal(PyJmethod_Object *self,
    JNIEnv        *env        = NULL;
    int            pos        = 0;
    jvalue        *jargs      = NULL;
-    int 			jrelease[self->lenParameters];  // added by njensen
+    int 		   *jrelease;  // added by njensen
    int            foundArray = 0;   /* if params includes pyjarray instance */
    PyThreadState *_save;
    
@ -471,6 +471,7 @@ PyObject* pyjmethod_call_internal(PyJmethod_Object *self,
    }

    jargs = (jvalue *) PyMem_Malloc(sizeof(jvalue) * self->lenParameters);
+	jrelease = (int *) PyMem_Malloc(sizeof(int) * self->lenParameters);
    
    // ------------------------------ build jargs off python values

--- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethodwrapper.c
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjmethodwrapper.c
@ -94,6 +94,7 @@ static PyObject* pyjmethodwrapper_call(PyJmethodWrapper_Object *self,
                                PyObject *args,
                                PyObject *keywords) {
    PyObject *ret;
+	PyJobject_Object* obj;
    
    if(!PyTuple_Check(args)) {
        PyErr_Format(PyExc_RuntimeError, "args is not a valid tuple");
@ -105,7 +106,7 @@ static PyObject* pyjmethodwrapper_call(PyJmethodWrapper_Object *self,
        return NULL;
    }

-    PyJobject_Object* obj = self->object;
+    obj = self->object;
    ret = pyjobject_find_method(obj, self->method->pyMethodName, args);
    Py_XDECREF(obj);
    Py_DECREF(self);
--- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/pyjobject.c
--- a/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/util.c
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/src/jep/util.c
@ -1386,11 +1386,12 @@ jvalue convert_pynumpyarg_jvalue(JNIEnv *env,
                            int paramTypeId,
                            int pos) {
    jvalue ret;
-    ret.l = NULL;
-
-	jarray arr = NULL;
+	jarray arr;
 	jclass arrclazz;

+    ret.l = NULL;
+	arr = NULL;
+
 	if(param != Py_None && !pyjarray_check(param)) {
 		// this pyarray -> jarray added by njensen
 		initUtil();
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/Active/_DELETE_ME_
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/Active/_DELETE_ME_
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/UpgradeLog.XML
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/UpgradeLog.XML
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
+<Properties><Property Name="Solution" Value="jep">
+</Property><Property Name="Solution File" Value="C:\Users\Bryan Kowal\Documents\jepp\rary.cots.jepp\jepp-2.3\windows\jep.sln">
+</Property><Property Name="Date" Value="Tuesday, January 03, 2012">
+</Property><Property Name="Time" Value="16:17:13 PM">
+</Property></Properties><Event ErrorLevel="1" Project="jep" Source="jep.vcproj" Description="The C/C++ compiler switch /YX is lo longer supported. /YX has been removed from your project settings.">
+</Event><Event ErrorLevel="0" Project="jep" Source="jep.vcproj" Description="Web deployment to the local IIS server is no longer supported. The Web Deployment build tool has been removed from your project settings.">
+</Event><Event ErrorLevel="0" Project="jep" Source="jep.vcproj" Description="Visual C++ now provides improved safety in its C and C++ Libraries. This includes new and improved functions, additional checking and validation, and internal design changes. These libraries are turned on by default. You may see some warnings about unsafe functions or parameters when you build your project. The warnings will generally suggest an alternative safer coding style or function. It is advised that you correct these warnings, in order to make your code more safe. Full details can be found in the documentation by searching for 'Security Enhancements in the CRT' and for 'Checked Iterators'.">
+</Event><Event ErrorLevel="0" Project="jep" Source="jep.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
+</Event><Event ErrorLevel="1" Project="jep" Source="jep.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are now automatically built with the Manifest Tool.  You may need to change your build in order for it to work correctly. For instance, it is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line may need to be commented out before the project will build correctly.">
+</Event><Event ErrorLevel="1" Project="jep" Source="jep.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
+</Event><Event ErrorLevel="1" Project="jep" Source="jep.vcproj" Description="This application has been updated to include settings related to the User Account Control (UAC) feature of Windows Vista. By default, when run on Windows Vista with UAC enabled, this application is marked to run with the same privileges as the process that launched it. This marking also disables the application from running with virtualization. You can change UAC related settings from the Property Pages of the project.">
+</Event><Event ErrorLevel="0" Project="jep" Source="jep.vcproj" Description="Project file successfully backed up as 'C:\Users\Bryan Kowal\Documents\jepp\rary.cots.jepp\jepp-2.3\windows\jep.vcproj.7.10.old'.">
+</Event><Event ErrorLevel="0" Project="jep" Source="jep.vcproj" Description="Project upgraded successfully.">
+</Event><Event ErrorLevel="3" Project="jep" Source="jep.vcproj" Description="Converted">
+</Event></UpgradeLog>
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport.css
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport.css
@ -0,0 +1,207 @@
+BODY
+{
+	BACKGROUND-COLOR: white;
+	FONT-FAMILY: "Verdana", sans-serif;
+	FONT-SIZE: 100%;
+	MARGIN-LEFT: 0px;
+	MARGIN-TOP: 0px
+}
+P
+{
+	FONT-FAMILY: "Verdana", sans-serif;
+	FONT-SIZE: 70%;
+	LINE-HEIGHT: 12pt;
+	MARGIN-BOTTOM: 0px;
+	MARGIN-LEFT: 10px;
+	MARGIN-TOP: 10px
+}
+.note
+{
+	BACKGROUND-COLOR:  #ffffff;
+	COLOR: #336699;
+	FONT-FAMILY: "Verdana", sans-serif;
+	FONT-SIZE: 100%;
+	MARGIN-BOTTOM: 0px;
+	MARGIN-LEFT: 0px;
+	MARGIN-TOP: 0px;
+	PADDING-RIGHT: 10px
+}
+.infotable
+{
+	BACKGROUND-COLOR: #f0f0e0;
+	BORDER-BOTTOM: #ffffff 0px solid;
+	BORDER-COLLAPSE: collapse;
+	BORDER-LEFT: #ffffff 0px solid;
+	BORDER-RIGHT: #ffffff 0px solid;
+	BORDER-TOP: #ffffff 0px solid;
+	FONT-SIZE: 70%;
+	MARGIN-LEFT: 10px
+}
+.issuetable
+{
+	BACKGROUND-COLOR: #ffffe8;
+	BORDER-COLLAPSE: collapse;
+	COLOR: #000000;
+	FONT-SIZE: 100%;
+	MARGIN-BOTTOM: 10px;
+	MARGIN-LEFT: 13px;
+	MARGIN-TOP: 0px
+}
+.issuetitle
+{
+	BACKGROUND-COLOR: #ffffff;
+	BORDER-BOTTOM: #dcdcdc 1px solid;
+	BORDER-TOP: #dcdcdc 1px;
+	COLOR: #003366;
+	FONT-WEIGHT: normal
+}
+.header
+{
+	BACKGROUND-COLOR: #cecf9c;
+	BORDER-BOTTOM: #ffffff 1px solid;
+	BORDER-LEFT: #ffffff 1px solid;
+	BORDER-RIGHT: #ffffff 1px solid;
+	BORDER-TOP: #ffffff 1px solid;
+	COLOR: #000000;
+	FONT-WEIGHT: bold
+}
+.issuehdr
+{
+	BACKGROUND-COLOR: #E0EBF5;
+	BORDER-BOTTOM: #dcdcdc 1px solid;
+	BORDER-TOP: #dcdcdc 1px solid;
+	COLOR: #000000;
+	FONT-WEIGHT: normal
+}
+.issuenone
+{
+	BACKGROUND-COLOR: #ffffff;
+	BORDER-BOTTOM: 0px;
+	BORDER-LEFT: 0px;
+	BORDER-RIGHT: 0px;
+	BORDER-TOP: 0px;
+	COLOR: #000000;
+	FONT-WEIGHT: normal
+}
+.content
+{
+	BACKGROUND-COLOR: #e7e7ce;
+	BORDER-BOTTOM: #ffffff 1px solid;
+	BORDER-LEFT: #ffffff 1px solid;
+	BORDER-RIGHT: #ffffff 1px solid;
+	BORDER-TOP: #ffffff 1px solid;
+	PADDING-LEFT: 3px
+}
+.issuecontent
+{
+	BACKGROUND-COLOR: #ffffff;
+	BORDER-BOTTOM: #dcdcdc 1px solid;
+	BORDER-TOP: #dcdcdc 1px solid;
+	PADDING-LEFT: 3px
+}
+A:link
+{
+	COLOR: #cc6633;
+	TEXT-DECORATION: underline
+}
+A:visited
+{
+	COLOR: #cc6633;
+}
+A:active
+{
+	COLOR: #cc6633;
+}
+A:hover
+{
+	COLOR: #cc3300;
+	TEXT-DECORATION: underline
+}
+H1
+{
+	BACKGROUND-COLOR: #003366;
+	BORDER-BOTTOM: #336699 6px solid;
+	COLOR: #ffffff;
+	FONT-SIZE: 130%;
+	FONT-WEIGHT: normal;
+	MARGIN: 0em 0em 0em -20px;
+	PADDING-BOTTOM: 8px;
+	PADDING-LEFT: 30px;
+	PADDING-TOP: 16px
+}
+H2
+{
+	COLOR: #000000;
+	FONT-SIZE: 80%;
+	FONT-WEIGHT: bold;
+	MARGIN-BOTTOM: 3px;
+	MARGIN-LEFT: 10px;
+	MARGIN-TOP: 20px;
+	PADDING-LEFT: 0px
+}
+H3
+{
+	COLOR: #000000;
+	FONT-SIZE: 80%;
+	FONT-WEIGHT: bold;
+	MARGIN-BOTTOM: -5px;
+	MARGIN-LEFT: 10px;
+	MARGIN-TOP: 20px
+}
+H4
+{
+	COLOR: #000000;
+	FONT-SIZE: 70%;
+	FONT-WEIGHT: bold;
+	MARGIN-BOTTOM: 0px;
+	MARGIN-TOP: 15px;
+	PADDING-BOTTOM: 0px
+}
+UL
+{
+	COLOR: #000000;
+	FONT-SIZE: 70%;
+	LIST-STYLE: square;
+	MARGIN-BOTTOM: 0pt;
+	MARGIN-TOP: 0pt
+}
+OL
+{
+	COLOR: #000000;
+	FONT-SIZE: 70%;
+	LIST-STYLE: square;
+	MARGIN-BOTTOM: 0pt;
+	MARGIN-TOP: 0pt
+}
+LI
+{
+	LIST-STYLE: square;
+	MARGIN-LEFT: 0px
+}
+.expandable
+{
+	CURSOR: hand
+}
+.expanded
+{
+	color: black
+}
+.collapsed
+{
+	DISPLAY: none
+}
+.foot
+{
+BACKGROUND-COLOR: #ffffff;
+BORDER-BOTTOM: #cecf9c 1px solid;
+BORDER-TOP: #cecf9c 2px solid
+}
+.settings
+{
+MARGIN-LEFT: 25PX;
+}
+.help
+{
+TEXT-ALIGN: right;
+margin-right: 10px;
+}
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport.xslt
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport.xslt
@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl='urn:schemas-microsoft-com:xslt'>
+
+    <xsl:key name="ProjectKey" match="Event" use="@Project" />
+
+    <xsl:template match="Events" mode="createProjects">
+        <projects>
+            <xsl:for-each select="Event">
+                <!--xsl:sort select="@Project" order="descending"/-->
+                <xsl:if test="(1=position()) or (preceding-sibling::*[1]/@Project != @Project)">
+
+                    <xsl:variable name="ProjectName" select="@Project"/>
+
+                    <project>
+                        <xsl:attribute name="name">
+                            <xsl:value-of select="@Project"/>
+                        </xsl:attribute> 
+
+                        <xsl:if test="@Project=''">
+                        <xsl:attribute name="solution">
+                            <xsl:value-of select="@Solution"/>
+                        </xsl:attribute> 
+                        </xsl:if>
+
+                        <xsl:for-each select="key('ProjectKey', $ProjectName)">
+                            <!--xsl:sort select="@Source" /-->
+                            <xsl:if test="(1=position()) or (preceding-sibling::*[1]/@Source != @Source)">
+
+                                <source>
+                                    <xsl:attribute name="name">
+                                        <xsl:value-of select="@Source"/>
+                                    </xsl:attribute>
+
+                                    <xsl:variable name="Source">
+                                        <xsl:value-of select="@Source"/>
+                                    </xsl:variable>
+
+                                    <xsl:for-each select="key('ProjectKey', $ProjectName)[ @Source = $Source ]">
+
+                                        <event>
+                                            <xsl:attribute name="error-level">
+                                                <xsl:value-of select="@ErrorLevel"/>
+                                            </xsl:attribute> 
+                                            <xsl:attribute name="description">
+                                                <xsl:value-of select="@Description"/>
+                                            </xsl:attribute> 
+                                        </event>
+                                    </xsl:for-each>
+                                </source>
+                            </xsl:if>
+                        </xsl:for-each>
+
+                    </project>
+                </xsl:if>
+            </xsl:for-each>
+        </projects>
+    </xsl:template>
+
+    <xsl:template match="projects">
+    <xsl:for-each select="project">
+    <xsl:sort select="@Name" order="ascending"/>
+        <h2>
+        <xsl:if test="@solution"><a _locID="Solution">Solution</a>: <xsl:value-of select="@solution"/></xsl:if>
+        <xsl:if test="not(@solution)"><a _locID="Project">Project</a>: <xsl:value-of select="@name"/>
+            <xsl:for-each select="source">
+                <xsl:variable name="Hyperlink" select="@name"/>
+            <xsl:for-each select="event[@error-level='4']">
+            &#32;<A class="note"><xsl:attribute name="HREF"><xsl:value-of select="$Hyperlink"/></xsl:attribute><xsl:value-of select="@description"/></A>
+                </xsl:for-each>
+            </xsl:for-each>
+        </xsl:if>
+        </h2>
+
+        <table cellpadding="2" cellspacing="0" width="98%" border="1" bordercolor="white" class="infotable">
+            <tr>
+                <td nowrap="1" class="header" _locID="Filename">Filename</td>
+                <td nowrap="1" class="header" _locID="Status">Status</td>
+                <td nowrap="1" class="header" _locID="Errors">Errors</td>
+                <td nowrap="1" class="header" _locID="Warnings">Warnings</td>
+            </tr>
+
+            <xsl:for-each select="source">
+                <xsl:sort select="@name" order="ascending"/>
+                <xsl:variable name="source-id" select="generate-id(.)"/>
+
+                <xsl:if test="count(event)!=count(event[@error-level='4'])">
+
+                <tr class="row">
+                    <td class="content">
+                        <A HREF="javascript:"><xsl:attribute name="onClick">javascript:document.images['<xsl:value-of select="$source-id"/>'].click()</xsl:attribute><IMG border="0" _locID="IMG.alt" _locAttrData="alt"  alt="expand/collapse section" class="expandable" height="11" onclick="changepic()" src="_UpgradeReport_Files/UpgradeReport_Plus.gif" width="9" ><xsl:attribute name="name"><xsl:value-of select="$source-id"/></xsl:attribute><xsl:attribute name="child">src<xsl:value-of select="$source-id"/></xsl:attribute></IMG></A>&#32;<xsl:value-of select="@name"/> 
+                    </td>
+                    <td class="content">
+                        <xsl:if test="count(event[@error-level='3'])=1">
+                            <xsl:for-each select="event[@error-level='3']">
+                            <xsl:if test="@description='Converted'"><a _locID="Converted1">Converted</a></xsl:if>
+                            <xsl:if test="@description!='Converted'"><xsl:value-of select="@description"/></xsl:if>
+                            </xsl:for-each>
+                        </xsl:if>
+                        <xsl:if test="count(event[@error-level='3'])!=1 and count(event[@error-level='3' and @description='Converted'])!=0"><a _locID="Converted2">Converted</a>
+                        </xsl:if>
+                    </td>
+                    <td class="content"><xsl:value-of select="count(event[@error-level='2'])"/></td>
+                    <td class="content"><xsl:value-of select="count(event[@error-level='1'])"/></td>
+                </tr>
+
+                <tr class="collapsed" bgcolor="#ffffff">
+                    <xsl:attribute name="id">src<xsl:value-of select="$source-id"/></xsl:attribute>
+
+                    <td colspan="7">
+                        <table width="97%" border="1" bordercolor="#dcdcdc" rules="cols" class="issuetable">
+                            <tr>
+                                <td colspan="7" class="issuetitle" _locID="ConversionIssues">Conversion Issues - <xsl:value-of select="@name"/>:</td>
+                            </tr>
+
+                            <xsl:for-each select="event[@error-level!='3']">
+                                <xsl:if test="@error-level!='4'">
+                                <tr>
+                                    <td class="issuenone" style="border-bottom:solid 1 lightgray">
+                                        <xsl:value-of select="@description"/>
+                                    </td>
+                                </tr>
+                                </xsl:if>
+                            </xsl:for-each>
+                        </table>
+                    </td>
+                </tr>
+                </xsl:if>
+            </xsl:for-each>
+
+            <tr valign="top">
+                <td class="foot">
+                    <xsl:if test="count(source)!=1">
+                        <xsl:value-of select="count(source)"/><a _locID="file1"> files</a>
+                    </xsl:if>
+                    <xsl:if test="count(source)=1">
+                        <a _locID="file2">1 file</a>
+                    </xsl:if>
+                </td>
+                <td class="foot">
+					<a _locID="Converted3">Converted</a>:&#32;<xsl:value-of select="count(source/event[@error-level='3' and @description='Converted'])"/><BR />
+					<a _locID="NotConverted">Not converted</a>:&#32;<xsl:value-of select="count(source) - count(source/event[@error-level='3' and @description='Converted'])"/>
+                </td>
+                <td class="foot"><xsl:value-of select="count(source/event[@error-level='2'])"/></td>
+                <td class="foot"><xsl:value-of select="count(source/event[@error-level='1'])"/></td>
+            </tr>
+        </table>
+    </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template match="Property">
+        <xsl:if test="@Name!='Date' and @Name!='Time' and @Name!='LogNumber' and @Name!='Solution'">
+        <tr><td nowrap="1"><b><xsl:value-of select="@Name"/>: </b><xsl:value-of select="@Value"/></td></tr>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="UpgradeLog">
+        <html>
+            <head>
+                <META HTTP-EQUIV="Content-Type" content="text/html; charset=utf-8" />
+                <link rel="stylesheet" href="_UpgradeReport_Files\UpgradeReport.css" />
+                <title _locID="ConversionReport0">Conversion Report&#32;
+                    <xsl:if test="Properties/Property[@Name='LogNumber']">
+                        <xsl:value-of select="Properties/Property[@Name='LogNumber']/@Value"/>
+                    </xsl:if>
+                </title>
+                <script language="javascript">
+                    function outliner () {
+                        oMe = window.event.srcElement
+                        //get child element
+                        var child = document.all[event.srcElement.getAttribute("child",false)];
+                        //if child element exists, expand or collapse it.
+                        if (null != child)
+                            child.className = child.className == "collapsed" ? "expanded" : "collapsed";
+                    }
+
+                    function changepic() {
+                        uMe = window.event.srcElement;
+                        var check = uMe.src.toLowerCase();
+                        if (check.lastIndexOf("upgradereport_plus.gif") != -1)
+                        {
+                            uMe.src = "_UpgradeReport_Files/UpgradeReport_Minus.gif"
+                        }
+                        else
+                        {
+                            uMe.src = "_UpgradeReport_Files/UpgradeReport_Plus.gif"
+                        }
+                    }
+                </script>
+            </head>
+            <body topmargin="0" leftmargin="0" rightmargin="0" onclick="outliner();">
+                <h1 _locID="ConversionReport">Conversion Report - <xsl:value-of select="Properties/Property[@Name='Solution']/@Value"/></h1>
+
+                <p><span class="note">
+                <b _locID="TimeOfConversion">Time of Conversion:</b>&#32;&#32;<xsl:value-of select="Properties/Property[@Name='Date']/@Value"/>&#32;&#32;<xsl:value-of select="Properties/Property[@Name='Time']/@Value"/><br/>
+                </span></p>
+
+                <xsl:variable name="SortedEvents">
+                    <Events>
+                        <xsl:for-each select="Event">
+                            <xsl:sort select="@Project" order="ascending"/>
+                            <xsl:sort select="@Source" order="ascending"/>
+                            <xsl:sort select="@ErrorLevel" order="ascending"/>
+                            <Event>
+                                <xsl:attribute name="Project"><xsl:value-of select="@Project"/> </xsl:attribute> 
+                                <xsl:attribute name="Solution"><xsl:value-of select="/UpgradeLog/Properties/Property[@Name='Solution']/@Value"/> </xsl:attribute> 
+                                <xsl:attribute name="Source"><xsl:value-of select="@Source"/> </xsl:attribute> 
+                                <xsl:attribute name="ErrorLevel"><xsl:value-of select="@ErrorLevel"/> </xsl:attribute> 
+                                <xsl:attribute name="Description"><xsl:value-of select="@Description"/> </xsl:attribute> 
+                            </Event>
+                        </xsl:for-each>     
+                    </Events>
+                </xsl:variable>
+                
+                <xsl:variable name="Projects">
+                    <xsl:apply-templates select="msxsl:node-set($SortedEvents)/*" mode="createProjects"/>
+                </xsl:variable>
+
+                <xsl:apply-templates select="msxsl:node-set($Projects)/*"/>
+
+                <p></p><p>
+                <table class="note">
+                    <tr>
+                        <td nowrap="1">
+                            <b _locID="ConversionSettings">Conversion Settings</b>
+                        </td>
+                    </tr>
+                    <xsl:apply-templates select="Properties"/>
+                </table></p>
+            </body>
+        </html>
+    </xsl:template>
+</xsl:stylesheet>
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport_Minus.gif
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport_Minus.gif
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport_Plus.gif
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/_UpgradeReport_Files/UpgradeReport_Plus.gif
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.ncb
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.ncb
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.sln
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.sln
@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jep", "jep.vcproj", "{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		py24-java15|Win32 = py24-java15|Win32
+		py24-java16|Win32 = py24-java16|Win32
+		py25-java15|Win32 = py25-java15|Win32
+		py25-java16|Win32 = py25-java16|Win32
+		py27-java16|Win32 = py27-java16|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py24-java15|Win32.ActiveCfg = py24-java15|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py24-java15|Win32.Build.0 = py24-java15|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py24-java16|Win32.ActiveCfg = py24-java16|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py24-java16|Win32.Build.0 = py24-java16|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py25-java15|Win32.ActiveCfg = py25-java15|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py25-java15|Win32.Build.0 = py25-java15|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py25-java16|Win32.ActiveCfg = py25-java16|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py25-java16|Win32.Build.0 = py25-java16|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py27-java16|Win32.ActiveCfg = py27-java16|Win32
+		{0A7DC650-4324-4E6B-8BFC-C36D8CEF335A}.py27-java16|Win32.Build.0 = py27-java16|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.suo
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.suo
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.vcproj
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.vcproj
--- a/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.vcproj.ISFL017138.Bryan
+++ b/nativeLib/rary.cots.jepp/jepp-2.3/windows/jep.vcproj.ISFL017138.Bryan
@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="9.00"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+		<Configuration
+			Name="py24-java16|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="ISFL017138"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="py25-java15|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="ISFL017138"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="py25-java16|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="ISFL017138"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="py24-java15|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="ISFL017138"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="py27-java16|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="ISFL017138"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>