Project

General

Profile

« Previous | Next » 

Revision 915

Added by berkley about 23 years ago

fixed error I introduced when I got postgres working

View differences:

build.oracle.xml
35 35 
                value="jdbc:oracle:thin:@dev.nceas.ucsb.edu:1521:exp"/>
36 36 
      <property name="installdir" value="/opt/tomcat/webapps/metacat" />
37 37 
      <property name="dbDriver" value="oracle.jdbc.driver.OracleDriver"/>
38 
      <property name="dbAdapter" value="edu.ucsb.nceas.dbadapter.OracleAdapter"/>
38 39 
      <property name="name" value="metacat"/>
39 40 
      <property name="Name" value="MetaCat"/>
40 41 
      <property name="release" value="1.0.3"/>
build.postgres.xml
35 35 
                value="jdbc:postgresql://localhost/metacat"/>
36 36 
      <property name="installdir" value="/home/berkley/tomcat/webapps/metacat" />
37 37 
      <property name="dbDriver" value="org.postgresql.Driver"/>
38 
      <property name="dbAdapter" value="edu.ucsb.nceas.dbadapter.PostgresqlAdapter"/>
38 39 
      <property name="name" value="metacat"/>
39 40 
      <property name="Name" value="MetaCat"/>
40 41 
      <property name="release" value="1.0.3"/>
lib/metacat.properties
7 7 
password=@password@
8 8 
defaultDB=@jdbc-connect@
9 9 
dbDriver=@dbDriver@
10 
dbAdapter=edu.ucsb.nceas.dbadapter.PostgresqlAdapter
10 
dbAdapter=@dbAdapter@
11 11 
initialConnections=5
12 12 
incrementConnections=5
13 13 
maximumConnections=10
src/edu/ucsb/nceas/metacat/AuthLdap.java
178 178 
        try {
179 179 
          double startTime = System.currentTimeMillis();
180 180 
          ctx = new InitialDirContext(env);
181 
//          // StartTLS support from LDAPv3 with X.509 cert and with JSDKv1.4+
182 
//          LdapContext ctx = new InitialLdapContext(env, null);
183 
//          StartTlsResponse tls =
184 
//            (StartTlsResponse)ctx.extendedOperation(new StartTlsRequest());
185 
//          tls.negotiate();
186 181 
          double stopTime = System.currentTimeMillis();
187 182 
          System.out.println("Connection time thru " + ldapsUrl + " was: " +
188 183 
                             (stopTime-startTime)/1000 + " seconds.");
......
194 189 
          //break;
195 190 
        } catch (AuthenticationException ae) {
196 191 
          authenticated = false;
197 
//          if ( tls != null ) {
198 
//            tls.close();
199 
//          }
200 192 
          if ( ctx != null ) {
201 193 
            ctx.close();
202 194 
          }
......
212 204 
          {
213 205 
            refExc = re;
214 206 
            Thread t = new Thread(this);
215 
            System.out.println("Starting thread...");
207 
            //System.out.println("Starting thread...");
216 208 
            t.start();
217 209 
            System.out.println("sleeping for 5 seconds.");
218 
            Thread.sleep(5000); //this is a manual override of ldap's hideously long time
219 
                         //out period.
220 
            System.out.println("Awake after 5 seconds.");
210 
            Thread.sleep(5000); //this is a manual override of ldap's
211 
                                //hideously long time out period.
212 
            //System.out.println("Awake after 5 seconds.");
221 213 
            if(referralContext == null)
222 214 
            {
223 
              System.out.println("killing thread....not authenticated.");
215 
              //System.out.println("killing thread....not authenticated.");
224 216 
              t.interrupt();
225 
              System.out.println("thread killed.");
217 
              //System.out.println("thread killed.");
226 218 
              authenticated = false;
227 219 
            }
228 220 
            else
229 221 
            {
230 
              //Context c = handleReferral(env, re.getReferralContext(env));
231 222 
              authenticated = true;
232 223 
            }
233 224 
          }
......
1015 1006 
    referralContext = null;
1016 1007 
    try
1017 1008 
    {
1018 
      System.out.println("running thread....");
1009 
      //System.out.println("running thread....");
1019 1010 
      rContext = refExc.getReferralContext(env);
1020 1011 
      referralContext = handleReferral(env, rContext);
1021 
      System.out.println("exiting thread...");
1012 
      //System.out.println("exiting thread...");
1022 1013 
    }
1023 1014 
    catch(Exception e)
1024 1015 
    {
src/edu/ucsb/nceas/metacat/DBSAXNode.java
159 159 
                                                     nodename + ", " +
160 160 
                                                     data + ")" );
161 161 
      System.err.println(e.getMessage());
162 
      e.printStackTrace(System.err);
162 163 
      throw new SAXException(e.getMessage());
163 164 
    }
