Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2015-01-19 18:29:11 +0000
committerRoberto Escobar2015-01-27 17:23:59 +0000
commitcbe1cd8f73f4e560fa568b2a56b6a43058b2ce45 (patch)
tree651057956d3b6e5c7e6eb1a997debe38e17d6ab0 /plugins/org.eclipse.osee.x.server.p2
parent78625c8127aa3b6617997588ef6302b5d7f06de8 (diff)
downloadorg.eclipse.osee-cbe1cd8f73f4e560fa568b2a56b6a43058b2ce45.tar.gz
org.eclipse.osee-cbe1cd8f73f4e560fa568b2a56b6a43058b2ce45.tar.xz
org.eclipse.osee-cbe1cd8f73f4e560fa568b2a56b6a43058b2ce45.zip
feature[ats_ATS148512]: Configure Jetty HttpService with config admin
Diffstat (limited to 'plugins/org.eclipse.osee.x.server.p2')
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/demo/hsql.zipbin118599 -> 119229 bytes
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json12
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json12
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml2
4 files changed, 20 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
index 770ba64b622..0b345b97cb5 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
+++ b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json b/plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json
index ef30419f0d2..244075e58ea 100644
--- a/plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json
+++ b/plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json
@@ -17,10 +17,18 @@
"orcs.jdbc.service",
"account.jdbc.service",
"oauth.jdbc.service",
- "app.server.jdbc.service"
+ "app.server.jdbc.service",
+ "jetty.jdbc.service"
]
}
]
- }
+ },
+ {
+ "service.pid": "org.eclipse.osee.http.jetty.internal.osgi.JettyHttpService",
+ "jetty.server.context.session.inactive.interval": 3600,
+ "jetty.server.session.manager.factory": "JDBC",
+ "jetty.jdbc.cluster.name" : "OSEE",
+ "jetty.jdbc.save.interval.secs" : 30
+ }
]
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json b/plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json
index 572e242096a..31420f57c00 100644
--- a/plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json
+++ b/plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json
@@ -17,10 +17,18 @@
"orcs.jdbc.service",
"account.jdbc.service",
"oauth.jdbc.service",
- "app.server.jdbc.service"
+ "app.server.jdbc.service",
+ "jetty.jdbc.service"
]
}
]
- }
+ },
+ {
+ "service.pid": "org.eclipse.osee.http.jetty.internal.osgi.JettyHttpService",
+ "jetty.server.context.session.inactive.interval": 3600,
+ "jetty.server.session.manager.factory": "JDBC",
+ "jetty.jdbc.cluster.name" : "OSEE",
+ "jetty.jdbc.save.interval.secs" : 30
+ }
]
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
index a77c55d1267..aead2762e07 100644
--- a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
+++ b/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
@@ -176,7 +176,6 @@ osee.log.default=INFO
<attribute name="filepath" />
<attribute name="serverport" />
<attribute name="launcher" />
- <attribute name="session.timeout" default="3600" />
<attribute name="serverMaxMem" default="1024m" />
<attribute name="executable" default="true" />
<attribute name="extraVMArgs" default=" " />
@@ -185,7 +184,6 @@ osee.log.default=INFO
<echo file="@{filepath}" append="false">java -server \
-Xmx@{serverMaxMem} \
-Dorg.osgi.service.http.port=@{serverport} \
--Dorg.eclipse.equinox.http.jetty.context.sessioninactiveinterval=@{session.timeout} \
-Dcm.config.uri=&quot;@{cm.cfg.uri}&quot; \
@{extraVMArgs} \
-jar plugins/@{launcher} -console -consoleLog

Back to the top