Project

General

Profile

« Previous | Next » 

Revision 7403

remove morpho.jar -- moved needed classes into shared utilities project. (currently building form utilities trunk -- be sure to 'ant fullclean' to get the latest utilities.jar built)

View differences:

src/edu/ucsb/nceas/metacat/RelationHandler.java
20 20
 
21 21
package edu.ucsb.nceas.metacat;
22 22

  
23
import java.sql.PreparedStatement;
24
import java.sql.ResultSet;
25
import java.sql.SQLException;
26
import java.util.Vector;
27

  
28
import org.apache.log4j.Logger;
29

  
23 30
import edu.ucsb.nceas.metacat.database.DBConnection;
24 31
import edu.ucsb.nceas.metacat.database.DBConnectionPool;
25 32
import edu.ucsb.nceas.metacat.properties.PropertyService;
33
import edu.ucsb.nceas.metacat.util.DocumentUtil;
26 34
import edu.ucsb.nceas.metacat.util.MetacatUtil;
27
import edu.ucsb.nceas.metacat.util.DocumentUtil;
28
import edu.ucsb.nceas.morpho.datapackage.Triple;
29
import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
30 35
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
36
import edu.ucsb.nceas.utilities.triple.Triple;
37
import edu.ucsb.nceas.utilities.triple.TripleCollection;
31 38

  
32
import java.io.StringReader;
33
import java.sql.*;
34
import java.util.*;
35
import java.net.*;
36 39

  
37
import org.apache.log4j.Logger;
38

  
39

  
40 40
public class RelationHandler //implements Runnable
41 41
{
42 42
  private DBConnection connection = null;
src/edu/ucsb/nceas/metacat/DBQuery.java
69 69
import edu.ucsb.nceas.metacat.util.AuthUtil;
70 70
import edu.ucsb.nceas.metacat.util.DocumentUtil;
71 71
import edu.ucsb.nceas.metacat.util.MetacatUtil;
72
import edu.ucsb.nceas.morpho.datapackage.Triple;
73
import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
74 72
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
75 73

  
74
import edu.ucsb.nceas.utilities.triple.Triple;
75
import edu.ucsb.nceas.utilities.triple.TripleCollection;
76 76

  
77

  
77 78
/**
78 79
 * A Class that searches a relational DB for elements and attributes that have
79 80
 * free text matches a query string, or structured query matches to a path
src/edu/ucsb/nceas/metacat/DBSAXHandler.java
42 42
import edu.ucsb.nceas.metacat.properties.PropertyService;
43 43
import edu.ucsb.nceas.metacat.service.XMLSchema;
44 44
import edu.ucsb.nceas.metacat.util.MetacatUtil;
45
import edu.ucsb.nceas.morpho.datapackage.Triple;
46
import edu.ucsb.nceas.morpho.datapackage.TripleCollection;
45
import edu.ucsb.nceas.utilities.triple.Triple;
46
import edu.ucsb.nceas.utilities.triple.TripleCollection;
47 47
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
48 48
import edu.ucsb.nceas.utilities.StringUtil;
49 49

  
build.xml
169 169
		<property name="schema-cvsrelpath" value="lib${schema-relpath}" />
170 170
		<property name="style-skins-relpath" value="/style/skins" />
171 171
		<property name="util-module" value="utilities" />
172
		<!-- property name="utilities-tag" value="trunk" / -->
173
		<property name="utilities-tag" value="tags/UTILITIES_1_1_0" />
172
		<property name="utilities-tag" value="trunk" />
173
		<!--<property name="utilities-tag" value="tags/UTILITIES_1_1_0" /> -->
174 174
		<property name="seek-tag" value="tags/ECOGRID_1_2_2" />
175 175
		<property name="eml-module" value="eml" />
176 176
		<property name="eml-version" value="2.0.0beta6" />

Also available in: Unified diff