Changeset 1512 for MDService2


Ignore:
Timestamp:
09/04/11 20:08:45 (13 years ago)
Author:
vronk
Message:

troubles commiting - trying once again:
dynamic handling of request-params.
basic static and repo request should work

Location:
MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action
Files:
4 added
10 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/AdminAction.java

    r1274 r1512  
    99import java.util.Date;
    1010import java.util.HashMap;
     11
     12import eu.clarin.cmdi.mdservice.internal.Cache;
    1113
    1214import net.sf.json.JSONObject;
    … …  
    2325 *
    2426 */
    25 public class AdminAction extends GenericProxyAction {
     27public class AdminAction extends GenericAction {
    2628
    2729        private static final long serialVersionUID = 1L;
    2830       
    29         private String proxy_key = "admin";
     31       
    3032        private String date;
    3133        private String datefrom;
    3234        private String dateto;
    3335       
    34         @Override
    35         protected void  initialize(){
    36                 setRepositoryByIndex(0);
    37          }
    3836        public String getDate() {
    3937                return date;
    … …  
    6462        public String getFullFormat() {
    6563                return "admin2" + getFormat();
    66         }
    67        
    68         @Override
    69         public String getProxyKey() {
    70                 return proxy_key;
    7164        }
    7265       

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

    r1076 r1512  
    44import java.io.InputStream;
    55import java.net.URL;
     6
     7import eu.clarin.cmdi.mdservice.internal.Admin;
     8import eu.clarin.cmdi.mdservice.internal.Cache;
     9import eu.clarin.cmdi.mdservice.internal.MDTransformer;
    610
    711/**

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java

    r799 r1512  
    1515import javax.xml.xpath.XPathFactory;
    1616
     17import org.apache.log4j.Logger;
    1718import org.w3c.dom.Document;
    1819import org.w3c.dom.Node;
    1920import org.w3c.dom.NodeList;
    2021
     22import eu.clarin.cmdi.mdservice.internal.Admin;
    2123import eu.clarin.cmdi.mdservice.model.Termset;
    2224
    … …  
    3335
    3436        private String proxy_key = "dcregistry";
     37        private static Logger log = Logger.getLogger("DCRProxyAction");
    3538       
    3639        private String dcrid;
    … …  
    138141                // FIXME: although this should be competence of TermsProxyAction
    139142                if ((getQ().equals(ALL) || getQ()==null || getQ().equals("")) && (getActionkey().equals(DATCATS))) {
    140                         Admin.notifyUser("serving terms.file:" + Admin.getConfig().getProperty("terms.file"));
     143                        log.debug("serving terms.file:" + Admin.getConfig().getProperty("terms.file"));
    141144                        resultStream = this.getClass().getClassLoader().getResourceAsStream(Admin.getConfig().getProperty("terms.file"));
    142145                } else {
    … …  
    148151                if (getDCRAttr("format").equals("dcif")) {             
    149152                        urlConnection.setRequestProperty("Accept", "application/dcif+xml");
    150                         Admin.notifyUser("setting header Accept:" + urlConnection.getRequestProperty("Accept"));
     153                        log.debug("setting header Accept:" + urlConnection.getRequestProperty("Accept"));
    151154                }
    152155        //urlConnection.setRequestProperty("Accept-Language", getLang());

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

    r1508 r1512  
    11package eu.clarin.cmdi.mdservice.action;
    22
    3 import java.io.BufferedInputStream;
    4 import java.io.BufferedReader;
    5 import java.io.File;
    6 import java.io.FileInputStream;
    73import java.io.IOException;
    84import java.io.InputStream;
    9 import java.io.InputStreamReader;
    105import java.net.MalformedURLException;
    11 import java.net.URISyntaxException;
    126import java.net.URL;
    137import java.util.HashMap;
    148
    159import javax.servlet.http.HttpServletRequest;
    16 import javax.servlet.http.HttpSession;
    17 import javax.xml.transform.TransformerException;
    18 
    19 import net.sf.json.JSON;
    20 import net.sf.json.JSONArray;
    21 import net.sf.json.JSONObject;
    22 import net.sf.json.JSONSerializer;
    23 //import net.sf.saxon.Controller;
    24 //import net.sf.saxon.event.MessageEmitter;
    25 
    26 
     10
     11import org.apache.log4j.Logger;
    2712import org.apache.struts2.interceptor.ServletRequestAware;
    28 import com.opensymphony.xwork2.ActionSupport;
     13
     14import eu.clarin.cmdi.mdservice.internal.Admin;
     15import eu.clarin.cmdi.mdservice.internal.Cache;
     16import eu.clarin.cmdi.mdservice.internal.MDTransformer;
     17import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
    2918import eu.clarin.cmdi.mdservice.model.Diagnostics;
    3019import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
    … …  
    3726 * @author vronk
    3827 */
    39 public class GenericProxyAction extends ActionSupport
     28public class GenericProxyAction extends GenericAction
    4029implements ServletRequestAware
    4130{
    4231
    4332        private static final long serialVersionUID = 1L;
    44        
     33        private static Logger log = Logger.getLogger("GenericProxyAction");
    4534       
    4635        private Diagnostics diagnostics;
    … …  
    5948        private String lang="en";
    6049        private int maxdepth;   
    61         private String format="xml"; // default no transformation
     50        private String format;
    6251        private String options;
    6352        private String actionContentType;
    … …  
    405394        }
    406395       
    407         public String addDurationKey(){
     396       
     397       
     398                public String addDurationKey(){
    408399                String req_key = getRequestKey();
    409400       
    … …  
    469460                String xcid;
    470461       
     462                // Admin.notifyUser("GPA.prepareSourceStream");
     463               
    471464                if (getCache().equals(Cache.SKIP)) {
    472465                       
    … …  
    505498                }
    506499                       
    507                 Admin.notifyUser(getProxyKey() + " success:" + (resultStream!=null));
     500                log.debug(getProxyKey() + " success:" + (resultStream!=null));
    508501        }
    509502

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/GenericWorkspaceAction.java

    r911 r1512  
    22
    33import java.io.BufferedInputStream;
    4 import java.io.ByteArrayInputStream;
    54import java.io.File;
    65import java.io.FileInputStream;
    … …  
    109import java.net.URL;
    1110
    12 import javax.servlet.http.HttpServletRequest;
    13 import javax.xml.transform.TransformerException;
    14 
    15 import net.sf.json.JSON;
    16 import net.sf.json.JSONSerializer;
    17 import net.sf.json.xml.XMLSerializer;
    18 
    19 import org.apache.commons.io.IOUtils;
    20 import org.apache.struts2.interceptor.ServletRequestAware;
     11import org.apache.log4j.Logger;
    2112
    2213import com.opensymphony.xwork2.ActionSupport;
     14
     15import eu.clarin.cmdi.mdservice.internal.Admin;
     16import eu.clarin.cmdi.mdservice.internal.MDTransformer;
    2317
    2418/**
    2519 *
    26  * @author
     20 * @author gaba
    2721 *
    2822 */
    … …  
    3125
    3226        private static final long serialVersionUID = 1L;
     27        private static Logger log = Logger.getLogger("GenericWorkspaceAction");
    3328       
    3429        /**
    … …  
    116111            URL url=null;
    117112            try{
    118                     url=file.toURL();
     113                    url=file.toURI().toURL();
    119114                    Admin.notifyUser(" JSON TEST: url "  + url);
    120115            } catch (MalformedURLException e){
    … …  
    144139            URL url=null;
    145140            try{
    146                     url=file.toURL();
     141                    url=file.toURI().toURL();
    147142                    //Admin.notifyUser("url "  + url);
    148143            } catch (MalformedURLException e){
    … …  
    161156        public InputStream getSourceStream() throws IOException {       
    162157                InputStream stream = new BufferedInputStream( new FileInputStream(getPath()));
    163        
    164158               
    165159                return   stream;
    … …  
    169163                return stream;
    170164        }
    171         @SuppressWarnings("deprecation")
     165       
    172166        public void prepare() throws Exception {               
    173167               
    174                 //Admin.notifyUser(getProxyKey() + ".targetURL: " + getTargetRequest() + " .format:" + getFullFormat());
    175                 Admin.notifyUser("execute:");
     168                //Admin.notifyUser(getProxyKey() + ".targetURL: " + getTargetRequest() + " .format:" + getFullFormat());               
    176169                sourceStream = getSourceStream();
    177170                if (format.equals("xml")) {                     
    … …  
    187180                }
    188181                       
    189                 Admin.notifyUser(getProxyKey() + " success:" + (resultStream!=null));
     182                log.debug(getProxyKey() + " success:" + (resultStream!=null));
    190183        }
    191184

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/SaveWorkspaceAction.java

    r684 r1512  
    22
    33
    4 import org.apache.commons.lang.*;
    5 import com.opensymphony.xwork2.ActionSupport;
    6 import net.sf.json.JSON;
    7 import net.sf.json.JSONArray;
    8 import net.sf.json.JSONObject;
    9 import net.sf.json.JSONSerializer;
    10 import net.sf.json.JSONException;
    11 import net.sf.json.xml.XMLSerializer;
    12 
    13 import java.io.BufferedInputStream;
    14 import java.io.File;
    15 import java.io.FileInputStream;
    16 import java.io.FileWriter;
     4import java.io.ByteArrayInputStream;
    175import java.io.IOException;
    186import java.io.InputStream;
    197import java.io.StringReader;
    208import java.io.StringWriter;
    21 import java.net.MalformedURLException;
    22 import java.net.URL;
    23 import java.util.HashMap;
    24 import java.io.ByteArrayInputStream;
    259
    2610import javax.xml.parsers.DocumentBuilder;
    … …  
    3620import javax.xml.transform.stream.StreamResult;
    3721
    38 import org.apache.commons.io.IOUtils;
     22import net.sf.json.JSON;
     23import net.sf.json.JSONSerializer;
     24import net.sf.json.xml.XMLSerializer;
     25
    3926import org.w3c.dom.Document;
    40 import org.w3c.dom.Element;
    4127import org.w3c.dom.Node;
    4228import org.w3c.dom.NodeList;
    … …  
    4430import org.xml.sax.SAXException;
    4531
    46 import eu.clarin.cmdi.mdservice.model.Query;
     32import eu.clarin.cmdi.mdservice.internal.Admin;
    4733
    4834/**

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/StaticAction.java

    r1505 r1512  
    22
    33import java.io.IOException;
     4import java.io.InputStream;
    45import java.net.MalformedURLException;
    56import java.net.URL;
     7
     8import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
     9import eu.clarin.cmdi.mdservice.proxy.LocalProxy;
    610
    711import net.sf.json.JSONObject;
    … …  
    913
    1014/**
    11  *
     15 * Simple Action to serve local static xml-data (pieces of documentation, and such)
    1216 *
    1317 */
    14 public class StaticAction extends GenericProxyAction {
     18public class StaticAction extends GenericAction {
    1519
    1620        private static final long serialVersionUID = 1L;
    1721       
    18         private String proxy_key = "static";
    19 
    20         @Override
    21         public String getProxyKey() {
    22                 return proxy_key;
     22        public void setTargetProxy(){
     23                setTargetProxy(new LocalProxy());
    2324        }
    2425       
    25        
     26/*
    2627        public URL getTargetRequest() throws IOException {
    2728               
    2829                URL targetURL = null;
    29                 //targetURL =new URL( getBaseURL(), getActionkey());
    30                 //FIXME: get maxdepth-constant out of here !!
     30
    3131                targetURL = new URL(getBaseURL(), getQ() + ".xml");
    32                 //Admin.notifyUser("CollectionProxy.targetURL:" + targetURL);
    33 
     32       
    3433            return targetURL;
    3534        }
    36        
     35
     36        public InputStream getSourceStream() throws IOException, NoStylesheetException {               
     37                return getTargetRequest().openStream();
     38        }
     39*/
    3740}

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java

    r1488 r1512  
    11package eu.clarin.cmdi.mdservice.action;
    22
    3 import java.io.File;
    43import java.io.IOException;
    54import java.io.InputStream;
    65import java.net.MalformedURLException;
    76import java.net.URL;
    8 import java.util.HashMap;
    9 import java.io.ByteArrayInputStream;
    107
    118import javax.xml.transform.TransformerException;
    129
    13 import org.w3c.dom.Node;
    14 import org.w3c.dom.NodeList;
    15 
    16 import eu.clarin.cmdi.mdservice.model.Query;
     10import eu.clarin.cmdi.mdservice.internal.Admin;
     11import eu.clarin.cmdi.mdservice.internal.MDTransformer;
     12import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
    1713import eu.clarin.cmdi.mdservice.model.Termset;
    1814

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java

    r1435 r1512  
    11package eu.clarin.cmdi.mdservice.action;
    22
    3 import java.io.BufferedInputStream;
    43import java.io.BufferedReader;
    5 import java.io.ByteArrayInputStream;
    6 import java.io.ByteArrayOutputStream;
    7 import java.io.File;
    8 import java.io.FileInputStream;
    9 import java.io.IOException;
    104import java.io.InputStream;
    115import java.io.InputStreamReader;
    12 import java.io.OutputStream;
    136import java.io.OutputStreamWriter;
    147import java.net.HttpURLConnection;
    15 import java.net.MalformedURLException;
    168import java.net.URL;
    179import java.net.URLConnection;
    18 import java.text.DateFormat;
    19 import java.text.SimpleDateFormat;
    20 import java.util.Date;
    2110import java.util.HashMap;
    2211
    2312import org.w3c.dom.NodeList;
    2413
    25 import net.sf.json.JSONObject;
    26 import net.sf.json.xml.XMLSerializer;
     14import eu.clarin.cmdi.mdservice.internal.Admin;
     15import eu.clarin.cmdi.mdservice.internal.Cache;
     16import eu.clarin.cmdi.mdservice.internal.MDTransformer;
    2717
    2818/**

  • MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java

    r1435 r1512  
    22
    33import java.io.BufferedInputStream;
    4 import java.io.BufferedReader;
    54import java.io.ByteArrayInputStream;
    65import java.io.ByteArrayOutputStream;
    76import java.io.File;
    87import java.io.FileInputStream;
    9 import java.io.FileNotFoundException;
    108import java.io.FileWriter;
    119import java.io.IOException;
    1210import java.io.InputStream;
    13 import java.io.InputStreamReader;
    14 import java.io.Reader;
     11import java.io.StringWriter;
    1512import java.io.UnsupportedEncodingException;
    16 import java.io.Writer;
    1713import java.net.MalformedURLException;
    1814import java.net.URL;
    … …  
    2016import java.text.SimpleDateFormat;
    2117import java.util.Date;
    22 import java.util.Enumeration;
    23 
    24 import java.io.StringReader;
    25 import java.io.StringWriter;
    26 
    27 import javax.servlet.ServletInputStream;
    28 import javax.servlet.http.HttpServletRequest;
    29 import javax.servlet.http.HttpSession;
     18
    3019import javax.xml.parsers.DocumentBuilder;
    3120import javax.xml.parsers.DocumentBuilderFactory;
    … …  
    4130import javax.xml.transform.dom.DOMSource;
    4231import javax.xml.transform.stream.StreamResult;
    43 import javax.xml.transform.stream.StreamSource;
    4432import javax.xml.xpath.XPath;
    4533import javax.xml.xpath.XPathConstants;
    … …  
    4836import javax.xml.xpath.XPathFactory;
    4937
    50 
    5138import net.sf.json.JSON;
    52 import net.sf.json.JSONArray;
    5339import net.sf.json.JSONObject;
    5440import net.sf.json.JSONSerializer;
    5541import net.sf.json.xml.XMLSerializer;
    5642
    57 import java.security.AccessController;
    58 import java.security.PrivilegedActionException;
    59 import java.security.PrivilegedExceptionAction;
    60 //import javax.servlet.ServletInputStream;
    61 
    62 
    63 import org.apache.struts2.interceptor.ServletRequestAware;
    64 import org.w3c.dom.Attr;
     43import org.apache.log4j.Logger;
    6544import org.w3c.dom.DOMException;
    6645import org.w3c.dom.Document;
    … …  
    6847import org.w3c.dom.Node;
    6948import org.w3c.dom.NodeList;
    70 import org.xml.sax.InputSource;
    7149import org.xml.sax.SAXException;
    7250
    73 import com.opensymphony.xwork2.ActionSupport;
     51import eu.clarin.cmdi.mdservice.internal.Admin;
     52import eu.clarin.cmdi.mdservice.internal.MDTransformer;
     53import eu.clarin.cmdi.mdservice.model.Diagnostic;
    7454
    7555
    … …  
    8464
    8565        private static final long serialVersionUID = 1L;
     66        private static Logger log = Logger.getLogger("WorkspaceAction");
    8667       
    8768        // workspaceprofiles
    … …  
    217198        }
    218199
    219         /*
    220         @Override
    221         public void setServletRequest(HttpServletRequest arg0) {
    222                 request = arg0;
    223                
    224         }
    225 
    226         @Override
    227         public HttpServletRequest getServletRequest() {
    228                 return request;         
    229         }
    230 */
    231         /*
    232         public String getUserMsg() {
    233                 return userMsg;
    234         }
    235 
    236         public void setUserMsg(String userMsg) {
    237                 this.userMsg = this.userMsg + "\n" + userMsg;
    238         }
    239 
    240 
    241         private InputStream resultStream;
    242         private InputStream sourceStream;
    243 */
    244         /**
    245          * The stream holding the resulting data to be sent back to the user as response
    246          * @return
    247          */
    248         /*
    249         public InputStream getResultStream() {
    250                 return resultStream;
    251     }
    252         public void setResultStream(InputStream _resultStream){
    253                 resultStream = _resultStream;
    254         }
    255         public void setSourceStream(InputStream _sourceStream){
    256                 sourceStream = _sourceStream;
    257         }
    258         */
     200       
    259201        @Override
    260202        public URL getBaseURL() {
    … …  
    262204            URL url=null;
    263205            try{
    264                     url=file.toURL();
    265                     Admin.notifyUser("DEBUG: WorkspaceAction.getBaseURL(): "  + url);
     206                    url=file.toURI().toURL();
     207                    log.debug("DEBUG: WorkspaceAction.getBaseURL(): "  + url);
    266208            } catch (MalformedURLException e){
    267                 Admin.notifyUser("JSON exception has been caught" + e);
     209                log.error("getBaseURL: JSON exception has been caught;\n getPath=" + getPath() );
     210                Diagnostics().Add(Diagnostic.SYSTEM_ERROR, "WorkspaceAction.getBaseURL()", "JSON exception has been caught;\n getPath=" + getPath() );         
    268211            }
    269212           
    … …  
    300243                        profilename =  ADMINISTRATION_FILENAME;
    301244                } else if (type.toLowerCase().equals(FILENAME)){
    302                         profilename = this.WORKSPACE_FILENAME;
     245                        profilename = WORKSPACE_FILENAME;
    303246                }
    304247               
    … …  
    321264            URL url=null;
    322265            try{
    323                     url=file.toURL();
     266                    url=file.toURI().toURL();
    324267                    //Admin.notifyUser("url "  + url);
    325268            } catch (MalformedURLException e){
    … …  
    332275        public String getPath() {
    333276                String targetPath = getBasePath() + this.WORKSPACE_FILENAME;//getWorkspaceProfile();       
    334         Admin.notifyUser("WorkspaceAction TARGETPATH: " + targetPath);             
     277        log.debug("WorkspaceAction TARGETPATH: " + targetPath);             
    335278        return targetPath;
    336279        }
    … …  
    1042985                }
    1043986                       
    1044                 Admin.notifyUser(getProxyKey() + " success:" + (getResultStream()!=null));
     987                log.debug(getProxyKey() + " success:" + (getResultStream()!=null));
    1045988        }
    1046989
Note: See TracChangeset for help on using the changeset viewer.