164 165 
  }
build.xml
32 32 
<project name="metacat" default="jar" basedir=".">
33 33 
   <target name="init">
34 34 
      <property name="jdbc-connect"
35 
                value="jdbc:postgresql://localhost/berkley"/>
36 
      <property name="installdir" value="/home/berkley/tomcat/webapps/metacat" />
37 
      <property name="dbDriver" value="org.postgresql.Driver"/>
35 
                value="jdbc:oracle:thin:@dev.nceas.ucsb.edu:1521:exp"/>
36 
      <property name="installdir" value="/opt/tomcat/webapps/berkley" />
37 
      <property name="dbDriver" value="oracle.jdbc.driver.OracleDriver"/>
38 
      <property name="dbAdapter" value="edu.ucsb.nceas.dbadapter.OracleAdapter"/>
38 39 
      <property name="name" value="metacat"/>
39 40 
      <property name="Name" value="MetaCat"/>
40 41 
      <property name="release" value="1.0.3"/>
41 42 
      <property name="web-base-url"
42 
                value="http://alpha.nceas.ucsb.edu:8080/"/>
43 
                value="http://knb.ecoinformatics.org"/>
43 44 

  		




  44
  45
  
    
      <property name="replication-path" value="/servlet/replication"/>


  		




  45
  
  
    
      <property name="servlet-path" value="/metacat/servlet/metacat"/>


  		




  46
  
  
    
      <property name="html-path" value="/metacat"/>


  		




  47
  
  
    
      <property name="image-path" value="/img/metacat" />


  		




  48
  
  
    
      <property name="style-path" value="/metacat/style"/>


  		




  49
  
  
    
      <property name="server" value="alpha.nceas.ucsb.edu:8080"/>


  		




  50
  
  
    
      <property name="replication-log" value="/home/berkley/tomcat/webapps/metacat/metacatreplication.log"/>


  		




  
  46
  
    
      <property name="servlet-path" value="/berkley/servlet/metacat"/>


  		




  
  47
  
    
      <property name="html-path" value="/berkley"/>


  		




  
  48
  
    
      <property name="image-path" value="/img/berkley" />


  		




  
  49
  
    
      <property name="style-path" value="/berkley/style"/>


  		




  
  50
  
    
      <property name="server" value="dev.nceas.ucsb.edu:8090"/>


  		




  
  51
  
    
      <property name="replication-log" value="/tmp/berkley/metacatreplication.log"/>


  		




  51
  52
  
    
      <property name="user" value="berkley"/>


  		




  52
  
  
    
      <property name="password" value=""/>


  		




  
  53
  
    
      <property name="password" value="UnSinn123"/>


  		




  53
  54
  
    
      <property name="config-dir" value="${installdir}" />


  		




  54
  55
  
    
      <property name="default-style" value="knb" />


  		




  55
  56
  
    
      <property name="eml-module" value="mdstandards/eml" />


  		




  56
  57
  
    
      <property name="eml-version" value="2.0.0beta6" />


  		




  57
  58
  
    
      <property name="eml-tag" value="RELEASE_EML_2_0_0_BETA_6" />


  		




  58
  59
  
    
      <property name="cvsroot" 


  		




  59
  
  
    
                value=":ext:berkley@cvs.nceas.ucsb.edu:/cvs/pbi" />


  		




  
  60
  
    
                value=":ext:berkley@cvs.ecoinformatics.org:/cvs" />


  		




  60
  61
  
    

  		




  61
  62
  
    

  		




  62
  63
  
    
      <filter token="docrooturl" value="./" />


  		




  63
  64
  
    
      <filter token="jdbc-connect" value="${jdbc-connect}"/>


  		




  64
  65
  
    
      <filter token="dbDriver" value="${dbDriver}"/>


  		




  
  66
  
    
      <filter token="dbAdapter" value="${dbAdapter}"/>


  		




  65
  67
  
    
      <filter token="install-dir" value="${installdir}"/>


  		




  66
  68
  
    
      <filter token="serverhost" value="${serverhost}"/>


  		




  67
  69
  
    
      <filter token="server" value="${server}"/>


  		




  ......




  99
  101
  
    
      <property name="toolsdir" 


  		




  100
  102
  
    
                value="/usr/local/devtools" />


  		




  101
  103
  
    
      <property name="xmlp2" 


  		




  102
  
  
    
                value="./lib/xerces.jar" />


  		




  
  104
  
    
                value="${toolsdir}/xerces-1_1_3/xerces.jar" />


  		




  103
  105
  
    
      <property name="jdbc" 


  		




  104
  
  
    
                value="lib/jdbc7.1-1.2.jar" />


  		




  
  106
  
    
                value="${oracle_home}/jdbc/lib/classes111.zip" />


  		




  105
  107
  
    
      <property name="jserv" 


  		




  106
  108
  
    
                value="/usr/lib/apache/ApacheJServ.jar" />


  		




  107
  109
  
    
      <property name="jsdk" 


  		




  108
  
  
    
                value="/home/berkley/tomcat/lib/common/servlet.jar" />


  		




  
  110
  
    
                value="${toolsdir}/jakarta-tomcat/lib/servlet.jar" />


  		




  109
  111
  
    
      <property name="srb" 


  		




  110
  112
  
    
                value="lib/srbrmi" />


  		




  111
  113
  
    
      <property name="cos" 


  		




  ......




  115
  117
  
    
      <property name="xalanxml-apis"


  		




  116
  118
  
    
                value="lib/xalan/xml-apis.jar" />


  		




  117
  119
  
    
      <property name="cpath" 


  		




  118
  
  
    
                value="${xalan}:${xalanxml-apis}:${xmlp2}:${jdbc}:${jserv}:${jsdk}:${srb}:${cos}"/>


  		




  
  120
  
    
                value="${xmlp2}:${xalan}:${xalanxml-apis}:${jdbc}:${jserv}:${jsdk}:${srb}:${cos}"/>


  		




  119
  121
  
    
      <property name="package.home" value="edu/ucsb/nceas/metacat" />


  		




  
  122
  
    

  		




  120
  123
  
    
   </target>


  		




  121
  124
  
    
   


  		




  122
  125
  
    
   <target name="prepare" depends="init">


  		




  ......




  200
  203
  
    
             tofile="${installdir}/WEB-INF/lib/oracle-jdbc111.jar" />


  		




  201
  204
  
    
       <copy file="${cos}" 


  		




  202
  205
  
    
             tofile="${installdir}/WEB-INF/lib/cos.jar" />


  		




  203
  
  
    
       <copy file="${xalan}" 


  		




  204
  
  
    
             tofile="${installdir}/WEB-INF/lib/xalan.jar" />


  		




  205
  
  
    
       <copy file="${xalanxml-apis}" 


  		




  206
  
  
    
             tofile="${installdir}/WEB-INF/lib/xml-apis.jar" />


  		




  207
  206
  
    
       <copy file="lib/web.xml" 


  		




  208
  207
  
    
             tofile="${installdir}/WEB-INF/web.xml" />


  		




  209
  208
  
    
       <copy todir="${build.img}" filtering="no">


  		












Also available in:  Unified diff