Changeset 1621
- Timestamp:
- 11/17/11 23:07:41 (13 years ago)
- Location:
- MDService2/branches/MDService_simple3/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java
r1613 r1621 5 5 import eu.clarin.cmdi.mdservice.model.Termset; 6 6 import eu.clarin.cmdi.mdservice.proxy.BasicProxy; 7 import eu.clarin.cmdi.mdservice.proxy.DCRProxy;7 //import eu.clarin.cmdi.mdservice.proxy.DCRProxy; 8 8 9 9 /** … … 80 80 public void setTargetProxy(){ 81 81 82 setTargetProxy(new DCRProxy());82 //setTargetProxy(new DCRProxy()); 83 83 84 84 } -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java
r1613 r1621 6 6 import java.util.HashMap; 7 7 import java.util.Map; 8 import java.util.Properties; 9 import java.util.jar.*; 8 10 9 11 import javax.servlet.http.HttpServletRequest; 12 10 13 import org.apache.log4j.Logger; 11 14 import org.apache.struts2.interceptor.ServletRequestAware; … … 13 16 14 17 import com.opensymphony.xwork2.ActionSupport; 18 import com.sun.xml.internal.ws.util.StringUtils; 15 19 16 20 import eu.clarin.cmdi.mdservice.internal.CQLParseException; … … 200 204 201 205 206 public GenericAction() { 207 //configure 208 Utils.loadConfig("mdservice", "mdservice.properties", this.getClass().getClassLoader()); 209 210 } 202 211 /** 203 212 * Is used in struts.xml to dynamically set the mime-type of the result, depending on the format-parameter … … 522 531 523 532 try{ 533 524 534 loadParams(); 525 535 … … 574 584 }else { 575 585 MDTransformer transformer = new MDTransformer(); 586 transformer.configure(Utils.getConfig(), this.getClass().getClassLoader()); 576 587 // set URL as srcFile (for MDTransformer to pass to xsl-scripts) 577 588 // TODO: WHY?? -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r1540 r1621 160 160 public WorkspaceAction () { 161 161 this.elementtype = WorkspaceAction.SE_WORKSPACE; 162 workspacefilename = Utils.getConfig().getProperty("workspaceprofile.path") + Utils.getConfig().getProperty("workspace.file"); 162 //workspacefilename = Utils.getConfig().getProperty("workspaceprofile.path") + Utils.getConfig().getProperty("workspace.file"); 163 workspacefilename = Utils.getConfig("workspaceprofile.path") + Utils.getConfig("workspace.file"); 163 164 if (workspace_doc == null){ 164 165 //workspacefilename = Utils.getConfig().getProperty("workspace.path") + Utils.getConfig().getProperty("workspace.file"); … … 224 225 public String getBasePath() { 225 226 if (base_path == null) { 226 base_path = Utils.getConfig().getProperty(getProxyKey() + ".path"); 227 //base_path = Utils.getConfig().getProperty(getProxyKey() + ".path"); 228 base_path = Utils.getConfig(getProxyKey() + ".path"); 227 229 } 228 230 return base_path; -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/WorkspaceProfile.java
r1540 r1621 134 134 135 135 public WorkspaceProfile() { 136 //configure 137 Utils.loadConfig(this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath(), "mdservice.properties", this.getClass().getClassLoader()); 138 136 139 } 137 140 … … 218 221 219 222 public static JSONArray createRepositories() throws IOException, InterruptedException, TransformerException, NoStylesheetException{ 220 String path = Utils.getConfig( ).getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;223 String path = Utils.getConfig("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER; 221 224 File file=new File(path); 222 225 InputStream in = new BufferedInputStream( new FileInputStream(path));; 223 226 224 227 MDTransformer transformer = new MDTransformer(); 228 transformer.configure(Utils.getAppConfig(WorkspaceProfile.class.getProtectionDomain().getCodeSource().getLocation().getPath()), WorkspaceProfile.class.getClassLoader()); 225 229 transformer.setSrcFile(file.toURI().toURL()); 226 230 transformer.setParams(MDTransformer.createParamsMap("xml2json")); -
MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/SMCProxy.java
r1614 r1621 5 5 import java.net.MalformedURLException; 6 6 import java.net.URL; 7 import java.net.URLConnection;7 //import java.net.URLConnection; 8 8 import java.util.Map; 9 9 … … 12 12 import eu.clarin.cmdi.mdservice.internal.CQLParseException; 13 13 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException; 14 import eu.clarin.cmdi.mdservice.internal.Utils;14 //import eu.clarin.cmdi.mdservice.internal.Utils; 15 15 import eu.clarin.cmdi.smc.SMC; 16 16 -
MDService2/branches/MDService_simple3/src/mdservice.properties
r1613 r1621 23 23 //cache.path = /srv/tomcat6/webapps/MDService2_cache/ 24 24 //workspaceprofile.path = /srv/tomcat6/webapps/MDService2_profiles/ 25 cache.path = C:/apps/apache-tomcat/webapps/MDService2_cache/26 workspaceprofile.path = C:/apps/apache-tomcat/webapps/MDService2_profiles/27 //cache.path = C:/apache-tomcat-6.0.26/webapps/MDService2_cache/28 //workspaceprofile.path = C:/apache-tomcat-6.0.26/webapps/MDService2_profiles/25 //cache.path = C:/apps/apache-tomcat/webapps/MDService2_cache/ 26 //workspaceprofile.path = C:/apps/apache-tomcat/webapps/MDService2_profiles/ 27 cache.path = C:/apache-tomcat-6.0.26/webapps/MDService2_cache/ 28 workspaceprofile.path = C:/apache-tomcat-6.0.26/webapps/MDService2_profiles/ 29 29 workspace.file = WorkspaceProfile.xml 30 30
Note: See TracChangeset
for help on using the changeset viewer.