diff options
| author | Andy Jury | 2016-07-21 21:21:58 +0000 |
|---|---|---|
| committer | Andrew M. Finkbeiner | 2016-10-07 01:12:12 +0000 |
| commit | 11950fb81d7fc5567bb2a2f5d613cf38a6f642ae (patch) | |
| tree | df3eea830d14e08e49c9d1c39e608d8ef25006ea | |
| parent | f399127050449f0f186182258fbd4689d7e8b643 (diff) | |
| download | org.eclipse.osee-11950fb81d7fc5567bb2a2f5d613cf38a6f642ae.tar.gz org.eclipse.osee-11950fb81d7fc5567bb2a2f5d613cf38a6f642ae.tar.xz org.eclipse.osee-11950fb81d7fc5567bb2a2f5d613cf38a6f642ae.zip | |
feature: Updates to get OTE Master Server working for 0.23.1.
| -rw-r--r-- | features/org.eclipse.osee.ote.master.feature/feature.xml | 49 | ||||
| -rw-r--r-- | plugins/org.eclipse.osee.ote.master.product/org.eclipse.osee.ote.master.product | 13 |
2 files changed, 59 insertions, 3 deletions
diff --git a/features/org.eclipse.osee.ote.master.feature/feature.xml b/features/org.eclipse.osee.ote.master.feature/feature.xml index 62eac92fa04..910ffc6696f 100644 --- a/features/org.eclipse.osee.ote.master.feature/feature.xml +++ b/features/org.eclipse.osee.ote.master.feature/feature.xml @@ -18,6 +18,55 @@ </license> <plugin + id="org.eclipse.jetty.continuation" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.http" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.io" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.security" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.server" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.servlet" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.jetty.util" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.eclipse.osee.ote.master" download-size="0" install-size="0" diff --git a/plugins/org.eclipse.osee.ote.master.product/org.eclipse.osee.ote.master.product b/plugins/org.eclipse.osee.ote.master.product/org.eclipse.osee.ote.master.product index 80a3b6417a2..a31393a6b57 100644 --- a/plugins/org.eclipse.osee.ote.master.product/org.eclipse.osee.ote.master.product +++ b/plugins/org.eclipse.osee.ote.master.product/org.eclipse.osee.ote.master.product @@ -7,12 +7,15 @@ </configIni> <launcherArgs> - <programArgs>-console</programArgs> + <programArgs>-console + </programArgs> <vmArgs>-Dorg.osgi.service.http.port=8008 -Ddequinox.ds.debug=true -Ddequinox.ds.print=true --Dcm.config.uri="etc/ote.server.config.json"</vmArgs> - <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> +-Dcm.config.uri="etc/ote.server.config.json" + </vmArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> </launcherArgs> <windowImages/> @@ -25,6 +28,7 @@ </launcher> <vm> + <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows> </vm> <plugins> @@ -35,6 +39,8 @@ <feature id="org.eclipse.osee.x.core.feature"/> <feature id="org.eclipse.osee.ote.master.feature"/> <feature id="org.eclipse.osee.ote.server.external.feature"/> + <feature id="org.eclipse.osee.core.feature"/> + <feature id="org.eclipse.osee.x.server.external.feature"/> </features> <configurations> @@ -42,6 +48,7 @@ <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.http.jetty" autoStart="true" startLevel="0" /> </configurations> </product> |