diff --git a/FedoraGenericSearch/.classpath b/FedoraGenericSearch/.classpath index 9b2e88f..92404ae 100644 --- a/FedoraGenericSearch/.classpath +++ b/FedoraGenericSearch/.classpath @@ -2,19 +2,12 @@ - - - - - - - @@ -26,12 +19,25 @@ - - - - + + + + + + + + + + + + + + + + + diff --git a/FedoraGenericSearch/lib/lib.properties b/FedoraGenericSearch/lib/lib.properties index 5127e63..f22e764 100644 --- a/FedoraGenericSearch/lib/lib.properties +++ b/FedoraGenericSearch/lib/lib.properties @@ -2,11 +2,11 @@ # Library Properties # -lib.activation = lib/activation-1.0.2.jar +lib.activation = lib/activation-1.1.1.jar lib.axis = lib/axis.jar lib.commons-codec = lib/commons-codec-1.3.jar lib.commons-discovery = lib/commons-discovery.jar -lib.commons-httpclient = lib/commons-httpclient-3.1-beta1.jar +lib.commons-httpclient = lib/commons-httpclient-3.1.jar lib.commons-logging = lib/commons-logging.jar # Fedora 3.1 client @@ -15,7 +15,7 @@ lib.fedora-client = lib/fedora-client-3.1.jar # Fedora 3.1 messaging client lib.fedora-messaging-client = lib/fedora-messaging-client-3.1r7812.jar -lib.jaxrpc = lib/jaxrpc.jar +lib.jaxrpc = lib/jaxrpc-api-1.1.jar lib.junit = lib/junit-4.5.jar lib.log4j = lib/log4j-1.2.15.jar lib.lucene = lib/lucene-core-2.4.0.jar @@ -23,7 +23,7 @@ lib.lucene-demos = lib/lucene-demos-2.4.0.jar lib.lucene-highlighter = lib/lucene-highlighter-2.4.0.jar lib.mail = lib/mail.jar lib.pdfbox = lib/PDFBox-0.7.2.jar -lib.saaj = lib/saaj.jar +lib.saaj = lib/saaj-api-1.3.jar lib.serializer = lib/serializer.jar lib.servlet-api = lib/servlet-api.jar lib.trippi-core = lib/trippi-1.1.1-core.jar @@ -31,13 +31,13 @@ lib.wsdl4j = lib/wsdl4j-1.5.1.jar lib.xalan = lib/xalan.jar lib.xerces = lib/xercesImpl.jar lib.xml-apis = lib/xml-apis.jar -lib.xmlunit = lib/xmlunit1.0.jar +lib.xmlunit = lib/xmlunit-1.2.jar lib.activemq-all = lib/activemq-all-5.1.0.jar lib.abdera.core = lib/abdera.core.0.4.0-incubating.jar lib.abdera.parser = lib/abdera.parser.0.4.0-incubating.jar lib.axiom-api = lib/axiom-api-1.2.5.jar lib.axiom-impl = lib/axiom-impl-1.2.5.jar -lib.jaxen = lib/jaxen-1.1-beta-9.jar +lib.jaxen = lib/jaxen-1.1.1.jar lib.staxapi = lib/jsr173_1.0_api.jar lib.sjsxp = lib/sjsxp.jar \ No newline at end of file diff --git a/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/client/RESTClient.java b/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/client/RESTClient.java index 9fcd1ad..72747fe 100644 --- a/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/client/RESTClient.java +++ b/FedoraGenericSearch/src/java/dk/defxws/fedoragsearch/client/RESTClient.java @@ -21,14 +21,14 @@ /** * Performs REST operations from command line with runRESTClient. - * + * * @author gsp@dtv.dk - * @version + * @version */ public class RESTClient { - + private Object content; - + private void updateIndex( String restUrl, String action, @@ -45,7 +45,7 @@ private void updateIndex( + "&indexDocXslt=" + indexDocXslt + "&restXslt=copyXml"); } - + private void browseIndex( String restUrl, String startTerm, @@ -66,7 +66,7 @@ private void browseIndex( e.printStackTrace(); } } - + private void gfindObjects( String restUrl, String query, @@ -93,7 +93,7 @@ private void gfindObjects( e.printStackTrace(); } } - + private void getRepositoryInfo( String restUrl, String repositoryName, @@ -104,7 +104,7 @@ private void getRepositoryInfo( + "&restXslt=copyXml" + "&resultPageXslt=" + resultPageXslt); } - + private void getIndexInfo( String restUrl, String indexName, @@ -115,7 +115,7 @@ private void getIndexInfo( + "&restXslt=copyXml" + "&resultPageXslt=" + resultPageXslt); } - + private void configure( String restUrl, String configName, @@ -126,13 +126,13 @@ private void configure( + "&propertyName=" + propertyName + "&propertyValue=" + propertyValue); } - + private void run( String restUrl, String queryString) { doOp(restUrl + queryString); } - + private void doOp( String urlString) { URL url = null; @@ -145,7 +145,7 @@ private void doOp( URLConnection conn = null; try { conn = url.openConnection(); - conn.setRequestProperty("Authorization", + conn.setRequestProperty("Authorization", "Basic "+(new BASE64Encoder()).encode((System.getProperty("fedoragsearch.fgsUserName")+":"+System.getProperty("fedoragsearch.fgsPassword")).getBytes())); conn.connect(); } catch (IOException e) { @@ -169,14 +169,13 @@ private void doOp( e1.printStackTrace(); } } - + public static void main(String[] args) { try { System.out.println("Args"); - int argsLength = 0; - while (args[argsLength].length()>0) { - System.out.println(" "+argsLength+"="+args[argsLength]); - argsLength++; + int argsLength = args.length; + for(int i=0; i6) + if (argsLength>6) resultPageXslt = args[6]; client.browseIndex(restUrl, startTerm, fieldName, indexName, termPageSize, resultPageXslt); } @@ -269,10 +268,10 @@ public static void main(String[] args) { } } String sortFields = ""; - if (argsLength>8) + if (argsLength>8) sortFields = args[8]; String resultPageXslt = ""; - if (argsLength>9) + if (argsLength>9) resultPageXslt = args[9]; client.gfindObjects(restUrl, query, indexName, hitPageStart, hitPageSize, snippetsMax, fieldMaxLength, sortFields, resultPageXslt); } @@ -282,7 +281,7 @@ public static void main(String[] args) { if (argsLength>2) repositoryName = args[2]; String resultPageXslt = ""; - if (argsLength>3) + if (argsLength>3) resultPageXslt = args[3]; client.getRepositoryInfo(restUrl, repositoryName, resultPageXslt); } @@ -292,7 +291,7 @@ public static void main(String[] args) { if (argsLength>2) indexName = args[2]; String resultPageXslt = ""; - if (argsLength>3) + if (argsLength>3) resultPageXslt = args[3]; client.getIndexInfo(restUrl, indexName, resultPageXslt); } @@ -321,10 +320,10 @@ public static void main(String[] args) { } catch (Exception e) { System.out.println("Exception in main: " + e.getMessage()); e.printStackTrace(); - } + } } - - public static void usage() { + + public static void usage() { System.out.println("Usage"); System.out.println("host:port updateIndex # shows number of index documents #"); System.out.println("host:port updateIndex createEmpty [indexName] # index dir must exist #"); @@ -341,5 +340,5 @@ public static void usage() { System.out.println("host:port may be [protocol://]host:port[/webappname/restname], default is http://host:port/fedoragsearch/rest"); System.exit(1); } - + } diff --git a/FedoraGenericSearch/src/sh/client/runRESTClient.bat b/FedoraGenericSearch/src/sh/client/runRESTClient.bat index 1a064f7..fb80e8c 100644 --- a/FedoraGenericSearch/src/sh/client/runRESTClient.bat +++ b/FedoraGenericSearch/src/sh/client/runRESTClient.bat @@ -1,6 +1,6 @@ @echo off set LIB=..\WEB-INF\lib -set JARS=%LIB%\fedora-3.0-client.jar;%LIB%\log4j-1.2.14.jar;%LIB%\activation-1.0.2.jar;%LIB%\axis.jar;%LIB%\commons-discovery.jar;%LIB%\commons-logging.jar;%LIB%\jaxrpc.jar;%LIB%\mail.jar;%LIB%\saaj.jar;%LIB%\lucene-core-1.9.1.jar;%LIB%\wsdl4j-1.5.1.jar;%LIB%\PDFBox-0.7.2.jar;%LIB%\xml-apis.jar +set JARS=%LIB%\fedora-client-3.1.jar;%LIB%\log4j-1.2.15.jar;%LIB%\activation-1.1.1.jar;%LIB%\axis.jar;%LIB%\commons-discovery.jar;%LIB%\commons-logging.jar;%LIB%\jaxrpc-api-1.1.jar;%LIB%\mail.jar;%LIB%\saaj-api-1.3.jar;%LIB%\lucene-core-2.4.0.jar;%LIB%\wsdl4j-1.5.1.jar;%LIB%\PDFBox-0.7.2.jar;%LIB%\xml-apis.jar java -cp ..\WEB-INF\classes;%JARS% dk.defxws.fedoragsearch.client.RESTClient %1 %2 %3 %4 %5 %6 %7 %8 \ No newline at end of file diff --git a/FedoraGenericSearch/src/sh/client/runRESTClient.sh b/FedoraGenericSearch/src/sh/client/runRESTClient.sh index b972758..b6383bb 100755 --- a/FedoraGenericSearch/src/sh/client/runRESTClient.sh +++ b/FedoraGenericSearch/src/sh/client/runRESTClient.sh @@ -25,6 +25,6 @@ fi; LIB=../WEB-INF/lib -JARS=$LIB/log4j-1.2.14.jar:$LIB/activation-1.0.2.jar:$LIB/axis.jar:$LIB/commons-discovery.jar:$LIB/commons-logging.jar:$LIB/jaxrpc.jar:$LIB/mail.jar:$LIB/saaj.jar:$LIB/lucene-core-2.3.2.jar:$LIB/wsdl4j-1.5.1.jar:$LIB/PDFBox-0.7.2.jar:$LIB/xml-apis.jar +JARS=$LIB/log4j-1.2.15.jar:$LIB/activation-1.1.1.jar:$LIB/axis.jar:$LIB/commons-discovery.jar:$LIB/commons-logging.jar:$LIB/jaxrpc-api-1.1.jar:$LIB/mail.jar:$LIB/saaj-api-1.3.jar:$LIB/lucene-core-2.4.0.jar:$LIB/wsdl4j-1.5.1.jar:$LIB/PDFBox-0.7.2.jar:$LIB/xml-apis.jar java -Xms64m -Xmx96m -Dfedoragsearch.fgsUserName=$fgsUserName -Dfedoragsearch.fgsPassword=$fgsPassword -cp ../WEB-INF/classes:$JARS dk.defxws.fedoragsearch.client.RESTClient "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" \ No newline at end of file diff --git a/FedoraGenericSearch/src/sh/client/runSOAPClient.sh b/FedoraGenericSearch/src/sh/client/runSOAPClient.sh index 9c10b6e..8d15135 100755 --- a/FedoraGenericSearch/src/sh/client/runSOAPClient.sh +++ b/FedoraGenericSearch/src/sh/client/runSOAPClient.sh @@ -25,6 +25,6 @@ fi; LIB=../WEB-INF/lib -JARS=$LIB/fedora-3.0-client.jar:$LIB/log4j-1.2.14.jar:$LIB/activation-1.0.2.jar:$LIB/axis.jar:$LIB/commons-discovery.jar:$LIB/commons-logging.jar:$LIB/jaxrpc.jar:$LIB/mail.jar:$LIB/saaj.jar:$LIB/lucene-core-2.0.0.jar:$LIB/wsdl4j-1.5.1.jar:$LIB/PDFBox-0.7.2.jar:$LIB/xml-apis.jar +JARS=$LIB/fedora-client-3.1.jar:$LIB/log4j-1.2.15.jar:$LIB/activation-1.1.1.jar:$LIB/axis.jar:$LIB/commons-discovery.jar:$LIB/commons-logging.jar:$LIB/jaxrpc-api-1.1.jar:$LIB/mail.jar:$LIB/saaj-api-1.3.jar:$LIB/lucene-core-2.4.0.jar:$LIB/wsdl4j-1.5.1.jar:$LIB/PDFBox-0.7.2.jar:$LIB/xml-apis.jar USER= java -Xms64m -Xmx96m -Dfedoragsearch.fgsUserName=$fgsUserName -Dfedoragsearch.fgsPassword=$fgsPassword -cp ../WEB-INF/classes:$JARS dk.defxws.fedoragsearch.client.SOAPClient "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" diff --git a/FgsLucene/.classpath b/FgsLucene/.classpath index c1faa74..581c91e 100644 --- a/FgsLucene/.classpath +++ b/FgsLucene/.classpath @@ -3,9 +3,9 @@ - - - - + + + + diff --git a/FgsSolr2/.classpath b/FgsSolr2/.classpath index 3677267..15bdf1b 100644 --- a/FgsSolr2/.classpath +++ b/FgsSolr2/.classpath @@ -1,11 +1,11 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/FgsZebra/.classpath b/FgsZebra/.classpath index 76aa29c..ea370ce 100644 --- a/FgsZebra/.classpath +++ b/FgsZebra/.classpath @@ -3,6 +3,6 @@ - +