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 1ac687d..584bd13 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; @@ -137,6 +138,11 @@ private ODM getMetadata() { 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..5afb7a6 100644 --- a/src/main/resources/resources.properties +++ b/src/main/resources/resources.properties @@ -3,3 +3,4 @@ hostlist.url= hostlist.port= hostlist.username= hostlist.password= +logFilePath=/usr/local/tomcat/ \ No newline at end of file