Changeset 216

Show
Ignore:
Timestamp:
12/28/07 21:04:35 (1 year ago)
Author:
chris
Message:

Move Emdros libraries to separate project, jemdros.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lex/trunk

    • Property svn:ignore changed from

      work
       to
      work
      tmp

  • lex/trunk/.classpath

    r104 r216  
    33        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    44        <classpathentry kind="src" path="src"/> 
    5         <classpathentry kind="lib" path="jsp/WEB-INF/lib/jemdros.jar"/> 
    65        <classpathentry kind="lib" path="jsp/WEB-INF/lib/junit.jar"/> 
    76        <classpathentry kind="lib" path="jsp/WEB-INF/lib/jwnl.jar"/> 
    87        <classpathentry kind="lib" path="jsp/WEB-INF/lib/httpunit.jar"/> 
    9         <classpathentry kind="src" path="test"/> 
    10         <classpathentry kind="lib" path="jsp/WEB-INF/lib/mysql-connector-java-3.1.11-bin.jar"/> 
     8        <classpathentry kind="lib" path="jsp/WEB-INF/lib/mysql-connector-java-5.1.5-bin.jar"/> 
     9        <classpathentry excluding="testsuite/simple/" kind="src" path="test"/> 
    1110        <classpathentry kind="lib" path="jsp/WEB-INF/lib/log4j-1.2.8.jar"/> 
    1211        <classpathentry kind="src" path="properties"/> 
    1312        <classpathentry kind="lib" path="jsp/WEB-INF/lib/Tidy.jar"/> 
    14         <classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet.jar"/> 
     13        <classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet-api.jar"/> 
    1514        <classpathentry kind="var" path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/> 
     15        <classpathentry kind="var" path="TOMCAT_HOME/common/lib/jsp-api.jar"/> 
     16        <classpathentry kind="lib" path="jsp/WEB-INF/lib/jdom-1.0.jar"/> 
     17        <classpathentry kind="lib" path="jsp/WEB-INF/lib/jsword-1.0.8.jar"/> 
     18        <classpathentry kind="lib" path="jsp/WEB-INF/lib/jsword-common-1.0.8.jar"/> 
     19        <classpathentry combineaccessrules="false" kind="src" path="/jemdros"/> 
    1620        <classpathentry kind="output" path="jsp/WEB-INF/classes"/> 
    1721</classpath> 

  • lex/trunk/.project

    r99 r216  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<projectDescription> 
    3         <name>lex-new-emdros</name> 
     3        <name>lex</name> 
    44        <comment></comment> 
    55        <projects> 

  • lex/trunk/.settings/org.eclipse.core.resources.prefs

    r103 r216  
    1 #Tue Jun 26 20:15:43 GMT 2007 
     1#Fri Dec 28 01:47:54 CET 2007 
     2eclipse.preferences.version=1 
     3encoding//jsp/auth.jsp=UTF-8 
     4encoding//jsp/clause.jsp=UTF-8 
     5encoding//jsp/cleanup.jsp=UTF-8 
     6encoding//jsp/dump.jsp=UTF-8 
     7encoding//jsp/error.jsp=UTF-8 
     8encoding//jsp/gen-export.jsp=UTF-8 
     9encoding//jsp/header.jsp=UTF-8 
     10encoding//jsp/index.jsp=UTF-8 
     11encoding//jsp/login.jsp=UTF-8 
     12encoding//jsp/lsedit.jsp=UTF-8 
     13encoding//jsp/navclause.jsp=UTF-8 
     14encoding//jsp/parse.jsp=UTF-8 
     15encoding//jsp/rules.jsp=UTF-8 
    216encoding/<project>=UTF-8 
    3 eclipse.preferences.version=1 

  • lex/trunk/.settings/org.eclipse.jdt.core.prefs

    r26 r216  
    1 #Fri Jul 28 20:46:57 BST 2006 
     1#Wed Dec 26 21:43:59 CET 2007 
    22eclipse.preferences.version=1 
    3 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled 
    4 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 
     3org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 
     4org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 
    55org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve 
    6 org.eclipse.jdt.core.compiler.compliance=1.4 
     6org.eclipse.jdt.core.compiler.compliance=1.5 
    77org.eclipse.jdt.core.compiler.debug.lineNumber=generate 
    88org.eclipse.jdt.core.compiler.debug.localVariable=generate 
    99org.eclipse.jdt.core.compiler.debug.sourceFile=generate 
    10 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning 
    11 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning 
    12 org.eclipse.jdt.core.compiler.source=1.3 
     10org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 
     11org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 
     12org.eclipse.jdt.core.compiler.source=1.5 

  • lex/trunk/src/com/qwirx/lex/Lex.java

    r205 r216  
    2828import com.qwirx.db.sql.DbTable; 
    2929import com.qwirx.db.sql.SqlDatabase; 
     30import com.qwirx.jemdros.Preloader; 
    3031import com.qwirx.lex.emdros.EmdrosDatabase; 
    3132import com.qwirx.lex.ontology.OntologyDb; 
    …… 
    162163        } 
    163164 
    164         private static boolean isLibraryLoaded = false; 
     165        private static boolean m_IsLibraryLoaded = false; 
    165166 
    166167    public static void loadLibrary() throws Exception  
    167168    { 
    168         if (isLibraryLoaded) 
     169        if (m_IsLibraryLoaded) 
    169170                return; 
    170171                 
    171                 Class.forName("com.qwirx.lex.Preloader").newInstance(); 
     172                Preloader.load(); 
    172173         
    173                 // Get OS name 
    174 //              String osName = System.getProperty("os.name"); 
    175                 // System.out.println(osName); 
    176  
    177 //              if (osName.matches(".*[Ww]in.*")) { 
    178 //                      // Substitute your path 
    179 //                      System.load("c:\\programmer\\emdros\\lib\\jemdros.dll"); 
    180 //              } else { 
    181 //                      // Substitute your path 
    182 //                      System.load("/home/chris/project/emdros/root/lib/emdros/libjemdros.so"); 
    183 //              } 
    184 // 
    185174                Class.forName("com.mysql.jdbc.Driver").newInstance(); 
    186175 
    …… 
    191180        SwordBookPath.setAugmentPath(files); 
    192181 
    193                isLibraryLoaded = true;                 
     182        m_IsLibraryLoaded = true;              
    194183    } 
    195184