Changeset 1511 for MDService2
- Timestamp:
- 09/03/11 19:51:07 (13 years ago)
- Location:
- MDService2/branches/MDService_simple2
- Files:
-
- 16 added
- 10 deleted
- 18 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/AdminAction.java
r1274 r1511 9 9 import java.util.Date; 10 10 import java.util.HashMap; 11 12 import eu.clarin.cmdi.mdservice.internal.Cache; 11 13 12 14 import net.sf.json.JSONObject; … … 23 25 * 24 26 */ 25 public class AdminAction extends Generic ProxyAction {27 public class AdminAction extends GenericAction { 26 28 27 29 private static final long serialVersionUID = 1L; 28 30 29 private String proxy_key = "admin";31 30 32 private String date; 31 33 private String datefrom; 32 34 private String dateto; 33 35 34 @Override35 protected void initialize(){36 setRepositoryByIndex(0);37 }38 36 public String getDate() { 39 37 return date; … … 64 62 public String getFullFormat() { 65 63 return "admin2" + getFormat(); 66 }67 68 @Override69 public String getProxyKey() {70 return proxy_key;71 64 } 72 65 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java
r1076 r1511 4 4 import java.io.InputStream; 5 5 import java.net.URL; 6 7 import eu.clarin.cmdi.mdservice.internal.Admin; 8 import eu.clarin.cmdi.mdservice.internal.Cache; 9 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 6 10 7 11 /** -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java
r799 r1511 15 15 import javax.xml.xpath.XPathFactory; 16 16 17 import org.apache.log4j.Logger; 17 18 import org.w3c.dom.Document; 18 19 import org.w3c.dom.Node; 19 20 import org.w3c.dom.NodeList; 20 21 22 import eu.clarin.cmdi.mdservice.internal.Admin; 21 23 import eu.clarin.cmdi.mdservice.model.Termset; 22 24 … … 33 35 34 36 private String proxy_key = "dcregistry"; 37 private static Logger log = Logger.getLogger("DCRProxyAction"); 35 38 36 39 private String dcrid; … … 138 141 // FIXME: although this should be competence of TermsProxyAction 139 142 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")); 141 144 resultStream = this.getClass().getClassLoader().getResourceAsStream(Admin.getConfig().getProperty("terms.file")); 142 145 } else { … … 148 151 if (getDCRAttr("format").equals("dcif")) { 149 152 urlConnection.setRequestProperty("Accept", "application/dcif+xml"); 150 Admin.notifyUser("setting header Accept:" + urlConnection.getRequestProperty("Accept"));153 log.debug("setting header Accept:" + urlConnection.getRequestProperty("Accept")); 151 154 } 152 155 //urlConnection.setRequestProperty("Accept-Language", getLang()); -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r1508 r1511 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.BufferedInputStream;4 import java.io.BufferedReader;5 import java.io.File;6 import java.io.FileInputStream;7 3 import java.io.IOException; 8 4 import java.io.InputStream; 9 import java.io.InputStreamReader;10 5 import java.net.MalformedURLException; 11 import java.net.URISyntaxException;12 6 import java.net.URL; 13 7 import java.util.HashMap; 14 8 15 9 import 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 11 import org.apache.log4j.Logger; 27 12 import org.apache.struts2.interceptor.ServletRequestAware; 28 import com.opensymphony.xwork2.ActionSupport; 13 14 import eu.clarin.cmdi.mdservice.internal.Admin; 15 import eu.clarin.cmdi.mdservice.internal.Cache; 16 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 17 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 29 18 import eu.clarin.cmdi.mdservice.model.Diagnostics; 30 19 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile; … … 37 26 * @author vronk 38 27 */ 39 public class GenericProxyAction extends ActionSupport28 public class GenericProxyAction extends GenericAction 40 29 implements ServletRequestAware 41 30 { 42 31 43 32 private static final long serialVersionUID = 1L; 44 33 private static Logger log = Logger.getLogger("GenericProxyAction"); 45 34 46 35 private Diagnostics diagnostics; … … 59 48 private String lang="en"; 60 49 private int maxdepth; 61 private String format ="xml"; // default no transformation50 private String format; 62 51 private String options; 63 52 private String actionContentType; … … 405 394 } 406 395 407 public String addDurationKey(){ 396 397 398 public String addDurationKey(){ 408 399 String req_key = getRequestKey(); 409 400 … … 469 460 String xcid; 470 461 462 // Admin.notifyUser("GPA.prepareSourceStream"); 463 471 464 if (getCache().equals(Cache.SKIP)) { 472 465 … … 505 498 } 506 499 507 Admin.notifyUser(getProxyKey() + " success:" + (resultStream!=null));500 log.debug(getProxyKey() + " success:" + (resultStream!=null)); 508 501 } 509 502 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/GenericWorkspaceAction.java
r911 r1511 2 2 3 3 import java.io.BufferedInputStream; 4 import java.io.ByteArrayInputStream;5 4 import java.io.File; 6 5 import java.io.FileInputStream; … … 10 9 import java.net.URL; 11 10 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; 11 import org.apache.log4j.Logger; 21 12 22 13 import com.opensymphony.xwork2.ActionSupport; 14 15 import eu.clarin.cmdi.mdservice.internal.Admin; 16 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 23 17 24 18 /** 25 19 * 26 * @author 20 * @author gaba 27 21 * 28 22 */ … … 31 25 32 26 private static final long serialVersionUID = 1L; 27 private static Logger log = Logger.getLogger("GenericWorkspaceAction"); 33 28 34 29 /** … … 116 111 URL url=null; 117 112 try{ 118 url=file.toUR L();113 url=file.toURI().toURL(); 119 114 Admin.notifyUser(" JSON TEST: url " + url); 120 115 } catch (MalformedURLException e){ … … 144 139 URL url=null; 145 140 try{ 146 url=file.toUR L();141 url=file.toURI().toURL(); 147 142 //Admin.notifyUser("url " + url); 148 143 } catch (MalformedURLException e){ … … 161 156 public InputStream getSourceStream() throws IOException { 162 157 InputStream stream = new BufferedInputStream( new FileInputStream(getPath())); 163 164 158 165 159 return stream; … … 169 163 return stream; 170 164 } 171 @SuppressWarnings("deprecation")165 172 166 public void prepare() throws Exception { 173 167 174 //Admin.notifyUser(getProxyKey() + ".targetURL: " + getTargetRequest() + " .format:" + getFullFormat()); 175 Admin.notifyUser("execute:"); 168 //Admin.notifyUser(getProxyKey() + ".targetURL: " + getTargetRequest() + " .format:" + getFullFormat()); 176 169 sourceStream = getSourceStream(); 177 170 if (format.equals("xml")) { … … 187 180 } 188 181 189 Admin.notifyUser(getProxyKey() + " success:" + (resultStream!=null));182 log.debug(getProxyKey() + " success:" + (resultStream!=null)); 190 183 } 191 184 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/SaveWorkspaceAction.java
r684 r1511 2 2 3 3 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; 4 import java.io.ByteArrayInputStream; 17 5 import java.io.IOException; 18 6 import java.io.InputStream; 19 7 import java.io.StringReader; 20 8 import java.io.StringWriter; 21 import java.net.MalformedURLException;22 import java.net.URL;23 import java.util.HashMap;24 import java.io.ByteArrayInputStream;25 9 26 10 import javax.xml.parsers.DocumentBuilder; … … 36 20 import javax.xml.transform.stream.StreamResult; 37 21 38 import org.apache.commons.io.IOUtils; 22 import net.sf.json.JSON; 23 import net.sf.json.JSONSerializer; 24 import net.sf.json.xml.XMLSerializer; 25 39 26 import org.w3c.dom.Document; 40 import org.w3c.dom.Element;41 27 import org.w3c.dom.Node; 42 28 import org.w3c.dom.NodeList; … … 44 30 import org.xml.sax.SAXException; 45 31 46 import eu.clarin.cmdi.mdservice. model.Query;32 import eu.clarin.cmdi.mdservice.internal.Admin; 47 33 48 34 /** -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/StaticAction.java
r1505 r1511 9 9 10 10 /** 11 * 11 * Simple Action to serve local static xml-data (pieces of documentation, and such) 12 12 * 13 13 */ … … 15 15 16 16 private static final long serialVersionUID = 1L; 17 18 private String proxy_key = "static";19 20 @Override21 public String getProxyKey() {22 return proxy_key;23 }24 17 25 18 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java
r1488 r1511 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.File;4 3 import java.io.IOException; 5 4 import java.io.InputStream; 6 5 import java.net.MalformedURLException; 7 6 import java.net.URL; 8 import java.util.HashMap;9 import java.io.ByteArrayInputStream;10 7 11 8 import javax.xml.transform.TransformerException; 12 9 13 import org.w3c.dom.Node; 14 import org.w3c.dom.NodeList; 15 16 import eu.clarin.cmdi.mdservice.model.Query; 10 import eu.clarin.cmdi.mdservice.internal.Admin; 11 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 12 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 17 13 import eu.clarin.cmdi.mdservice.model.Termset; 18 14 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java
r1435 r1511 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.BufferedInputStream;4 3 import 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;10 4 import java.io.InputStream; 11 5 import java.io.InputStreamReader; 12 import java.io.OutputStream;13 6 import java.io.OutputStreamWriter; 14 7 import java.net.HttpURLConnection; 15 import java.net.MalformedURLException;16 8 import java.net.URL; 17 9 import java.net.URLConnection; 18 import java.text.DateFormat;19 import java.text.SimpleDateFormat;20 import java.util.Date;21 10 import java.util.HashMap; 22 11 23 12 import org.w3c.dom.NodeList; 24 13 25 import net.sf.json.JSONObject; 26 import net.sf.json.xml.XMLSerializer; 14 import eu.clarin.cmdi.mdservice.internal.Admin; 15 import eu.clarin.cmdi.mdservice.internal.Cache; 16 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 27 17 28 18 /** -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r1435 r1511 2 2 3 3 import java.io.BufferedInputStream; 4 import java.io.BufferedReader;5 4 import java.io.ByteArrayInputStream; 6 5 import java.io.ByteArrayOutputStream; 7 6 import java.io.File; 8 7 import java.io.FileInputStream; 9 import java.io.FileNotFoundException;10 8 import java.io.FileWriter; 11 9 import java.io.IOException; 12 10 import java.io.InputStream; 13 import java.io.InputStreamReader; 14 import java.io.Reader; 11 import java.io.StringWriter; 15 12 import java.io.UnsupportedEncodingException; 16 import java.io.Writer;17 13 import java.net.MalformedURLException; 18 14 import java.net.URL; … … 20 16 import java.text.SimpleDateFormat; 21 17 import 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 30 19 import javax.xml.parsers.DocumentBuilder; 31 20 import javax.xml.parsers.DocumentBuilderFactory; … … 41 30 import javax.xml.transform.dom.DOMSource; 42 31 import javax.xml.transform.stream.StreamResult; 43 import javax.xml.transform.stream.StreamSource;44 32 import javax.xml.xpath.XPath; 45 33 import javax.xml.xpath.XPathConstants; … … 48 36 import javax.xml.xpath.XPathFactory; 49 37 50 51 38 import net.sf.json.JSON; 52 import net.sf.json.JSONArray;53 39 import net.sf.json.JSONObject; 54 40 import net.sf.json.JSONSerializer; 55 41 import net.sf.json.xml.XMLSerializer; 56 42 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; 43 import org.apache.log4j.Logger; 65 44 import org.w3c.dom.DOMException; 66 45 import org.w3c.dom.Document; … … 68 47 import org.w3c.dom.Node; 69 48 import org.w3c.dom.NodeList; 70 import org.xml.sax.InputSource;71 49 import org.xml.sax.SAXException; 72 50 73 import com.opensymphony.xwork2.ActionSupport; 51 import eu.clarin.cmdi.mdservice.internal.Admin; 52 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 53 import eu.clarin.cmdi.mdservice.model.Diagnostic; 74 54 75 55 … … 84 64 85 65 private static final long serialVersionUID = 1L; 66 private static Logger log = Logger.getLogger("WorkspaceAction"); 86 67 87 68 // workspaceprofiles … … 217 198 } 218 199 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 259 201 @Override 260 202 public URL getBaseURL() { … … 262 204 URL url=null; 263 205 try{ 264 url=file.toUR L();265 Admin.notifyUser("DEBUG: WorkspaceAction.getBaseURL(): " + url);206 url=file.toURI().toURL(); 207 log.debug("DEBUG: WorkspaceAction.getBaseURL(): " + url); 266 208 } 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() ); 268 211 } 269 212 … … 300 243 profilename = ADMINISTRATION_FILENAME; 301 244 } else if (type.toLowerCase().equals(FILENAME)){ 302 profilename = this.WORKSPACE_FILENAME;245 profilename = WORKSPACE_FILENAME; 303 246 } 304 247 … … 321 264 URL url=null; 322 265 try{ 323 url=file.toUR L();266 url=file.toURI().toURL(); 324 267 //Admin.notifyUser("url " + url); 325 268 } catch (MalformedURLException e){ … … 332 275 public String getPath() { 333 276 String targetPath = getBasePath() + this.WORKSPACE_FILENAME;//getWorkspaceProfile(); 334 Admin.notifyUser("WorkspaceAction TARGETPATH: " + targetPath);277 log.debug("WorkspaceAction TARGETPATH: " + targetPath); 335 278 return targetPath; 336 279 } … … 1042 985 } 1043 986 1044 Admin.notifyUser(getProxyKey() + " success:" + (getResultStream()!=null));987 log.debug(getProxyKey() + " success:" + (getResultStream()!=null)); 1045 988 } 1046 989 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/Diagnostic.java
r1187 r1511 28 28 import org.z3950.zing.cql.CQLParser; 29 29 30 import eu.clarin.cmdi.mdservice. action.Admin;31 import eu.clarin.cmdi.mdservice. action.MDTransformer;30 import eu.clarin.cmdi.mdservice.internal.Admin; 31 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 32 32 33 33 public class Diagnostic { -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/Diagnostics.java
r1187 r1511 41 41 import org.z3950.zing.cql.CQLParser; 42 42 43 import eu.clarin.cmdi.mdservice. action.Admin;44 import eu.clarin.cmdi.mdservice. action.MDTransformer;43 import eu.clarin.cmdi.mdservice.internal.Admin; 44 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 45 45 46 46 public class Diagnostics { -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/Query.java
r1508 r1511 26 26 import org.z3950.zing.cql.CQLParser; 27 27 28 import eu.clarin.cmdi.mdservice. action.Admin;29 import eu.clarin.cmdi.mdservice. action.MDTransformer;30 import eu.clarin.cmdi.mdservice. action.NoStylesheetException;28 import eu.clarin.cmdi.mdservice.internal.Admin; 29 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 30 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 31 31 32 32 public class Query { … … 518 518 } 519 519 520 /**521 * OBSOLETED! MDRepoProxyAction executes the request, Query only provides itself encoded522 * runs the query! by opening the stream on the targetService/URL523 * setting it as inputStream of the Result524 * @throws Exception525 */526 /* public void execute() throws Exception {527 528 result.setInputStream(getTargetRequest().openStream());529 530 }531 */532 533 520 534 521 } -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/Result.java
r1488 r1511 6 6 import javax.xml.transform.TransformerException; 7 7 8 import eu.clarin.cmdi.mdservice. action.Admin;9 import eu.clarin.cmdi.mdservice. action.MDTransformer;10 import eu.clarin.cmdi.mdservice. action.NoStylesheetException;8 import eu.clarin.cmdi.mdservice.internal.Admin; 9 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 10 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 11 11 12 12 /** -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/SearchClauses.java
r627 r1511 16 16 import org.w3c.dom.NodeList; 17 17 18 import eu.clarin.cmdi.mdservice. action.Admin;18 import eu.clarin.cmdi.mdservice.internal.Admin; 19 19 import eu.clarin.cmdi.mdservice.action.DCRProxyAction; 20 20 -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/Termset.java
r795 r1511 13 13 import org.w3c.dom.NodeList; 14 14 15 import eu.clarin.cmdi.mdservice. action.Admin;15 import eu.clarin.cmdi.mdservice.internal.Admin; 16 16 17 17 public class Termset { -
MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/model/WorkspaceProfile.java
r1496 r1511 11 11 import net.sf.json.JSONArray; 12 12 import net.sf.json.JSONObject; 13 import eu.clarin.cmdi.mdservice. action.Admin;13 import eu.clarin.cmdi.mdservice.internal.Admin; 14 14 import eu.clarin.cmdi.mdservice.action.GenericProxyAction; 15 import eu.clarin.cmdi.mdservice.action.Helpers; 16 import eu.clarin.cmdi.mdservice.action.MDTransformer; 17 import eu.clarin.cmdi.mdservice.action.NoStylesheetException; 15 import eu.clarin.cmdi.mdservice.internal.Helpers; 16 import eu.clarin.cmdi.mdservice.internal.MDTransformer; 18 17 import eu.clarin.cmdi.mdservice.action.WorkspaceAction; 18 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 19 19 20 20 /** -
MDService2/branches/MDService_simple2/src/struts.xml
r1508 r1511 88 88 </action> 89 89 90 <action name="collections/*" class="eu.clarin.cmdi.mdservice.action.CollectionProxyAction" method="execute">91 <param name="format">{1}</param>92 <param name="actionkey">collections</param>93 <result type="stream">94 <param name="contentType">text/xml</param>95 <param name="inputName">resultStream</param>96 </result>97 </action>98 90 99 91 <action name="comp/*" class="eu.clarin.cmdi.mdservice.action.CompRegistryProxyAction" method="execute"> … … 203 195 </action> 204 196 205 <action name="pazpar2/" class="eu.clarin.cmdi.mdservice.action.Pz2 ProxyAction" method="execute">197 <action name="pazpar2/" class="eu.clarin.cmdi.mdservice.action.Pz2Action" method="execute"> 206 198 <result name="success" type="stream"> 207 199 <param name="contentType">${getActionContentType()}</param> … … 210 202 </action> 211 203 212 <action name="sru/*" class="eu.clarin.cmdi.mdservice.action.SRU ProxyAction" method="execute">204 <action name="sru/*" class="eu.clarin.cmdi.mdservice.action.SRUAction" method="execute"> 213 205 <param name="q">{1}</param> 214 206 <result name="success" type="stream"> … … 222 214 </action> 223 215 224 <action name="model/*" class="eu.clarin.cmdi.mdservice.action.Repo ProxyAction" method="execute">216 <action name="model/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 225 217 <param name="q">{1}</param> 226 218 <param name="actionkey">model</param> … … 231 223 </action> 232 224 233 <action name="search/*" class="eu.clarin.cmdi.mdservice.action.Repo ProxyAction" method="execute">225 <action name="search/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 234 226 <param name="q">{*}</param> 235 227 <param name="actionkey">search</param> … … 240 232 </action> 241 233 242 <action name="record/*" class="eu.clarin.cmdi.mdservice.action.Repo ProxyAction" method="execute">234 <action name="record/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 243 235 <param name="q">{1}</param> 244 236 <param name="actionkey">record</param> … … 249 241 </action> 250 242 243 <action name="collections/*" class="eu.clarin.cmdi.mdservice.action.RepoAction" method="execute"> 244 <param name="format">{1}</param> 245 <param name="actionkey">collections</param> 246 <result type="stream"> 247 <param name="contentType">${getActionContentType()}</param> 248 <param name="inputName">resultStream</param> 249 </result> 250 </action> 251 251 252 252 253 </package>
Note: See TracChangeset
for help on using the changeset viewer.