Changeset 1511 for MDService2/branches/MDService_simple2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

Timestamp:

09/03/11 19:51:07 (13 years ago)

Author:

vronk

Message:

brutal refactoring,
added new packages: proxies, internal,
very much restructured Action hierarchy.
Introduced division Action/Proxy?.
This is a first compiling version.
it's total mess.

Location:

MDService2/branches/MDService_simple2

Files:

• . (copied) (copied from MDService2/branches/MDService_simple)
• src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.mdservice.action;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.xml.transform.TransformerException;
-
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
-//import net.sf.saxon.Controller;
-//import net.sf.saxon.event.MessageEmitter;
-
-
+
+import org.apache.log4j.Logger;
 import org.apache.struts2.interceptor.ServletRequestAware;
-import com.opensymphony.xwork2.ActionSupport;
+
+import eu.clarin.cmdi.mdservice.internal.Admin;
+import eu.clarin.cmdi.mdservice.internal.Cache;
+import eu.clarin.cmdi.mdservice.internal.MDTransformer;
+import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
 import eu.clarin.cmdi.mdservice.model.Diagnostics;
 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
@@ -37 +26 @@
  * @author vronk
  */
-public class GenericProxyAction extends ActionSupport 
+public class GenericProxyAction extends GenericAction 
 implements ServletRequestAware 
 {
 
         private static final long serialVersionUID = 1L;
-        
+        private static Logger log = Logger.getLogger("GenericProxyAction");
         
         private Diagnostics diagnostics;
@@ -59 +48 @@
         private String lang="en";
         private int maxdepth;   
-        private String format="xml"; // default no transformation
+        private String format;
         private String options;
         private String actionContentType;
@@ -405 +394 @@
         }
         
-        public String addDurationKey(){
+        
+        
+                public String addDurationKey(){
                 String req_key = getRequestKey();
         
@@ -469 +460 @@
                 String xcid;
         
+                // Admin.notifyUser("GPA.prepareSourceStream");
+                
                 if (getCache().equals(Cache.SKIP)) {
                         
@@ -505 +498 @@
                 }
                         
-                Admin.notifyUser(getProxyKey() + " success:" + (resultStream!=null));
+                log.debug(getProxyKey() + " success:" + (resultStream!=null));
         }