Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2018-08-15 15:12:55 -0400
committerdonald.g.dunne2018-08-16 13:44:39 -0400
commita66a8f42a98b6bb62233055f890e3604483d5631 (patch)
tree5f579853bb0210c4f328c7805bb04f5667f58915
parent58c4e3ed1c7767f8039046e76d609dbb610f836f (diff)
downloadorg.eclipse.osee-a66a8f42a98b6bb62233055f890e3604483d5631.tar.gz
org.eclipse.osee-a66a8f42a98b6bb62233055f890e3604483d5631.tar.xz
org.eclipse.osee-a66a8f42a98b6bb62233055f890e3604483d5631.zip
refinement: Improve demo server support for large data
-rw-r--r--plugins/org.eclipse.osee.server.p2/logback-dev.xml26
-rw-r--r--plugins/org.eclipse.osee.server.p2/package-server-runtime.xml5
-rw-r--r--plugins/org.eclipse.osee.server.p2/pom.xml1
3 files changed, 31 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.server.p2/logback-dev.xml b/plugins/org.eclipse.osee.server.p2/logback-dev.xml
new file mode 100644
index 0000000000..789344c02e
--- /dev/null
+++ b/plugins/org.eclipse.osee.server.p2/logback-dev.xml
@@ -0,0 +1,26 @@
+<configuration debug="true">
+ <!-- See documentation at http://logback.qos.ch/manual/joran.html -->
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder
+ by default -->
+ <encoder>
+ <pattern>%-50(%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread]
+ [%-25.25logger{26}] %-5level) - %msg%n</pattern>
+ <outputPatternAsHeader>true</outputPatternAsHeader>
+ </encoder>
+ </appender>
+
+ <!-- Configure OSEE log messages -->
+ <logger name="org.eclipse.osee.orcs.db" level="WARN" />
+ <logger name="org.eclipse.osee.database" level="WARN" />
+ <logger name="org.eclipse.osee.framework.core.server" level="WARN" />
+ <logger name="org.eclipse.osee.orcs.core" level="WARN" />
+ <logger name="org.eclipse.osee" level="WARN" />
+ <logger name="org.eclipse.osee.ats.impl" level="WARN" />
+ <logger name="org.eclipse.osee.ats.rest" level="WARN" />
+
+ <root level="WARN">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration> \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.server.p2/package-server-runtime.xml b/plugins/org.eclipse.osee.server.p2/package-server-runtime.xml
index a77c55d126..5376d16f35 100644
--- a/plugins/org.eclipse.osee.server.p2/package-server-runtime.xml
+++ b/plugins/org.eclipse.osee.server.p2/package-server-runtime.xml
@@ -78,6 +78,8 @@
<copy file="${server-path}/runDemo.sh" tofile="${server-path}/runDemo.bat" overwrite="true" />
<replaceregexp file="${server-path}/runDemo.bat" match="\\" replace="^" flags="g" />
+ <copy file="${project-base-path}/logback-dev.xml" tofile="${server-path}/logback-dev.xml" overwrite="true" />
+
<!-- Copy Demo Files -->
<property name="server-demo-path" value="${server-path}/demo" />
@@ -177,7 +179,7 @@ osee.log.default=INFO
<attribute name="serverport" />
<attribute name="launcher" />
<attribute name="session.timeout" default="3600" />
- <attribute name="serverMaxMem" default="1024m" />
+ <attribute name="serverMaxMem" default="3G" />
<attribute name="executable" default="true" />
<attribute name="extraVMArgs" default=" " />
<attribute name="cm.cfg.uri" />
@@ -185,6 +187,7 @@ osee.log.default=INFO
<echo file="@{filepath}" append="false">java -server \
-Xmx@{serverMaxMem} \
-Dorg.osgi.service.http.port=@{serverport} \
+-Dlogback.configurationFile=logback-dev.xml \
-Dorg.eclipse.equinox.http.jetty.context.sessioninactiveinterval=@{session.timeout} \
-Dcm.config.uri=&quot;@{cm.cfg.uri}&quot; \
@{extraVMArgs} \
diff --git a/plugins/org.eclipse.osee.server.p2/pom.xml b/plugins/org.eclipse.osee.server.p2/pom.xml
index 0c4bc16276..1523630814 100644
--- a/plugins/org.eclipse.osee.server.p2/pom.xml
+++ b/plugins/org.eclipse.osee.server.p2/pom.xml
@@ -40,6 +40,7 @@
<property name="server-path" value="${output-path}/server" />
<property name="demo-content-path" value="${project.basedir}/demo" />
<property name="etc-content-path" value="${project.basedir}/etc" />
+ <property name="project-base-path" value="${project.basedir}" />
<ant antfile="package-server-runtime.xml" target="run"
inheritRefs="true" />

Back to the top