diff --git a/src/main/java/org/akaza/openclinica/designer/web/controller/AccessResourceController.java b/src/main/java/org/akaza/openclinica/designer/web/controller/AccessResourceController.java index 4e94f54..4022c33 100644 --- a/src/main/java/org/akaza/openclinica/designer/web/controller/AccessResourceController.java +++ b/src/main/java/org/akaza/openclinica/designer/web/controller/AccessResourceController.java @@ -4,6 +4,7 @@ import org.akaza.openclinica.designer.core.NaiveTrustProvider; import org.akaza.openclinica.designer.web.HostAccessService; import org.cdisc.ns.odm.v130.ODM; +import org.codehaus.jackson.map.ObjectMapper; import org.openclinica.ns.response.v31.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.PrintWriter; import java.net.URI; import javax.servlet.http.HttpServletRequest; @@ -50,7 +52,7 @@ public class AccessResourceController { private static final String PARAM_RUN_TIME = "runTime"; private static final String PARAM_MESSAGE = "msg"; private static final String SESSION_ATTR_FORM = "form"; - + protected final Logger logger = LoggerFactory.getLogger(getClass().getName()); public AccessResourceController() { @@ -61,7 +63,8 @@ public AccessResourceController() { public String createForm(Model model, HttpSession session, HttpServletRequest request, @RequestParam(PARAM_HOST) String providerHost, @RequestParam(PARAM_APP) String providerApp, @RequestParam(PARAM_STUDY_OID) String studyOid, @RequestParam(PARAM_PROVIDER_USER) String providerUser, @RequestParam(value = PARAM_APP_PATH, required = false) String path, - @RequestParam(value = PARAM_RULE_OID, required = false) String ruleOid, @RequestParam(value = PARAM_TARGET, required = false) String target, @RequestParam(value = PARAM_RUN_TIME, required = false) String runTime, @RequestParam(value = PARAM_MESSAGE, required = false) String message) + @RequestParam(value = PARAM_RULE_OID, required = false) String ruleOid, @RequestParam(value = PARAM_TARGET, required = false) String target, + @RequestParam(value = PARAM_RUN_TIME, required = false) String runTime, @RequestParam(value = PARAM_MESSAGE, required = false) String message) throws Exception { if (!hostAccessService.isHostAllowedAccess(providerHost)) { @@ -69,8 +72,8 @@ public String createForm(Model model, HttpSession session, HttpServletRequest re } logger.debug("Host is Valid ..."); if (message != null) { - message = message.replace("-0-","\n"); - message = message.replace("-1-"," "); + message = message.replace("-0-", "\n"); + message = message.replace("-1-", " "); } userPreferences.setAppName(providerApp); userPreferences.setPath(path); @@ -102,8 +105,7 @@ public String exit(HttpServletRequest request, HttpSession session) throws Excep } @RequestMapping(value = "/refreshSession", method = RequestMethod.GET) - public @ResponseBody - String refreshSession() throws IOException { + public @ResponseBody String refreshSession() throws IOException { return "sessionRefreshed"; } @@ -120,7 +122,7 @@ private void doRest() { @RequestMapping(value = "/initMetadata", method = RequestMethod.GET) public ModelAndView initMetadata(Model model, HttpSession session, @RequestParam("host") String providerHost, @RequestParam("app") String providerApp, @RequestParam("study_oid") String studyOid) throws Exception { - // model.addAttribute("contact", new Contact()); + // model.addAttribute("contact", new Contact());` userPreferences.setAppName(providerApp); userPreferences.setHost(providerHost); userPreferences.setStudyOid(studyOid); @@ -138,10 +140,16 @@ private ODM getMetadata() { ODM odm = null; String uri = userPreferences.getMetadataURL(); InputStream studyMetadataXML = new ByteArrayInputStream(userPreferences.getRestTemplate().getForObject(URI.create(uri), byte[].class)); + try { InputStreamReader isr = new InputStreamReader(studyMetadataXML, "UTF-8"); odm = (ODM) this.unMarshaller.unmarshal(new StreamSource(isr)); // odm = (ODM) this.unMarshaller.unmarshal(new StreamSource(studyMetadataXML)); + if (odm != null) { + ObjectMapper mapper = new ObjectMapper(); + String jsonInString = mapper.writeValueAsString(odm); + logger.debug(jsonInString); + } } catch (FileNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/resources/logback.groovy b/src/main/resources/logback.groovy deleted file mode 100644 index 026cdd2..0000000 --- a/src/main/resources/logback.groovy +++ /dev/null @@ -1,47 +0,0 @@ -// -// For more information on configuration files in Groovy -// please see http://logback.qos.ch/manual/groovy.html - -// For assistance related to this tool or configuration files -// in general, please contact the logback user mailing list at -// http://qos.ch/mailman/listinfo/logback-user - -// For professional support please see -// http://www.qos.ch/shop/products/professionalSupport - -import ch.qos.logback.classic.PatternLayout -import ch.qos.logback.classic.encoder.PatternLayoutEncoder -import ch.qos.logback.core.ConsoleAppender -import ch.qos.logback.core.FileAppender -import ch.qos.logback.core.rolling.RollingFileAppender -import ch.qos.logback.core.rolling.TimeBasedRollingPolicy - -import static ch.qos.logback.classic.Level.TRACE -import static ch.qos.logback.classic.Level.DEBUG -import static ch.qos.logback.classic.Level.INFO -import static ch.qos.logback.classic.Level.WARN -import static ch.qos.logback.classic.Level.ERROR - -// Appenders: appenders MUST be defined before they can be attached to a logger - -appender("STDOUT", ConsoleAppender) { - layout(PatternLayout) { - pattern = "%d{HH:mm:ss.SSS} %logger{36} - %msg%n" - } -} - -appender("FILE", RollingFileAppender) { - file = "designer.log" - rollingPolicy(TimeBasedRollingPolicy) { - fileNamePattern = "designer.%d{yyyy-MM-dd}.log" - maxHistory = 30 - } - encoder(PatternLayoutEncoder) { - pattern = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" - } -} - -logger("org.akaza.openclinica.designer", DEBUG, ["FILE"], false) -root(INFO, ["FILE"]) - -scan("30 seconds") \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..5195729 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,31 @@ + + + + + + + + UTF-8 + %d %-4relative [%thread] %-5level %logger{35} - %msg%n + + + + + + + ${logFilePath}application_%d{yyyy-MM-dd}.log + + 30 + + + + UTF-8 + %d %-4relative [%thread] %-5level %logger{35} - %msg%n + + + + + + re + diff --git a/src/main/resources/resources.properties b/src/main/resources/resources.properties index 65fcaa0..a75807a 100644 --- a/src/main/resources/resources.properties +++ b/src/main/resources/resources.properties @@ -1,5 +1,7 @@ -allowHosts=localhost:8080,svn.akazaresearch.com:8444,svn.akazaresearch.com:8081,64.119.157.114:8060,64.119.157.114:8061,64.119.157.114:8062,64.119.157.114:8063,64.119.157.114:8064,64.119.157.114:8065,64.119.157.114:8066,64.119.157.114:8067,64.119.157.114:8068,64.119.157.114:8069,64.119.157.114:8070,64.119.157.114:8071,64.119.157.114:8072,64.119.157.114:8073,192.168.15.66:8080 -hostlist.url= -hostlist.port= -hostlist.username= -hostlist.password= +allowHosts=localhost:8080,svn.akazaresearch.com:8444,svn.akazaresearch.com:8081,64.119.157.114:8060,64.119.157.114:8061,64.119.157.114:8062,64.119.157.114:8063,64.119.157.114:8064,64.119.157.114:8065,64.119.157.114:8066,64.119.157.114:8067,64.119.157.114:8068,64.119.157.114:8069,64.119.157.114:8070,64.119.157.114:8071,64.119.157.114:8072,64.119.157.114:8073,192.168.15.66:8080,oc.local:8081 +hostlist.url=http://oc.local:8081 +hostlist.port=1234 +hostlist.username=1234 +hostlist.password=1234 +logFilePath=/usr/local/tomcat/ +