Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2015-06-02 17:14:01 +0000
committerAngel Avila2015-09-12 00:43:17 +0000
commitd055c3735ab151b3150f4545e34024f625d447df (patch)
tree0c5eeba302754a1f59146cf6246c868b6c61deb2 /plugins/org.eclipse.osee.x.server.p2
parent21d8f90ffc10f133858fc289a15280b5377b70cf (diff)
downloadorg.eclipse.osee-d055c3735ab151b3150f4545e34024f625d447df.tar.gz
org.eclipse.osee-d055c3735ab151b3150f4545e34024f625d447df.tar.xz
org.eclipse.osee-d055c3735ab151b3150f4545e34024f625d447df.zip
Revert "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.zipbin118021 -> 118597 bytes
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json11
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json11
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml2
4 files changed, 6 insertions, 18 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 77501ff51a4..b6c618af35f 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 edf3c55eb85..ef30419f0d2 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,17 +17,10 @@
"orcs.jdbc.service",
"account.jdbc.service",
"oauth.jdbc.service",
- "app.server.jdbc.service",
- "jetty.jdbc.service"
+ "app.server.jdbc.service"
]
}
]
- },
- {
- "service.pid": "org.eclipse.osee.http.jetty.internal.osgi.JdbcJettyHttpService",
- "jetty.server.context.session.inactive.interval": 3600,
- "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 24fb1706175..572e242096a 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,17 +17,10 @@
"orcs.jdbc.service",
"account.jdbc.service",
"oauth.jdbc.service",
- "app.server.jdbc.service",
- "jetty.jdbc.service"
+ "app.server.jdbc.service"
]
}
]
- },
- {
- "service.pid": "org.eclipse.osee.http.jetty.internal.osgi.JdbcJettyHttpService",
- "jetty.server.context.session.inactive.interval": 3600,
- "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 aead2762e07..a77c55d1267 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,6 +176,7 @@ 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=" " />
@@ -184,6 +185,7 @@ 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