Ignore:
Timestamp:
08/17/10 13:43:01 (14 years ago)
Author:
vronk
Message:

introducing the user: only real change in GenericProxyAction?
the rest is just removed unused imports.

Location:
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Admin.java

    r466 r627  
    22
    33import java.io.File;
    4 import java.io.FileInputStream;
    54import java.io.FileNotFoundException;
    65import java.io.FileOutputStream;
    … …  
    109import java.util.Properties;
    1110
    12 import com.opensymphony.oscache.base.NeedsRefreshException;
    13 import com.opensymphony.oscache.general.GeneralCacheAdministrator;
    14 
    1511import eu.clarin.cmdi.mdservice.model.Query;
    16 import eu.clarin.cmdi.mdservice.model.Result;
    1712
    1813/**
    … …  
    4338               
    4439               
    45                 //Query q = new Query("dc.title=dino or dinosaur");
    46                 //System.out.println(q.toXPath());
     40                //Query q = new Query("dc.title=dino or dinosaur", Query.RECORDSET);
     41                //Query q = new Query("( ( Date any 2005 ) or ( Date any 2001 ) ) and ( ( Description any part ) )", Query.RECORDSET);
     42                Query q = new Query("( ( Date any 2005 ) or ( Country = \"United States\" ) ) and ( ( Description any part ) )", Query.RECORDSET);
     43                //System.out.println(q.toXCQL());
     44                System.out.println(q.toXPath());
    4745               
    4846                //Query q = new Query("CMD", "cmdIndex");

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CollectionProxyAction.java

    r526 r627  
    22
    33import java.io.IOException;
    4 import java.io.InputStream;
    5 import java.net.MalformedURLException;
    64import java.net.URL;
    7 import java.net.URLConnection;
    8 
    9 import com.opensymphony.xwork2.ActionSupport;
    105
    116/**

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java

    r614 r627  
    11 package eu.clarin.cmdi.mdservice.action;
    22
    3 import java.io.File;
    4 import java.io.FileOutputStream;
    53import java.io.IOException;
    64import java.io.InputStream;
    7 import java.io.OutputStream;
    8 import java.net.MalformedURLException;
    95import java.net.URL;
    10 import java.net.URLConnection;
    11 
    12 import com.opensymphony.xwork2.ActionSupport;
    136
    147/**

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

    r582 r627  
    66import java.net.URL;
    77
     8import javax.servlet.http.HttpServletRequest;
     9import org.apache.struts2.interceptor.ServletRequestAware;
     10
    811import com.opensymphony.xwork2.ActionSupport;
    9 
    10 import eu.clarin.cmdi.mdservice.action.MDTransformer;
    1112
    1213/**
    … …  
    1819 *
    1920 */
    20 public class GenericProxyAction extends ActionSupport {
     21public class GenericProxyAction extends ActionSupport
     22implements ServletRequestAware
     23{
    2124
    2225        private static final long serialVersionUID = 1L;
    … …  
    3134        private String format;
    3235        private String userMsg;
     36        //private Map<String,Object> session;
     37         private HttpServletRequest request;
    3338
    3439        public String getQ() {
    … …  
    9499        }
    95100
     101        @Override
     102        public void setServletRequest(HttpServletRequest arg0) {
     103                request = arg0;
     104        }
     105
     106        public HttpServletRequest getServletRequest() {
     107                return request;
     108        }
    96109
    97110
    … …  
    191204         */
    192205        public String execute() throws Exception {
     206//              HttpServletRequest request = ServletActionContext.getRequest();
     207
    193208               
     209                Admin.notifyUser("session-attrs:");
     210      Admin.notifyUser(getServletRequest().getRemoteUser() );
     211        //Admin.notifyUser(String.valueOf(getSession()));
     212     
    194213                prepare();
    195214                if (resultStream == null) {
    … …  
    200219        }
    201220
     221
    202222}

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Helpers.java

    r466 r627  
    55import java.io.OutputStream;
    66import java.io.PrintStream;
    7 
    87
    98import javax.xml.parsers.DocumentBuilder;

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDRepoProxyAction.java

    r595 r627  
    11package eu.clarin.cmdi.mdservice.action;
    22
    3 import java.io.ByteArrayInputStream;
    43import java.io.IOException;
    5 import java.io.InputStream;
    64import java.net.URL;
    75import java.util.HashMap;
    86
    9 import com.opensymphony.xwork2.ActionSupport;
    10 
    117import eu.clarin.cmdi.mdservice.model.Query;
    12 import eu.clarin.cmdi.mdservice.model.Result;
    138
    149/**

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDTransformer.java

    r582 r627  
    11package eu.clarin.cmdi.mdservice.action;
    22
    3 import eu.clarin.cmdi.mdservice.action.Helpers;
    43import java.io.BufferedInputStream;
    54import java.io.ByteArrayInputStream;
    … …  
    76import java.io.File;
    87import java.io.FileInputStream;
    9 import java.io.FileNotFoundException;
    108import java.io.IOException;
    119import java.io.InputStream;
    … …  
    1311import java.io.Reader;
    1412import java.io.StringReader;
    15 import java.net.MalformedURLException;
    1613import java.net.URL;
    1714

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

    r620 r627  
    1414import java.net.MalformedURLException;
    1515import java.net.URL;
    16 import java.util.Hashtable;
    17 import java.util.Map;
    18 
    19 import org.w3c.dom.*;
    20 import javax.xml.parsers.*;
    21 
    22 import org.xml.sax.SAXException;
     16
     17import javax.xml.parsers.DocumentBuilder;
     18import javax.xml.parsers.DocumentBuilderFactory;
     19
     20import org.w3c.dom.Document;
     21import org.z3950.zing.cql.CQLNode;
    2322import org.z3950.zing.cql.CQLParseException;
    2423import org.z3950.zing.cql.CQLParser;
    25 import org.z3950.zing.cql.CQLNode;
    2624
    2725import eu.clarin.cmdi.mdservice.action.Admin;

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Result.java

    r466 r627  
    11package eu.clarin.cmdi.mdservice.model;
    22
    3 import java.io.ByteArrayInputStream;
    4 import java.io.ByteArrayOutputStream;
    53import java.io.IOException;
    64import java.io.InputStream;
    7 import java.io.OutputStream;
    85
    96import javax.xml.transform.TransformerException;
    107
    118import eu.clarin.cmdi.mdservice.action.Admin;
    12 import eu.clarin.cmdi.mdservice.action.Helpers;
    139import eu.clarin.cmdi.mdservice.action.MDTransformer;
    1410

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/SearchClause.java

    r615 r627  
    55 */
    66
    7 import java.io.IOException;
    8 import java.net.MalformedURLException;
    9 import java.net.URL;
    10 import java.util.Hashtable;
    11 import java.util.Map;
    12 
    13 import org.w3c.dom.*;
    14 import javax.xml.parsers.*;
    15 
    16 import org.xml.sax.SAXException;
    17 
    18 import eu.clarin.cmdi.mdservice.action.Admin;
    197
    208

  • MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/SearchClauses.java

    r615 r627  
    11package eu.clarin.cmdi.mdservice.model;
    22
    3 import java.io.IOException;
    4 import java.net.MalformedURLException;
    5 
    6 import org.xml.sax.SAXException;
    7 import java.io.*;
    8 //DOM classes.
    9 import org.w3c.dom.*;
    10 
     3import java.io.StringWriter;
     4
     5import javax.xml.transform.OutputKeys;
     6import javax.xml.transform.Transformer;
     7import javax.xml.transform.TransformerConfigurationException;
     8import javax.xml.transform.TransformerException;
     9import javax.xml.transform.TransformerFactory;
     10import javax.xml.transform.dom.DOMSource;
     11import javax.xml.transform.stream.StreamResult;
     12
     13import org.w3c.dom.Document;
     14import org.w3c.dom.Element;
     15import org.w3c.dom.Node;
     16import org.w3c.dom.NodeList;
     17
     18import eu.clarin.cmdi.mdservice.action.Admin;
    1119import eu.clarin.cmdi.mdservice.action.DCRProxyAction;
    12 //JAXP 1.1
    13 import javax.xml.parsers.*;
    14 import javax.xml.transform.*;
    15 import javax.xml.transform.stream.*;
    16 import javax.xml.transform.dom.*;
    17 
    18 import eu.clarin.cmdi.mdservice.action.Admin;
    19 import eu.clarin.cmdi.mdservice.action.MDTransformer;
    2020
    2121
Note: See TracChangeset for help on using the changeset viewer.