Changeset 2098


Ignore:
Timestamp:
2001-03-01T14:05:58+13:00 (23 years ago)
Author:
paynter
Message:

Updated main directory to org.nzdl.gsdl

Location:
trunk/java-client
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/java-client/Makefile

    r2094 r2098  
    1717GREENSTONEIDLFILE=/home/nzdl/gsdl/lib/corbaiface.idl
    1818
    19 all: org/nzdl/corba/gsdlInterface/corbaiface.java
     19all: org/nzdl/gsdl/corba/gsdlInterface/corbaiface.java
    2020    (cd gnu/getopt && make all)
    21     (cd org/nzdl && make all)
     21    (cd org/nzdl/gsdl && make all)
    2222    diff --brief ./corbaiface.idl $(GREENSTONEIDLFILE)
    2323
    24 org/nzdl/corba/gsdlInterface/corbaiface.java: corbaiface.idl
    25     idlj -fclient -pkgPrefix gsdlInterface org.nzdl.corba corbaiface.idl
    26     idlj -fserver -pkgPrefix gsdlInterface org.nzdl.corba corbaiface.idl
    27     javac org/nzdl/corba/gsdlInterface/*.java
     24org/nzdl/gsdl/corba/gsdlInterface/corbaiface.java: corbaiface.idl
     25    idlj -fclient -pkgPrefix gsdlInterface org.nzdl.gsdl.corba corbaiface.idl
     26    idlj -fserver -pkgPrefix gsdlInterface org.nzdl.gsdl.corba corbaiface.idl
     27    javac org/nzdl/gsdl/corba/gsdlInterface/*.java
    2828
    2929
    … …  
    3535    mkdir docs
    3636    javadoc -private -version -author -d docs -header "Documentation for the <a href=\"http://www.corba.org/\">CORBA</a> interface to the <a href=\"http://www.nzdl.org/\">NZDL</a>\'s Greenstone Digital Library software." -footer "This software is distributed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\">GPL</a>" */*/*.java */*/*/*.java */*/*/*/*.java
    37 #   javadoc -private -version -author org/nzdl/*.java org/nzdl/*/*.java org/nzdl/*/*/*.java
    3837
    3938clean:
    40     (cd org/nzdl && make clean)
     39    (cd org/nzdl/gsdl && make clean)
    4140    rm -rf docs
    42     rm -rf org/nzdl/corba
     41    rm -rf org/nzdl/gsdl/corba
    4342
    4443

  • trunk/java-client/org/nzdl/gsdl/Makefile

    r2077 r2098  
    1 #name/location of java compiler
     1
     2
     3# Instructions for compiling a java file
    24JAVAC=javac
     5JAVACOPTIONS= -g:lines
     6#JAVACOPTIONS= -g:none -O
    37
    4 #javac options
    5 #JAVACOPTIONS= -g:none -O
    6 JAVACOPTIONS= -g:lines
    7 
    8 #complete compilation
    9 JAVACOMPILE=$(JAVAC) $(JAVACOPTIONS)
    10 
    11 #make a .class file from a .java file
    12 %.class: %.java
     8%.class : %.java
    139    $(JAVAC) $(JAVACOPTIONS)  $<
    1410
    15 all:
    16     (cd util && make all)
    17     (cd service && make all)
    18     make SimpleClient.class SimpleServer.class
     11all :
     12    (cd util && $(MAKE) all)
     13    (cd service && $(MAKE) all)
     14    $(MAKE) SimpleClient.class SimpleServer.class
    1915
    2016

  • trunk/java-client/org/nzdl/gsdl/SimpleClient.java

    r2088 r2098  
    1919
    2020// the package we're in
    21 package org.nzdl;
     21package org.nzdl.gsdl;
    2222
    2323// long live GNU ...
    … …  
    4646
    4747// local libraries
    48 import org.nzdl.service.NzdlCollectionInfo;
    49 import org.nzdl.service.NzdlQuery;
    50 import org.nzdl.service.NzdlRequest;
    51 import org.nzdl.service.NzdlResponse;
    52 import org.nzdl.service.NzdlResultSet;
    53 import org.nzdl.service.NzdlService;
    54 import org.nzdl.service.NzdlServiceClient;
     48import org.nzdl.gsdl.service.NzdlCollectionInfo;
     49import org.nzdl.gsdl.service.NzdlQuery;
     50import org.nzdl.gsdl.service.NzdlRequest;
     51import org.nzdl.gsdl.service.NzdlResponse;
     52import org.nzdl.gsdl.service.NzdlResultSet;
     53import org.nzdl.gsdl.service.NzdlService;
     54import org.nzdl.gsdl.service.NzdlServiceClient;
    5555
    5656/**
    … …  
    6464 * @author Gordon Paynter ([email protected])
    6565 * @version $Revision$
    66  * @see org.nzdl.service.NzdlCollectionInfo
    67  * @see org.nzdl.service.NzdlQuery
    68  * @see org.nzdl.service.NzdlRequest
    69  * @see org.nzdl.service.NzdlResponse
    70  * @see org.nzdl.service.NzdlResultSet
    71  * @see org.nzdl.service.NzdlService
    72  * @see org.nzdl.service.NzdlServiceImpl
     66 * @see org.nzdl.gsdl.service.NzdlCollectionInfo
     67 * @see org.nzdl.gsdl.service.NzdlQuery
     68 * @see org.nzdl.gsdl.service.NzdlRequest
     69 * @see org.nzdl.gsdl.service.NzdlResponse
     70 * @see org.nzdl.gsdl.service.NzdlResultSet
     71 * @see org.nzdl.gsdl.service.NzdlService
     72 * @see org.nzdl.gsdl.service.NzdlServiceImpl
    7373 * @see gnu.getopt.Getopt;
    7474 * @see gnu.getopt.LongOpt;
    … …  
    374374    longopts[i++]  = new LongOpt("verbose",               LongOpt.REQUIRED_ARGUMENT, null, 'v');
    375375    longopts[i++]  = new LongOpt("queryAllCollections",   LongOpt.NO_ARGUMENT,       null, 'Q');
    376     Getopt g = new Getopt("org.nzdl.SimpleClient",
     376    Getopt g = new Getopt("org.nzdl.gsdl.SimpleClient",
    377377                          args,
    378378                          "hI:f:c:aq:dv:Q",

  • trunk/java-client/org/nzdl/gsdl/SimpleServer.java

    r2093 r2098  
    1919
    2020// the package we're in
    21 package org.nzdl;
     21package org.nzdl.gsdl;
    2222
    2323// java standard library classes used
    … …  
    3535
    3636// local libraries
    37 import org.nzdl.corba.gsdlInterface.*;
    38 import org.nzdl.service.NzdlCollectionInfo;
    39 import org.nzdl.service.NzdlQuery;
    40 import org.nzdl.service.NzdlRequest;
    41 import org.nzdl.service.NzdlResponse;
    42 import org.nzdl.service.NzdlResultSet;
    43 import org.nzdl.service.NzdlService;
    44 import org.nzdl.service.NzdlServiceServer;
    45   import org.nzdl.service.NzdlServiceClient;
    46 import org.nzdl.util.NzdlCorbaFactory;
     37import org.nzdl.gsdl.corba.gsdlInterface.*;
     38import org.nzdl.gsdl.service.NzdlCollectionInfo;
     39import org.nzdl.gsdl.service.NzdlQuery;
     40import org.nzdl.gsdl.service.NzdlRequest;
     41import org.nzdl.gsdl.service.NzdlResponse;
     42import org.nzdl.gsdl.service.NzdlResultSet;
     43import org.nzdl.gsdl.service.NzdlService;
     44import org.nzdl.gsdl.service.NzdlServiceServer;
     45import org.nzdl.gsdl.service.NzdlServiceClient;
     46import org.nzdl.gsdl.util.NzdlCorbaFactory;
    4747
    4848

  • trunk/java-client/org/nzdl/gsdl/service/NzdlCollectionInfo.java

    r2077 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44/** gsdl corba stuff */
    5 import org.nzdl.corba.gsdlInterface.*;
    6 import org.nzdl.util.*;
     5import org.nzdl.gsdl.corba.gsdlInterface.*;
     6import org.nzdl.gsdl.util.*;
    77
    88public class NzdlCollectionInfo extends Object {

  • trunk/java-client/org/nzdl/gsdl/service/NzdlQuery.java

    r2055 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44import java.util.*;
    55
    6 import org.nzdl.util.NzdlConstants;
     6import org.nzdl.gsdl.util.NzdlConstants;
    77
    88public class NzdlQuery extends java.lang.Object {

  • trunk/java-client/org/nzdl/gsdl/service/NzdlQueryHit.java

    r2055 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44import java.util.*;

  • trunk/java-client/org/nzdl/gsdl/service/NzdlRequest.java

    r2055 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    4 import org.nzdl.corba.gsdlInterface.*;
    5 import org.nzdl.util.*;
     4import org.nzdl.gsdl.corba.gsdlInterface.*;
     5import org.nzdl.gsdl.util.*;
    66import java.util.*;
    77

  • trunk/java-client/org/nzdl/gsdl/service/NzdlResponse.java

    r2055 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44import java.util.*;
    55
    6 import org.nzdl.service.*;
    7 import org.nzdl.corba.gsdlInterface.*;
    8 import org.nzdl.util.*;
     6import org.nzdl.gsdl.service.*;
     7import org.nzdl.gsdl.corba.gsdlInterface.*;
     8import org.nzdl.gsdl.util.*;
    99
    1010public class NzdlResponse extends java.lang.Object {

  • trunk/java-client/org/nzdl/gsdl/service/NzdlResultSet.java

    r2055 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44import java.util.*;

  • trunk/java-client/org/nzdl/gsdl/service/NzdlService.java

    r2055 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44import java.util.*;

  • trunk/java-client/org/nzdl/gsdl/service/NzdlServiceClient.java

    r2088 r2098  
    11
    2 package org.nzdl.service;
     2package org.nzdl.gsdl.service;
    33
    44import java.io.*;
    … …  
    77import org.omg.CORBA.*;
    88/** gsdl corba stuff */
    9 import org.nzdl.corba.gsdlInterface.*;
    10 import org.nzdl.util.*;
     9import org.nzdl.gsdl.corba.gsdlInterface.*;
     10import org.nzdl.gsdl.util.*;
    1111
    1212public class NzdlServiceClient

  • trunk/java-client/org/nzdl/gsdl/service/NzdlServiceServer.java

    r2093 r2098  
    1919
    2020// the package we're in
    21 package org.nzdl.service;
     21package org.nzdl.gsdl.service;
    2222
    2323// java standard library classes used
    … …  
    3535
    3636// local libraries
    37 import org.nzdl.corba.gsdlInterface.*;
    38 import org.nzdl.service.NzdlCollectionInfo;
    39 import org.nzdl.service.NzdlQuery;
    40 import org.nzdl.service.NzdlRequest;
    41 import org.nzdl.service.NzdlResponse;
    42 import org.nzdl.service.NzdlResultSet;
    43 import org.nzdl.service.NzdlService;
    44 import org.nzdl.util.NzdlCorbaFactory;
     37import org.nzdl.gsdl.corba.gsdlInterface.*;
     38import org.nzdl.gsdl.service.NzdlCollectionInfo;
     39import org.nzdl.gsdl.service.NzdlQuery;
     40import org.nzdl.gsdl.service.NzdlRequest;
     41import org.nzdl.gsdl.service.NzdlResponse;
     42import org.nzdl.gsdl.service.NzdlResultSet;
     43import org.nzdl.gsdl.service.NzdlService;
     44import org.nzdl.gsdl.util.NzdlCorbaFactory;
    4545
    4646

  • trunk/java-client/org/nzdl/gsdl/util/NzdlConstants.java

    r2055 r2098  
    11
    2 package org.nzdl.util;
    3 
     2package org.nzdl.gsdl.util;
    43
    54public interface NzdlConstants {
    … …  
    2726public static final int FRfullTextBrowse = 128;
    2827
    29 /*
     28/* The constants above are based on these definitions from the C++ receptionist
     29
    3030#define FRtermFreq   1
    3131#define FRmatchTerms 2
    … …  
    3737// used to indicate a full text browse query for mgpp
    3838#define FRfullTextBrowse  128
     39
    3940*/
    4041

  • trunk/java-client/org/nzdl/gsdl/util/NzdlCorbaFactory.java

    r2077 r2098  
    11
    2 package org.nzdl.util;
     2package org.nzdl.gsdl.util;
    33
    44import java.util.*;
    5 import org.nzdl.service.NzdlQuery;
    6 import org.nzdl.corba.gsdlInterface.*;
    7 import org.nzdl.util.NzdlConstants;
     5import org.nzdl.gsdl.service.NzdlQuery;
     6import org.nzdl.gsdl.corba.gsdlInterface.*;
     7import org.nzdl.gsdl.util.NzdlConstants;
    88
    99public final class NzdlCorbaFactory {

  • trunk/java-client/org/nzdl/gsdl/util/NzdlHosts.java

    r2088 r2098  
    1919
    2020// the package we're in
    21 package org.nzdl.util;
     21package org.nzdl.gsdl.util;
    2222
    2323// java standard library classes used
    … …  
    3535import org.omg.CORBA.Object;
    3636import org.omg.CORBA.ORB;
    37 import org.nzdl.service.*;
     37import org.nzdl.gsdl.service.*;
    3838import java.net.URL;
    3939
Note: See TracChangeset for help on using the changeset viewer.