git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Wed, 3 Mar 2021 21:25:05 +0000 (21:25 +0000)
committervasary.daniel <TFS\vasary.daniel>
Wed, 3 Mar 2021 21:25:05 +0000 (21:25 +0000)
58 files changed:
server/-configuration/run-mediacube-server-hirtv.launch
server/-configuration/run-mediacube-server-mv.launch
server/-configuration/run-mediacube-server-user.launch
server/-configuration/run-mediacube-server.launch
server/-dependencies/jobengine.target
server/-dependencies/pom.xml
server/-product/.tpignore
server/-product/production/AMC/mediacube.bat
server/-product/production/AMC/settings/jetty.xml [new file with mode: 0644]
server/-product/production/AMC/settings/jetty/jetty-http.xml [deleted file]
server/-product/production/AMC/settings/jetty/jetty-https.xml [deleted file]
server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml [deleted file]
server/-product/production/AMC/settings/jetty/jetty-ssl.xml [deleted file]
server/-product/production/AMC/settings/jetty/jetty.xml [deleted file]
server/-product/production/AMC/settings/jetty/keystore [deleted file]
server/-product/production/AMC/settings/jetty/localhost.jks [deleted file]
server/-product/production/AMC/settings/maestro.yaml [new file with mode: 0644]
server/-product/production/AMC/settings/mediacube.json [deleted file]
server/-product/production/AMC/settings/mediacube.yaml [new file with mode: 0644]
server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/jetty-http.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/jetty-https.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/jetty.xml [deleted file]
server/-product/production/AMC/settings/test-jetty/keystore [deleted file]
server/-product/production/AMC/settings/test-jetty/localhost.jks [deleted file]
server/-product/production/HIRTV/mediacube.bat
server/-product/production/HIRTV/settings/jetty.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/jobs/executors.xml
server/-product/production/MEDIAVIVANTIS/jobs/schedules.json
server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java
server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/mediacube.bat
server/-product/production/MEDIAVIVANTIS/settings/jetty.xml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks [deleted file]
server/RemoteSystemsTempFiles/.project [deleted file]
server/user.jobengine.osgi.server/src/user/jobengine/server/IJobRuntime.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java

index 48c211273ccd8fca1527ef580a261693a50bc1a7..3730ad9245577b5fc853a80637c964eacb44dc37 100644 (file)
@@ -6,7 +6,7 @@
     <stringAttribute key="bootstrap" value=""/>\r
     <stringAttribute key="checked" value="[NONE]"/>\r
     <booleanAttribute key="clearConfig" value="true"/>\r
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server-hirtv"/>\r
+    <stringAttribute key="configLocation" value="${workspace_loc}/-products/production/HIRTV/tmp"/>\r
     <booleanAttribute key="default" value="true"/>\r
     <booleanAttribute key="default_auto_start" value="false"/>\r
     <intAttribute key="default_start_level" value="4"/>\r
@@ -20,7 +20,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/jetty&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings&#13;&#10;-Djetty.etc.config.urls=jetty.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\HIRTV"/>\r
     <stringAttribute key="pde.version" value="3.3"/>\r
     <setAttribute key="selected_target_bundles">\r
     <booleanAttribute key="show_selected_only" value="false"/>\r
     <booleanAttribute key="tracing" value="false"/>\r
     <booleanAttribute key="useCustomFeatures" value="false"/>\r
-    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>\r
 </launchConfiguration>\r
index 47941dff40f1b27db6a91a337b243d418fd880d1..bcebdcfe6558cd4f763e96a2412d904f9ce6d969 100644 (file)
@@ -6,7 +6,7 @@
     <stringAttribute key="bootstrap" value=""/>\r
     <stringAttribute key="checked" value="[NONE]"/>\r
     <booleanAttribute key="clearConfig" value="true"/>\r
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server-mv"/>\r
+    <stringAttribute key="configLocation" value="${workspace_loc}/-products/production/MEDIAVIVANTIS/tmp"/>\r
     <booleanAttribute key="default" value="true"/>\r
     <booleanAttribute key="default_auto_start" value="false"/>\r
     <intAttribute key="default_start_level" value="4"/>\r
@@ -20,7 +20,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/test-jetty&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings&#13;&#10;-Djetty.etc.config.urls=jetty.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\MEDIAVIVANTIS"/>\r
     <stringAttribute key="pde.version" value="3.3"/>\r
     <setAttribute key="selected_target_bundles">\r
     <booleanAttribute key="show_selected_only" value="false"/>\r
     <booleanAttribute key="tracing" value="false"/>\r
     <booleanAttribute key="useCustomFeatures" value="false"/>\r
-    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>\r
 </launchConfiguration>\r
index 96e8844de628cb19b2a97883dd3a2905cc6acb58..19766b8de0e49822967f47a5cf9277dd132b718f 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
-<booleanAttribute key="append.args" value="true"/>\r
-<booleanAttribute key="automaticAdd" value="false"/>\r
-<booleanAttribute key="automaticValidate" value="true"/>\r
-<stringAttribute key="bootstrap" value=""/>\r
-<stringAttribute key="checked" value="[NONE]"/>\r
-<booleanAttribute key="clearConfig" value="true"/>\r
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server-user"/>\r
-<booleanAttribute key="default" value="true"/>\r
-<booleanAttribute key="default_auto_start" value="false"/>\r
-<intAttribute key="default_start_level" value="4"/>\r
-<booleanAttribute key="includeOptional" value="false"/>\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-</listAttribute>\r
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.212.42:50000/mc&#13;&#10;-Djobengine.db.user=blobtest&#13;&#10;-Djobengine.db.password=blobtest&#13;&#10;-Djobengine.db.loginTimeout=3&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.212.42:50000/mccache&#13;&#10;-Djobengine.nosql.db.user=blobtest&#13;&#10;-Djobengine.nosql.db.password=blobtest&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nosql.db.loginTimeout=3&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.transcoder.address=http://10.11.1.111:65445/api/json/v1/&#13;&#10;-Djobengine.transcoder.template=MP4&#13;&#10;-Djobengine.transcoder.version=1&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=VDani&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=true"/>\r
-<stringAttribute key="pde.version" value="3.3"/>\r
-<booleanAttribute key="show_selected_only" value="false"/>\r
-<stringAttribute key="target_bundles" value="cglib@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.ibm.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.jna@default:default,groovy@default:default,io.humble.video-arch-x86_64-pc-linux-gnu6@default:default,io.humble.video-arch-x86_64-w64-mingw32@default:default,io.humble.video-noarch@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,junit@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
-<booleanAttribute key="tracing" value="false"/>\r
-<booleanAttribute key="useCustomFeatures" value="false"/>\r
-<booleanAttribute key="useDefaultConfigArea" value="true"/>\r
-<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,user.commons.zk@default:default,user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.mediacube.gui@default:true,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\r
+    <booleanAttribute key="append.args" value="true"/>\r
+    <booleanAttribute key="automaticAdd" value="false"/>\r
+    <booleanAttribute key="automaticValidate" value="true"/>\r
+    <stringAttribute key="bootstrap" value=""/>\r
+    <stringAttribute key="checked" value="[NONE]"/>\r
+    <booleanAttribute key="clearConfig" value="true"/>\r
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server-user"/>\r
+    <booleanAttribute key="default" value="true"/>\r
+    <booleanAttribute key="default_auto_start" value="false"/>\r
+    <intAttribute key="default_start_level" value="4"/>\r
+    <setAttribute key="deselected_workspace_bundles"/>\r
+    <booleanAttribute key="includeOptional" value="false"/>\r
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+    </listAttribute>\r
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.212.42:50000/mc&#13;&#10;-Djobengine.db.user=blobtest&#13;&#10;-Djobengine.db.password=blobtest&#13;&#10;-Djobengine.db.loginTimeout=3&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.212.42:50000/mccache&#13;&#10;-Djobengine.nosql.db.user=blobtest&#13;&#10;-Djobengine.nosql.db.password=blobtest&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nosql.db.loginTimeout=3&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.transcoder.address=http://10.11.1.111:65445/api/json/v1/&#13;&#10;-Djobengine.transcoder.template=MP4&#13;&#10;-Djobengine.transcoder.version=1&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=VDani&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=true"/>\r
+    <stringAttribute key="pde.version" value="3.3"/>\r
+    <setAttribute key="selected_target_bundles">\r
+        <setEntry value="cglib@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>\r
+        <setEntry value="com.ibm.db2.jcc@default:default"/>\r
+        <setEntry value="com.ibm.nosql@default:default"/>\r
+        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
+        <setEntry value="com.sun.jna@default:default"/>\r
+        <setEntry value="groovy@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-pc-linux-gnu6@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-w64-mingw32@default:default"/>\r
+        <setEntry value="io.humble.video-noarch@default:default"/>\r
+        <setEntry value="javax.annotation-api@default:default"/>\r
+        <setEntry value="javax.mail@default:default"/>\r
+        <setEntry value="javax.servlet-api@default:default"/>\r
+        <setEntry value="javax.ws.rs-api@default:default"/>\r
+        <setEntry value="jcifs@default:default"/>\r
+        <setEntry value="joda-time@default:default"/>\r
+        <setEntry value="junit@default:default"/>\r
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>\r
+        <setEntry value="org.apache.aries.util@default:default"/>\r
+        <setEntry value="org.apache.commons.beanutils@default:default"/>\r
+        <setEntry value="org.apache.commons.collections@default:default"/>\r
+        <setEntry value="org.apache.commons.digester@default:default"/>\r
+        <setEntry value="org.apache.commons.io@default:default"/>\r
+        <setEntry value="org.apache.commons.lang@default:default"/>\r
+        <setEntry value="org.apache.commons.net@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.api@1:true"/>\r
+        <setEntry value="org.apache.logging.log4j.core@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.slf4j-impl@default:default"/>\r
+        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.common@2:true"/>\r
+        <setEntry value="org.eclipse.equinox.console@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>\r
+        <setEntry value="org.eclipse.equinox.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.http@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.io@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>\r
+        <setEntry value="org.eclipse.jetty.schemas@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.security@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.webapp@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.xml@default:default"/>\r
+        <setEntry value="org.eclipse.osgi.services@default:default"/>\r
+        <setEntry value="org.eclipse.osgi@-1:true"/>\r
+        <setEntry value="org.hamcrest.core@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.client@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>\r
+        <setEntry value="org.jmock.junit4@default:default"/>\r
+        <setEntry value="org.jmock@default:default"/>\r
+        <setEntry value="org.mybatis.mybatis@default:default"/>\r
+        <setEntry value="org.objectweb.asm.commons@default:default"/>\r
+        <setEntry value="org.objectweb.asm.tree@default:default"/>\r
+        <setEntry value="org.objectweb.asm@default:default"/>\r
+        <setEntry value="org.omnifaces@default:default"/>\r
+        <setEntry value="slf4j.api@default:default"/>\r
+        <setEntry value="slf4j.simple@default:false"/>\r
+    </setAttribute>\r
+    <setAttribute key="selected_workspace_bundles">\r
+        <setEntry value="user.commons.log4j2@default:false"/>\r
+        <setEntry value="user.commons.zk@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
+        <setEntry value="user.jobengine.osgi.db@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.server@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.services@default:default"/>\r
+        <setEntry value="user.mediacube.gui@default:true"/>\r
+        <setEntry value="user.mediacube.metadata@default:default"/>\r
+        <setEntry value="user.tsm.client@default:default"/>\r
+    </setAttribute>\r
+    <booleanAttribute key="show_selected_only" value="false"/>\r
+    <booleanAttribute key="tracing" value="false"/>\r
+    <booleanAttribute key="useCustomFeatures" value="false"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
 </launchConfiguration>\r
index 1d0b7bb970cade070f94e951d601e75a9cb780ee..0a93a2541377c7a39d454fa0c083f810d7cf894d 100644 (file)
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
-<booleanAttribute key="append.args" value="true"/>\r
-<booleanAttribute key="automaticAdd" value="false"/>\r
-<booleanAttribute key="automaticValidate" value="true"/>\r
-<stringAttribute key="bootstrap" value=""/>\r
-<stringAttribute key="checked" value="[NONE]"/>\r
-<booleanAttribute key="clearConfig" value="true"/>\r
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server"/>\r
-<booleanAttribute key="default" value="true"/>\r
-<booleanAttribute key="default_auto_start" value="false"/>\r
-<intAttribute key="default_start_level" value="4"/>\r
-<booleanAttribute key="includeOptional" value="false"/>\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-</listAttribute>\r
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediafinder.external.url=localhost&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
-<stringAttribute key="pde.version" value="3.3"/>\r
-<booleanAttribute key="show_selected_only" value="false"/>\r
-<stringAttribute key="target_bundles" value="cglib@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.jna@default:default,io.humble.video-arch-x86_64-pc-linux-gnu6@default:default,io.humble.video-arch-x86_64-w64-mingw32@default:default,io.humble.video-noarch@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,junit@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
-<booleanAttribute key="tracing" value="false"/>\r
-<booleanAttribute key="useCustomFeatures" value="false"/>\r
-<booleanAttribute key="useDefaultConfigArea" value="true"/>\r
-<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\r
+    <booleanAttribute key="append.args" value="true"/>\r
+    <booleanAttribute key="automaticAdd" value="false"/>\r
+    <booleanAttribute key="automaticValidate" value="true"/>\r
+    <stringAttribute key="bootstrap" value=""/>\r
+    <stringAttribute key="checked" value="[NONE]"/>\r
+    <booleanAttribute key="clearConfig" value="true"/>\r
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server"/>\r
+    <booleanAttribute key="default" value="true"/>\r
+    <booleanAttribute key="default_auto_start" value="false"/>\r
+    <intAttribute key="default_start_level" value="4"/>\r
+    <setAttribute key="deselected_workspace_bundles"/>\r
+    <booleanAttribute key="includeOptional" value="false"/>\r
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+    </listAttribute>\r
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediafinder.external.url=localhost&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
+    <stringAttribute key="pde.version" value="3.3"/>\r
+    <setAttribute key="selected_target_bundles">\r
+        <setEntry value="cglib@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>\r
+        <setEntry value="com.ibm.nosql@default:default"/>\r
+        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
+        <setEntry value="com.sun.jna@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-pc-linux-gnu6@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-w64-mingw32@default:default"/>\r
+        <setEntry value="io.humble.video-noarch@default:default"/>\r
+        <setEntry value="javax.annotation-api@default:default"/>\r
+        <setEntry value="javax.mail@default:default"/>\r
+        <setEntry value="javax.servlet-api@default:default"/>\r
+        <setEntry value="javax.ws.rs-api@default:default"/>\r
+        <setEntry value="jcifs@default:default"/>\r
+        <setEntry value="joda-time@default:default"/>\r
+        <setEntry value="junit@default:default"/>\r
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>\r
+        <setEntry value="org.apache.aries.util@default:default"/>\r
+        <setEntry value="org.apache.commons.beanutils@default:default"/>\r
+        <setEntry value="org.apache.commons.collections@default:default"/>\r
+        <setEntry value="org.apache.commons.digester@default:default"/>\r
+        <setEntry value="org.apache.commons.io@default:default"/>\r
+        <setEntry value="org.apache.commons.lang@default:default"/>\r
+        <setEntry value="org.apache.commons.net@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.api@1:true"/>\r
+        <setEntry value="org.apache.logging.log4j.core@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.slf4j-impl@default:default"/>\r
+        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.common@2:true"/>\r
+        <setEntry value="org.eclipse.equinox.console@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>\r
+        <setEntry value="org.eclipse.equinox.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.http@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.io@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>\r
+        <setEntry value="org.eclipse.jetty.schemas@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.security@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.webapp@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.xml@default:default"/>\r
+        <setEntry value="org.eclipse.osgi.services@default:default"/>\r
+        <setEntry value="org.eclipse.osgi@-1:true"/>\r
+        <setEntry value="org.hamcrest.core@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.client@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>\r
+        <setEntry value="org.jmock.junit4@default:default"/>\r
+        <setEntry value="org.jmock@default:default"/>\r
+        <setEntry value="org.mybatis.mybatis@default:default"/>\r
+        <setEntry value="org.objectweb.asm.commons@default:default"/>\r
+        <setEntry value="org.objectweb.asm.tree@default:default"/>\r
+        <setEntry value="org.objectweb.asm@default:default"/>\r
+        <setEntry value="slf4j.api@default:default"/>\r
+        <setEntry value="slf4j.simple@default:false"/>\r
+    </setAttribute>\r
+    <setAttribute key="selected_workspace_bundles">\r
+        <setEntry value="user.commons.log4j2@default:false"/>\r
+        <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
+        <setEntry value="user.jobengine.osgi.db@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.server@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.services@default:default"/>\r
+        <setEntry value="user.mediacube.metadata@default:default"/>\r
+        <setEntry value="user.tsm.client@default:default"/>\r
+    </setAttribute>\r
+    <booleanAttribute key="show_selected_only" value="false"/>\r
+    <booleanAttribute key="tracing" value="false"/>\r
+    <booleanAttribute key="useCustomFeatures" value="false"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
 </launchConfiguration>\r
index 7b9d8e417b5580125ec352d6cb9feb423db76106..61e351249cf972fe57aeed34a5010934e0a5cb22 100644 (file)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="486">\r
+<?pde version="3.8"?>\r
+<target name="JobEngine" sequenceNumber="486">\r
 <locations>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
 </locations>\r
@@ -52,7 +53,6 @@
 <plugin id="org.eclipse.equinox.launcher"/>\r
 <plugin id="org.eclipse.equinox.util"/>\r
 <plugin id="org.eclipse.jetty.annotations"/>\r
-<plugin id="org.eclipse.jetty.client"/>\r
 <plugin id="org.eclipse.jetty.continuation"/>\r
 <plugin id="org.eclipse.jetty.deploy"/>\r
 <plugin id="org.eclipse.jetty.http"/>\r
 <plugin id="org.jmock"/>\r
 <plugin id="org.jmock.junit4"/>\r
 <plugin id="org.mybatis.mybatis"/>\r
-<plugin id="org.objectweb.asm"/>\r
-<plugin id="org.objectweb.asm.commons"/>\r
-<plugin id="org.objectweb.asm.tree"/>\r
 <plugin id="org.omnifaces"/>\r
 <plugin id="slf4j.api" version="1.7.2"/>\r
 <plugin id="slf4j.simple" version="1.7.2"/>\r
+       <plugin id="org.objectweb.asm"/>\r
+       <plugin id="org.objectweb.asm.tree"/>\r
+       <plugin id="org.objectweb.asm.commons"/>\r
 </includeBundles>\r
 <environment>\r
 <os>win32</os>\r
 <launcherArgs>\r
 <vmArgs>-Dosgi.requiredJavaVersion=1.8 -XX:+UseG1GC -XX:+UseStringDeduplication -Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m -Dorg.eclipse.epp.logging.aeri.skipReports=true</vmArgs>\r
 </launcherArgs>\r
-</target>\r
+</target>
\ No newline at end of file
index 2dd688224b7ee8cf1535742f48dcd7363e813689..35500f6c15d07cd08daafec10371aef06d1651b6 100644 (file)
@@ -11,6 +11,7 @@
                <maven.compiler.target>1.7</maven.compiler.target>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
+<!--           <jetty.version>9.4.38.v20210224</jetty.version> -->\r
                <jetty.version>9.3.9.v20160517</jetty.version>\r
                <resteasy-version>3.0.11.Final</resteasy-version>\r
                <fasterxml-jackson-core>2.4.5</fasterxml-jackson-core>\r
                                                                <artifact>\r
                                                                        <id>org.eclipse.platform:org.eclipse.osgi.util:3.3.100</id>\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.eclipse.jetty:jetty-server:9.3.9.v20160517</id>\r
-                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>commons-io:commons-io:2.2</id>\r
                                                                </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.eclipse.jetty:jetty-servlet:${jetty.version}</id>\r
                                                                </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>org.eclipse.jetty:jetty-server:${jetty.version}</id>\r
+                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.eclipse.jetty.websocket:websocket-api:${jetty.version}</id>\r
                                                                </artifact>\r
index c3ae4d9d0478362c69aca07df2ffd3a3804dafb7..ac77a1bc65e8a18bcc477c15cf06fc53947a16d9 100644 (file)
@@ -8,3 +8,4 @@
 \Q/production/HIRTV/configuration/org.eclipse.osgi/\E.*\r
 \Q/production/HIRTV/tmp/\E.*\r
 \Q/production/MEDIAVIVANTIS/log/\E.*\r
+\Q/production/AMC/tmp/\E.*\r
index 64cbf7812c198443750b48cf8697cc47b644bcac..099f5aee03e39736c2631074fa6313a98837a60c 100644 (file)
@@ -2,13 +2,12 @@
 if exist tmp rmdir tmp /s /q\r
 mkdir tmp\r
 java ^\r
--Dclean ^\r
 -Dorg.eclipse.epp.logging.aeri.skipReports=true ^\r
 -Declipse.ignoreApp=true ^\r
 -Dosgi.noShutdown=true ^\r
 -Dlog4j.configurationFile=settings/log4j2.xml ^\r
--Djetty.home=settings/test-jetty ^\r
--Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml ^\r
+-Djetty.home=settings ^\r
+-Djetty.etc.config.urls=jetty.xml ^\r
 -Djava.io.tmpdir=tmp ^\r
 -Dfile.encoding=UTF-8 ^\r
 -Dgosh.home=configuration ^\r
diff --git a/server/-product/production/AMC/settings/jetty.xml b/server/-product/production/AMC/settings/jetty.xml
new file mode 100644 (file)
index 0000000..5e47cac
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+       <Call name="addConnector">
+               <Arg>
+                       <New class="org.eclipse.jetty.server.ServerConnector">
+                               <Arg name="server">
+                                       <Ref refid="Server" />
+                               </Arg>
+                               <Set name="port">
+                                       <Property name="jetty.http.port" default="9080" />
+                               </Set>
+                       </New>
+               </Arg>
+       </Call>
+
+<!--   <Set name="sessionIdManager"> -->
+<!--           <New id="idMgr" -->
+<!--                   class="org.eclipse.jetty.server.session.DefaultSessionIdManager"> -->
+<!--                   <Arg> -->
+<!--                           <Ref refid="Server" /> -->
+<!--                   </Arg> -->
+<!--                   <Set name="workerName">node1</Set> -->
+<!--           </New> -->
+<!--   </Set> -->
+
+       <Set name="handler">
+               <New id="Handlers"
+                       class="org.eclipse.jetty.server.handler.HandlerCollection">
+                       <Set name="handlers">
+                               <Array type="org.eclipse.jetty.server.Handler">
+                                       <Item>
+                                               <New id="Contexts"
+                                                       class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
+                                       </Item>
+                                       <Item>
+                                               <New id="DefaultHandler"
+                                                       class="org.eclipse.jetty.server.handler.DefaultHandler" />
+                                       </Item>
+                               </Array>
+                       </Set>
+               </New>
+       </Set>
+</Configure>
\ No newline at end of file
diff --git a/server/-product/production/AMC/settings/jetty/jetty-http.xml b/server/-product/production/AMC/settings/jetty/jetty-http.xml
deleted file mode 100644 (file)
index 95b6398..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" default="8888" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/jetty/jetty-https.xml b/server/-product/production/AMC/settings/jetty/jetty-https.xml
deleted file mode 100644 (file)
index 71a0837..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure a HTTPS connector.                                  -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and jetty-ssl.xml.                                            -->
-<!-- ============================================================= -->
-<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-
-  <Call name="addIfAbsentConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.SslConnectionFactory">
-        <Arg name="next">http/1.1</Arg>
-        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
-      </New>
-    </Arg>
-  </Call>
-
-  <Call name="addConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
-        <Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
-      </New>
-    </Arg>
-  </Call>
-  
-</Configure>
diff --git a/server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml b/server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml
deleted file mode 100644 (file)
index e1edaf0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- SSL ContextFactory configuration                              -->
-<!-- ============================================================= -->
-
-<!-- 
-  To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
-     https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
--->
-
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="localhost.jks"/></Set>
-  <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="password"/></Set>
-  <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
-  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
-  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="password"/></Set>
-  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="localhost.jks"/></Set>
-  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="password"/></Set>
-  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
-  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
-  <Set name="EndpointIdentificationAlgorithm"></Set>
-  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
-  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
-  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
-  <Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
-  <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
-</Configure>
diff --git a/server/-product/production/AMC/settings/jetty/jetty-ssl.xml b/server/-product/production/AMC/settings/jetty/jetty-ssl.xml
deleted file mode 100644 (file)
index a079c1f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Base SSL configuration                                        -->
-<!-- This configuration needs to be used together with 1 or more   -->
-<!-- of jetty-https.xml or jetty-http2.xml                         -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a SSL Connector with no protocol factories              -->
-  <!-- =========================================================== -->
-  <Call  name="addConnector">
-    <Arg>
-      <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <!-- uncomment to support proxy protocol
-            <Item>
-              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
-            </Item>-->
-          </Array>
-        </Arg>
-
-        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="8443" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-  <!-- =========================================================== -->
-  <!-- Create a TLS specific HttpConfiguration based on the        -->
-  <!-- common HttpConfiguration defined in jetty.xml               -->
-  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
-  <!-- session information                                         -->
-  <!-- =========================================================== -->
-  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-    <Arg><Ref refid="httpConfig"/></Arg>
-    <Call name="addCustomizer">
-      <Arg>
-        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
-          <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
-          <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
-          <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
-        </New>
-      </Arg>
-    </Call>
-  </New>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/jetty/jetty.xml b/server/-product/production/AMC/settings/jetty/jetty.xml
deleted file mode 100644 (file)
index 0ba3838..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
-<!--                                                                 -->
-<!-- Additional configuration files are available in $JETTY_HOME/etc -->
-<!-- and can be mixed in. See start.ini file for the default         -->
-<!-- configuration files.                                            -->
-<!--                                                                 -->
-<!-- For a description of the configuration mechanism, see the       -->
-<!-- output of:                                                      -->
-<!--   java -jar start.jar -?                                        -->
-<!-- =============================================================== -->
-
-<!-- =============================================================== -->
-<!-- Configure a Jetty Server instance with an ID "Server"           -->
-<!-- Other configuration files may also configure the "Server"       -->
-<!-- ID, in which case they are adding configuration to the same     -->
-<!-- instance.  If other configuration have a different ID, they     -->
-<!-- will create and configure another instance of Jetty.            -->
-<!-- Consult the javadoc of o.e.j.server.Server for all              -->
-<!-- configuration that may be set here.                             -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- =========================================================== -->
-    <!-- Configure the Server Thread Pool.                           -->
-    <!-- The server holds a common thread pool which is used by      -->
-    <!-- default as the executor used by all connectors and servlet  -->
-    <!-- dispatches.                                                 -->
-    <!--                                                             -->
-    <!-- Configuring a fixed thread pool is vital to controlling the -->
-    <!-- maximal memory footprint of the server and is a key tuning  -->
-    <!-- parameter for tuning.  In an application that rarely blocks -->
-    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
-    <!-- In an application that frequently blocks, then maximal      -->
-    <!-- threads should be set as high as possible given the memory  -->
-    <!-- available.                                                  -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <!-- uncomment to change type of threadpool
-    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
-    -->
-    <Get name="ThreadPool">
-      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
-      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
-      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
-      <Set name="detailedDump">false</Set>
-    </Get>
-
-    <!-- =========================================================== -->
-    <!-- Add shared Scheduler instance                               -->
-    <!-- =========================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Http Configuration.                                         -->
-    <!-- This is a common configuration instance used by all         -->
-    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
-    <!-- It configures the non wire protocol aspects of the HTTP     -->
-    <!-- semantic.                                                   -->
-    <!--                                                             -->
-    <!-- This configuration is only defined here and is used by      -->
-    <!-- reference from other XML files such as jetty-http.xml,      -->
-    <!-- jetty-https.xml and other configuration files which         -->
-    <!-- instantiate the connectors.                                 -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
-      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8443" /></Set>
-      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
-      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
-      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
-      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
-      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
-      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
-      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
-      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
-      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
-      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
-      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
-    </New>
-
-    <!-- =========================================================== -->
-    <!-- Set the default handler structure for the Server            -->
-    <!-- A handler collection is used to pass received requests to   -->
-    <!-- both the ContextHandlerCollection, which selects the next   -->
-    <!-- handler by context path and virtual host, and the           -->
-    <!-- DefaultHandler, which handles any requests not handled by   -->
-    <!-- the context handlers.                                       -->
-    <!-- Other handlers may be added to the "Handlers" collection,   -->
-    <!-- for example the jetty-requestlog.xml file adds the          -->
-    <!-- RequestLogHandler after the default handler                 -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.eclipse.jetty.server.Handler">
-           <Item>
-             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-
-    <!-- =========================================================== -->
-    <!-- extra server options                                        -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
-    <Set name="stopTimeout">5000</Set>
-    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
-    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/jetty/keystore b/server/-product/production/AMC/settings/jetty/keystore
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/AMC/settings/jetty/keystore and /dev/null differ
diff --git a/server/-product/production/AMC/settings/jetty/localhost.jks b/server/-product/production/AMC/settings/jetty/localhost.jks
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/AMC/settings/jetty/localhost.jks and /dev/null differ
diff --git a/server/-product/production/AMC/settings/maestro.yaml b/server/-product/production/AMC/settings/maestro.yaml
new file mode 100644 (file)
index 0000000..1d36157
--- /dev/null
@@ -0,0 +1,38 @@
+sourceStoreUri:
+  name: Default
+  protocol: LOCAL
+  uri: "/mnt/NLE"
+  fileFilter: "*.mxf"
+  showDirectories: true
+alternateSourceStoreUris:
+- name: NLE1
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE1"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: NLE2
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE2"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: NLE3
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE3"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: NLE4
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE4"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: POLC
+  protocol: LOCAL
+  uri: "/mnt/POLC"
+  fileFilter: "*.mxf"
+  showDirectories: true
+targets:
+- name: FINISHED_SHOWS
+  killDateDays: 7
+  storeUri:
+    protocol: LOCAL
+    uri: "/mnt/PROMISE/FINISHED_SHOWS"
diff --git a/server/-product/production/AMC/settings/mediacube.json b/server/-product/production/AMC/settings/mediacube.json
deleted file mode 100644 (file)
index d711393..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-{\r
-       "jobQueuePollInterval": 1000,\r
-       "targetRestoreFilters": [\r
-               "FILEZILLA_AVID", "FILEZILLA_PASARESTORE"\r
-       ],\r
-       "topTypeFilters": [\r
-               {\r
-                       "name": "Hír bejátszó",\r
-                       "color": "RED200",\r
-                       "icon": "ic_language_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Hír nyers",\r
-                       "color": "RED100",\r
-                       "icon": "ic_perm_camera_mic_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Visszarögzített",\r
-                       "color": "BROWN100",\r
-                       "icon": "ic_group_work_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Egyéb",\r
-                       "color": "YELLOW200",\r
-                       "icon": "ic_view_quilt_black_18dp.png"\r
-               }\r
-       ],\r
-       "bottomTypeFilters": [\r
-               {\r
-                       "name": "Műsor",\r
-                       "color": "TEAL200",\r
-                       "icon": "ic_theaters_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Műsor nyers",\r
-                       "color": "TEAL100",\r
-                       "icon": "ic_invert_colors_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Promo",\r
-                       "color": "INDIGO200",\r
-                       "icon": "ic_picture_in_picture_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Promo nyers",\r
-                       "color": "INDIGO100",\r
-                       "icon": "ic_bug_report_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Reklám",\r
-                       "color": "BLUE200",\r
-                       "icon": "ic_picture_in_picture_alt_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Reklám nyers",\r
-                       "color": "BLUE100",\r
-                       "icon": "ic_settings_brightness_black_18dp.png"\r
-               }\r
-       ],\r
-       "authentication": {\r
-               "authEnabled": true,\r
-               "adHost": "intra.amc.hu",\r
-               "adNonSecurePort": 3268,\r
-               "adBaseDn": "DC=intra,DC=amc,DC=hu",\r
-               "adAdminMap": [\r
-                        "INFORMATIKUSOK",\r
-                        "MUSZAKVEZETOK"\r
-               ],\r
-               "adSubmitterMap": [\r
-                        "INFORMATIKUSOK",\r
-                        "MUSZAKVEZETOK"\r
-               ],\r
-               "adEditorMap": [\r
-                        "INFORMATIKUSOK",\r
-                        "MUSZAKVEZETOK"\r
-               ],\r
-               "localAccounts": [\r
-                       {\r
-                               "user" : "user",\r
-                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
-                               "email" : null\r
-                       },\r
-                       {\r
-                               "user" : "user1",\r
-                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
-                               "email" : null\r
-                       },\r
-                       {\r
-                               "user" : "lebony",\r
-                               "password" : "4E25B117B14D86D7DCECB4E433CF932C",\r
-                               "email" : null\r
-                       },\r
-                       {\r
-                               "user" : "editor",\r
-                               "password" : "5AEE9DBD2A188839105073571BEE1B1F",\r
-                               "email" : null\r
-                       },\r
-                       {\r
-                               "user" : "root",\r
-                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
-                               "email" : "vasary@elgekko.net"\r
-                       }\r
-               ],\r
-               "localAdmins": [\r
-                       "root",\r
-                       "admin"\r
-               ],\r
-               "localSubmitters": [\r
-                       "lebony"\r
-               ],\r
-               "localEditors": [\r
-                       "editor"\r
-               ]\r
-       }\r
-}\r
-\r
-\r
-\r
diff --git a/server/-product/production/AMC/settings/mediacube.yaml b/server/-product/production/AMC/settings/mediacube.yaml
new file mode 100644 (file)
index 0000000..fcf8e5c
--- /dev/null
@@ -0,0 +1,57 @@
+jobQueuePollInterval: 1000\r
+disableHelp: true\r
+maestroDisabled: false\r
+alternateRetrieveSelector: false\r
+disableStatistics: true\r
+disableEditor: false\r
+targetRestoreFilters:\r
+- FILEZILLA_AVID\r
+- FILEZILLA_PASARESTORE\r
+topTypeFilters:\r
+- name: Hír bejátszó\r
+- name: Hír nyers\r
+- name: Visszarögzített\r
+- name: Egyéb\r
+bottomTypeFilters:\r
+- name: Műsor\r
+- name: Műsor nyers\r
+- name: Promo\r
+- name: Promo nyers\r
+- name: Reklám\r
+- name: Reklám nyers\r
+authentication:\r
+  authEnabled: true\r
+  defaultUser: root\r
+  defaultPassword: password\r
+  adHost: intra.amc.hu\r
+  adNonSecurePort: 3268\r
+  adBaseDn: DC=intra,DC=amc,DC=hu\r
+  adAdminMap:\r
+  - INFORMATIKUSOK\r
+  - MUSZAKVEZETOK\r
+  adSubmitterMap:\r
+  - INFORMATIKUSOK\r
+  - MUSZAKVEZETOK\r
+  adEditorMap:\r
+  - INFORMATIKUSOK\r
+  - MUSZAKVEZETOK\r
+  localAccounts:\r
+  - user: user\r
+    password: 5F4DCC3B5AA765D61D8327DEB882CF99\r
+    email:\r
+  - user: user1\r
+    password: 5F4DCC3B5AA765D61D8327DEB882CF99\r
+    email:\r
+  - user: lebony\r
+    password: 4E25B117B14D86D7DCECB4E433CF932C\r
+    email:\r
+  - user: root\r
+    password: 5F4DCC3B5AA765D61D8327DEB882CF99\r
+    email: vasary@elgekko.net\r
+  localAdmins:\r
+  - root\r
+  - admin\r
+  localSubmitters:\r
+  - lebony\r
+  localEditors:\r
+  - editor\r
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml b/server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml
deleted file mode 100644 (file)
index ba61d10..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Create the deployment manager                                   -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The deplyment manager handles the lifecycle of deploying web    -->
-<!-- applications. Apps are provided by instances of the             -->
-<!-- AppProvider interface.                                          -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <Call name="addBean">
-    <Arg>
-      <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-        <Set name="contexts">
-          <Ref refid="Contexts" />
-        </Set>
-        <Call name="setContextAttribute">
-          <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
-        </Call>
-
-        <!-- Add a customize step to the deployment lifecycle -->
-        <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
-        <Call name="insertLifeCycleNode">
-          <Arg>deployed</Arg>
-          <Arg>starting</Arg>
-          <Arg>customise</Arg>
-        </Call>
-        <Call name="addLifeCycleBinding">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
-              <Arg>customise</Arg>
-            </New>
-          </Arg>
-        </Call> -->
-
-        <Call id="webappprovider" name="addAppProvider">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-              <Set name="monitoredDirName">
-                <Property>
-                  <Name>jetty.deploy.monitoredPath</Name>
-                  <Default>
-                    <Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="."/>
-                  </Default>
-                </Property>
-              </Set>
-              <Set name="defaultsDescriptor">
-                <Property>
-                  <Name>jetty.deploy.defaultsDescriptorPath</Name>
-                  <Default>
-                    <Property name="jetty.home" default="." />/etc/webdefault.xml
-                  </Default>
-                </Property>
-              </Set>
-              <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
-              <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
-              <Set name="configurationManager">
-                <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
-                  <!-- file of context configuration properties
-                  <Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set>
-                  -->
-                  <!-- set a context configuration property
-                  <Call name="put"><Arg>name</Arg><Arg>value</Arg></Call>
-                  -->
-                </New>
-              </Set>
-            </New>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml b/server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml
deleted file mode 100644 (file)
index 556f544..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-               <Arg name="config">
-                  <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-                                          <Arg>
-                                             <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-                                                <!-- This says... Redirect to https://host:8443 if server returns "NOT SECURE" error -->
-                                                <Set name="secureScheme">https</Set>
-                                                <Set name="securePort">8444</Set>
-                                             </New>
-                                          </Arg>
-                                          <Call name="addCustomizer">
-                                             <Arg>
-                                                <New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
-                                             </Arg>
-                                          </Call>
-                                       </New>
-                </Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="9080" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-http.xml b/server/-product/production/AMC/settings/test-jetty/jetty-http.xml
deleted file mode 100644 (file)
index f4f61bf..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" default="9080" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-https.xml b/server/-product/production/AMC/settings/test-jetty/jetty-https.xml
deleted file mode 100644 (file)
index 71a0837..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure a HTTPS connector.                                  -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and jetty-ssl.xml.                                            -->
-<!-- ============================================================= -->
-<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-
-  <Call name="addIfAbsentConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.SslConnectionFactory">
-        <Arg name="next">http/1.1</Arg>
-        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
-      </New>
-    </Arg>
-  </Call>
-
-  <Call name="addConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
-        <Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
-      </New>
-    </Arg>
-  </Call>
-  
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml b/server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml
deleted file mode 100644 (file)
index e1edaf0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- SSL ContextFactory configuration                              -->
-<!-- ============================================================= -->
-
-<!-- 
-  To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
-     https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
--->
-
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="localhost.jks"/></Set>
-  <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="password"/></Set>
-  <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
-  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
-  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="password"/></Set>
-  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="localhost.jks"/></Set>
-  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="password"/></Set>
-  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
-  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
-  <Set name="EndpointIdentificationAlgorithm"></Set>
-  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
-  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
-  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
-  <Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
-  <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml b/server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml
deleted file mode 100644 (file)
index db6e2eb..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Base SSL configuration                                        -->
-<!-- This configuration needs to be used together with 1 or more   -->
-<!-- of jetty-https.xml or jetty-http2.xml                         -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a SSL Connector with no protocol factories              -->
-  <!-- =========================================================== -->
-  <Call  name="addConnector">
-    <Arg>
-      <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <!-- uncomment to support proxy protocol
-            <Item>
-              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
-            </Item>-->
-          </Array>
-        </Arg>
-
-        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="444" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-  <!-- =========================================================== -->
-  <!-- Create a TLS specific HttpConfiguration based on the        -->
-  <!-- common HttpConfiguration defined in jetty.xml               -->
-  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
-  <!-- session information                                         -->
-  <!-- =========================================================== -->
-  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-    <Arg><Ref refid="httpConfig"/></Arg>
-    <Call name="addCustomizer">
-      <Arg>
-        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
-          <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
-          <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
-          <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
-        </New>
-      </Arg>
-    </Call>
-  </New>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/jetty.xml b/server/-product/production/AMC/settings/test-jetty/jetty.xml
deleted file mode 100644 (file)
index c9afdb5..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
-<!--                                                                 -->
-<!-- Additional configuration files are available in $JETTY_HOME/etc -->
-<!-- and can be mixed in. See start.ini file for the default         -->
-<!-- configuration files.                                            -->
-<!--                                                                 -->
-<!-- For a description of the configuration mechanism, see the       -->
-<!-- output of:                                                      -->
-<!--   java -jar start.jar -?                                        -->
-<!-- =============================================================== -->
-
-<!-- =============================================================== -->
-<!-- Configure a Jetty Server instance with an ID "Server"           -->
-<!-- Other configuration files may also configure the "Server"       -->
-<!-- ID, in which case they are adding configuration to the same     -->
-<!-- instance.  If other configuration have a different ID, they     -->
-<!-- will create and configure another instance of Jetty.            -->
-<!-- Consult the javadoc of o.e.j.server.Server for all              -->
-<!-- configuration that may be set here.                             -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- =========================================================== -->
-    <!-- Configure the Server Thread Pool.                           -->
-    <!-- The server holds a common thread pool which is used by      -->
-    <!-- default as the executor used by all connectors and servlet  -->
-    <!-- dispatches.                                                 -->
-    <!--                                                             -->
-    <!-- Configuring a fixed thread pool is vital to controlling the -->
-    <!-- maximal memory footprint of the server and is a key tuning  -->
-    <!-- parameter for tuning.  In an application that rarely blocks -->
-    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
-    <!-- In an application that frequently blocks, then maximal      -->
-    <!-- threads should be set as high as possible given the memory  -->
-    <!-- available.                                                  -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <!-- uncomment to change type of threadpool
-    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
-    -->
-    <Get name="ThreadPool">
-      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
-      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
-      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
-      <Set name="detailedDump">false</Set>
-    </Get>
-
-    <!-- =========================================================== -->
-    <!-- Add shared Scheduler instance                               -->
-    <!-- =========================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Http Configuration.                                         -->
-    <!-- This is a common configuration instance used by all         -->
-    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
-    <!-- It configures the non wire protocol aspects of the HTTP     -->
-    <!-- semantic.                                                   -->
-    <!--                                                             -->
-    <!-- This configuration is only defined here and is used by      -->
-    <!-- reference from other XML files such as jetty-http.xml,      -->
-    <!-- jetty-https.xml and other configuration files which         -->
-    <!-- instantiate the connectors.                                 -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
-      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8444" /></Set>
-      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
-      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
-      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
-      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
-      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
-      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
-      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
-      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
-      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
-      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
-      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
-    </New>
-
-    <!-- =========================================================== -->
-    <!-- Set the default handler structure for the Server            -->
-    <!-- A handler collection is used to pass received requests to   -->
-    <!-- both the ContextHandlerCollection, which selects the next   -->
-    <!-- handler by context path and virtual host, and the           -->
-    <!-- DefaultHandler, which handles any requests not handled by   -->
-    <!-- the context handlers.                                       -->
-    <!-- Other handlers may be added to the "Handlers" collection,   -->
-    <!-- for example the jetty-requestlog.xml file adds the          -->
-    <!-- RequestLogHandler after the default handler                 -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.eclipse.jetty.server.Handler">
-           <Item>
-             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-
-    <!-- =========================================================== -->
-    <!-- extra server options                                        -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
-    <Set name="stopTimeout">5000</Set>
-    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
-    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
-
-</Configure>
diff --git a/server/-product/production/AMC/settings/test-jetty/keystore b/server/-product/production/AMC/settings/test-jetty/keystore
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/AMC/settings/test-jetty/keystore and /dev/null differ
diff --git a/server/-product/production/AMC/settings/test-jetty/localhost.jks b/server/-product/production/AMC/settings/test-jetty/localhost.jks
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/AMC/settings/test-jetty/localhost.jks and /dev/null differ
index 5f9eb9558d3de4ce72ed2b1aba0e958e408cc4cf..ae7a1d40d3bfede09f0c03bce2430cc211cc8629 100644 (file)
@@ -3,13 +3,12 @@
 if exist tmp rmdir tmp /s /q\r
 mkdir tmp\r
 java ^\r
--Dclean ^\r
 -Dorg.eclipse.epp.logging.aeri.skipReports=true ^\r
 -Declipse.ignoreApp=true ^\r
 -Dosgi.noShutdown=true ^\r
 -Dlog4j.configurationFile=settings/log4j2.xml ^\r
--Djetty.home=settings/test-jetty ^\r
--Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml ^\r
+-Djetty.home=settings ^\r
+-Djetty.etc.config.urls=jetty.xml ^\r
 -Djava.io.tmpdir=tmp ^\r
 -Dfile.encoding=UTF-8 ^\r
 -Dgosh.home=configuration ^\r
diff --git a/server/-product/production/HIRTV/settings/jetty.xml b/server/-product/production/HIRTV/settings/jetty.xml
new file mode 100644 (file)
index 0000000..5e47cac
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+       <Call name="addConnector">
+               <Arg>
+                       <New class="org.eclipse.jetty.server.ServerConnector">
+                               <Arg name="server">
+                                       <Ref refid="Server" />
+                               </Arg>
+                               <Set name="port">
+                                       <Property name="jetty.http.port" default="9080" />
+                               </Set>
+                       </New>
+               </Arg>
+       </Call>
+
+<!--   <Set name="sessionIdManager"> -->
+<!--           <New id="idMgr" -->
+<!--                   class="org.eclipse.jetty.server.session.DefaultSessionIdManager"> -->
+<!--                   <Arg> -->
+<!--                           <Ref refid="Server" /> -->
+<!--                   </Arg> -->
+<!--                   <Set name="workerName">node1</Set> -->
+<!--           </New> -->
+<!--   </Set> -->
+
+       <Set name="handler">
+               <New id="Handlers"
+                       class="org.eclipse.jetty.server.handler.HandlerCollection">
+                       <Set name="handlers">
+                               <Array type="org.eclipse.jetty.server.Handler">
+                                       <Item>
+                                               <New id="Contexts"
+                                                       class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
+                                       </Item>
+                                       <Item>
+                                               <New id="DefaultHandler"
+                                                       class="org.eclipse.jetty.server.handler.DefaultHandler" />
+                                       </Item>
+                               </Array>
+                       </Set>
+               </New>
+       </Set>
+</Configure>
\ No newline at end of file
index 10cdb7f6d259a5a5d6adfce3b6d387685b6a2094..82fe6bf642c760866319c757123df35907b2a9ff 100644 (file)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <executors>\r
+       <executor className="TestForkCancelableStep.java" maxConcurrent="3" isRemote="false" />\r
        <executor className="ArchiveRecursive.java" maxConcurrent="1" isRemote="false" />\r
        <executor className="ArchiveListBuilderStep.java" maxConcurrent="1" isRemote="false" />\r
        <executor className="ArchiveMaterialSubmitStep.java" maxConcurrent="1" isRemote="false" />\r
index aaf714371135ed515c8dd9297b42f6110cab16ea..fac78485e2d828ae843f6b61603e66aa85e7e1b2 100644 (file)
@@ -1,5 +1,9 @@
 {"joblist":[\r
        {\r
+      "template": "test-fork-cancelable.xml",\r
+      "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
+       },\r
+       {\r
       "active": true,\r
       "executeimmediate": true,\r
          "name" : "Proxy generálás",\r
index 982240de8dcddadb21d9b0a60c762a9abe485dbe..ebbe2d362f07c1b9ff1efb558349845a41d451e2 100644 (file)
@@ -17,48 +17,28 @@ public class CancelableStep extends JobStep {
        @StepEntry\r
        public Object[] execute(int param) throws Exception {\r
                try {\r
-                       getJobRuntime().setRelated("TESZT1");\r
-\r
-                       //                      ftpTest();\r
 \r
                        Marker marker = MarkerManager.getMarker("MEDIAPROFILE");\r
+                       getJobRuntime().setRelated("TESZT" + param);\r
 \r
                        for (int i = 0; i < count; i++) {\r
                                if (getJobRuntime().isWaitingCancel())\r
                                        break;\r
-                               Thread.sleep(50);\r
+                               Thread.sleep(500);\r
+                               if (param==0)\r
+                                       throw new Exception();\r
+                               if (param==1) {\r
+                                       getJobRuntime().setDisableRetry(true);\r
+                                       throw new Exception();\r
+                               }\r
                                int progress = (i + 1) * 100 / count;\r
                                setProgress(progress);\r
-                               logger.info(marker, "{}", i);\r
                        }\r
                } catch (Exception e) {\r
-                       e.printStackTrace();\r
+                       logger.info(e.getMessage());\r
                        throw e;\r
                }\r
                return null;\r
        }\r
 \r
-       void ftpTest() throws Exception {\r
-               StoreUri source = null;\r
-               StoreUri target = null;\r
-               try {\r
-                       source = getManager().getStoreUri("MEDIACUBE_UPLOADS", RemoteStoreProtocol.LOCAL);\r
-                       target = getManager().getStoreUri("NEXIO1", RemoteStoreProtocol.FTP);\r
-                       source.addProgressListener(e -> setProgress(e.getProgress()));\r
-                       logger.info("Uploading file PART_TEST.mxf");\r
-                       source.transferFrom(target, "PART_TEST.mxf", "PART_TEST.mxf");\r
-                       FTPClient client = ((FtpDirectoryLister) target.getLister()).connect();\r
-                       logger.info("Renaming file PART_TEST.mxf to RENAME_TEST.mxf");\r
-                       client.rename("PART_TEST.mxf", "RENAME_TEST.mxf");\r
-               } catch (Exception e) {\r
-                       logger.catching(e);\r
-               } finally {\r
-                       if (target != null)\r
-                               target.cleanUp();\r
-                       if (source != null)\r
-                               source.cleanUp();\r
-               }\r
-\r
-       }\r
-\r
 }\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java
new file mode 100644 (file)
index 0000000..c1b49f7
--- /dev/null
@@ -0,0 +1,35 @@
+package user.jobengine.server.steps;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import user.commons.IJob;\r
+import user.commons.JobStatus;\r
+import user.commons.ListUtils;\r
+import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.IJobRuntime;\r
+\r
+public class TestForkCancelableStep extends JobStep {\r
+       private static final String CHILD_TITLE = "Párhuzamosított alfolyamat";\r
+       //      private static final String CHILD_TEMPLATE = "fake-concurrent.xml";\r
+       private static final String CHILD_TEMPLATE = "cancelable.xml";\r
+       private static final Logger logger = LogManager.getLogger();\r
+       int count = 3;\r
+\r
+       @StepEntry\r
+       public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               for (int i = 0; i < count; i++) {\r
+                       IJobRuntime rt = getEngine().submit(null, e -> {\r
+                               if (e.getStatus().equals(JobStatus.SUSPENDED)) {\r
+                                       IJobRuntime rt = (IJobRuntime) e.getSource();\r
+                                       logger.info("Cleanup on SUSPEND {}, {}", rt.getId(), rt.isDisableRetry());\r
+                               }\r
+                       }, CHILD_TEMPLATE, "JOB " + i, 0, IJobEngine.DEFAULT_OWNER, ListUtils.asMap("param", i));\r
+                       \r
+                       rt.setRelated("TEST" + rt.getId());\r
+               }\r
+\r
+               logger.info("Done");\r
+               return null;\r
+       }\r
+}\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml b/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml
new file mode 100644 (file)
index 0000000..8c88d84
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate multiInstance="true" useSessionLog="false">\r
+<commands>\r
+       <calljobstep type="TestForkCancelableStep.java" weight="1" />\r
+</commands>\r
+</jobtemplate>
\ No newline at end of file
index 64cbf7812c198443750b48cf8697cc47b644bcac..099f5aee03e39736c2631074fa6313a98837a60c 100644 (file)
@@ -2,13 +2,12 @@
 if exist tmp rmdir tmp /s /q\r
 mkdir tmp\r
 java ^\r
--Dclean ^\r
 -Dorg.eclipse.epp.logging.aeri.skipReports=true ^\r
 -Declipse.ignoreApp=true ^\r
 -Dosgi.noShutdown=true ^\r
 -Dlog4j.configurationFile=settings/log4j2.xml ^\r
--Djetty.home=settings/test-jetty ^\r
--Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml ^\r
+-Djetty.home=settings ^\r
+-Djetty.etc.config.urls=jetty.xml ^\r
 -Djava.io.tmpdir=tmp ^\r
 -Dfile.encoding=UTF-8 ^\r
 -Dgosh.home=configuration ^\r
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty.xml
new file mode 100644 (file)
index 0000000..5e47cac
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+       <Call name="addConnector">
+               <Arg>
+                       <New class="org.eclipse.jetty.server.ServerConnector">
+                               <Arg name="server">
+                                       <Ref refid="Server" />
+                               </Arg>
+                               <Set name="port">
+                                       <Property name="jetty.http.port" default="9080" />
+                               </Set>
+                       </New>
+               </Arg>
+       </Call>
+
+<!--   <Set name="sessionIdManager"> -->
+<!--           <New id="idMgr" -->
+<!--                   class="org.eclipse.jetty.server.session.DefaultSessionIdManager"> -->
+<!--                   <Arg> -->
+<!--                           <Ref refid="Server" /> -->
+<!--                   </Arg> -->
+<!--                   <Set name="workerName">node1</Set> -->
+<!--           </New> -->
+<!--   </Set> -->
+
+       <Set name="handler">
+               <New id="Handlers"
+                       class="org.eclipse.jetty.server.handler.HandlerCollection">
+                       <Set name="handlers">
+                               <Array type="org.eclipse.jetty.server.Handler">
+                                       <Item>
+                                               <New id="Contexts"
+                                                       class="org.eclipse.jetty.server.handler.ContextHandlerCollection" />
+                                       </Item>
+                                       <Item>
+                                               <New id="DefaultHandler"
+                                                       class="org.eclipse.jetty.server.handler.DefaultHandler" />
+                                       </Item>
+                               </Array>
+                       </Set>
+               </New>
+       </Set>
+</Configure>
\ No newline at end of file
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml
deleted file mode 100644 (file)
index 95b6398..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" default="8888" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml
deleted file mode 100644 (file)
index 71a0837..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure a HTTPS connector.                                  -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and jetty-ssl.xml.                                            -->
-<!-- ============================================================= -->
-<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-
-  <Call name="addIfAbsentConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.SslConnectionFactory">
-        <Arg name="next">http/1.1</Arg>
-        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
-      </New>
-    </Arg>
-  </Call>
-
-  <Call name="addConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
-        <Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
-      </New>
-    </Arg>
-  </Call>
-  
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml
deleted file mode 100644 (file)
index e1edaf0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- SSL ContextFactory configuration                              -->
-<!-- ============================================================= -->
-
-<!-- 
-  To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
-     https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
--->
-
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="localhost.jks"/></Set>
-  <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="password"/></Set>
-  <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
-  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
-  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="password"/></Set>
-  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="localhost.jks"/></Set>
-  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="password"/></Set>
-  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
-  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
-  <Set name="EndpointIdentificationAlgorithm"></Set>
-  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
-  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
-  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
-  <Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
-  <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml
deleted file mode 100644 (file)
index a079c1f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Base SSL configuration                                        -->
-<!-- This configuration needs to be used together with 1 or more   -->
-<!-- of jetty-https.xml or jetty-http2.xml                         -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a SSL Connector with no protocol factories              -->
-  <!-- =========================================================== -->
-  <Call  name="addConnector">
-    <Arg>
-      <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <!-- uncomment to support proxy protocol
-            <Item>
-              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
-            </Item>-->
-          </Array>
-        </Arg>
-
-        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="8443" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-  <!-- =========================================================== -->
-  <!-- Create a TLS specific HttpConfiguration based on the        -->
-  <!-- common HttpConfiguration defined in jetty.xml               -->
-  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
-  <!-- session information                                         -->
-  <!-- =========================================================== -->
-  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-    <Arg><Ref refid="httpConfig"/></Arg>
-    <Call name="addCustomizer">
-      <Arg>
-        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
-          <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
-          <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
-          <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
-        </New>
-      </Arg>
-    </Call>
-  </New>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml
deleted file mode 100644 (file)
index 0ba3838..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
-<!--                                                                 -->
-<!-- Additional configuration files are available in $JETTY_HOME/etc -->
-<!-- and can be mixed in. See start.ini file for the default         -->
-<!-- configuration files.                                            -->
-<!--                                                                 -->
-<!-- For a description of the configuration mechanism, see the       -->
-<!-- output of:                                                      -->
-<!--   java -jar start.jar -?                                        -->
-<!-- =============================================================== -->
-
-<!-- =============================================================== -->
-<!-- Configure a Jetty Server instance with an ID "Server"           -->
-<!-- Other configuration files may also configure the "Server"       -->
-<!-- ID, in which case they are adding configuration to the same     -->
-<!-- instance.  If other configuration have a different ID, they     -->
-<!-- will create and configure another instance of Jetty.            -->
-<!-- Consult the javadoc of o.e.j.server.Server for all              -->
-<!-- configuration that may be set here.                             -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- =========================================================== -->
-    <!-- Configure the Server Thread Pool.                           -->
-    <!-- The server holds a common thread pool which is used by      -->
-    <!-- default as the executor used by all connectors and servlet  -->
-    <!-- dispatches.                                                 -->
-    <!--                                                             -->
-    <!-- Configuring a fixed thread pool is vital to controlling the -->
-    <!-- maximal memory footprint of the server and is a key tuning  -->
-    <!-- parameter for tuning.  In an application that rarely blocks -->
-    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
-    <!-- In an application that frequently blocks, then maximal      -->
-    <!-- threads should be set as high as possible given the memory  -->
-    <!-- available.                                                  -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <!-- uncomment to change type of threadpool
-    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
-    -->
-    <Get name="ThreadPool">
-      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
-      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
-      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
-      <Set name="detailedDump">false</Set>
-    </Get>
-
-    <!-- =========================================================== -->
-    <!-- Add shared Scheduler instance                               -->
-    <!-- =========================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Http Configuration.                                         -->
-    <!-- This is a common configuration instance used by all         -->
-    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
-    <!-- It configures the non wire protocol aspects of the HTTP     -->
-    <!-- semantic.                                                   -->
-    <!--                                                             -->
-    <!-- This configuration is only defined here and is used by      -->
-    <!-- reference from other XML files such as jetty-http.xml,      -->
-    <!-- jetty-https.xml and other configuration files which         -->
-    <!-- instantiate the connectors.                                 -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
-      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8443" /></Set>
-      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
-      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
-      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
-      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
-      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
-      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
-      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
-      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
-      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
-      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
-      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
-    </New>
-
-    <!-- =========================================================== -->
-    <!-- Set the default handler structure for the Server            -->
-    <!-- A handler collection is used to pass received requests to   -->
-    <!-- both the ContextHandlerCollection, which selects the next   -->
-    <!-- handler by context path and virtual host, and the           -->
-    <!-- DefaultHandler, which handles any requests not handled by   -->
-    <!-- the context handlers.                                       -->
-    <!-- Other handlers may be added to the "Handlers" collection,   -->
-    <!-- for example the jetty-requestlog.xml file adds the          -->
-    <!-- RequestLogHandler after the default handler                 -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.eclipse.jetty.server.Handler">
-           <Item>
-             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-
-    <!-- =========================================================== -->
-    <!-- extra server options                                        -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
-    <Set name="stopTimeout">5000</Set>
-    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
-    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore b/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore and /dev/null differ
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks b/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks and /dev/null differ
index fcf8cf5ce1d017610eb4775fb7d87866dcaff73b..347ca896d3f5618fc6c5c9a9bbd9b6d3c4246154 100644 (file)
@@ -1,4 +1,9 @@
 jobQueuePollInterval: 1000\r
+disableHelp: true\r
+maestroDisabled: false\r
+alternateRetrieveSelector: false\r
+disableStatistics: true\r
+disableEditor: false\r
 topTypeFilters:\r
 - name: Hír bejátszó\r
 - name: Hír nyers\r
@@ -13,6 +18,8 @@ bottomTypeFilters:
 - name: Reklám nyers\r
 authentication:\r
   authEnabled: true\r
+  defaultUser: root\r
+  defaultPassword: password\r
   adHost: intra.mediavivantis.hu\r
   adNonSecurePort: 3268\r
   adBaseDn: DC=intra,DC=mediavivantis,DC=hu\r
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml
deleted file mode 100644 (file)
index ba61d10..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Create the deployment manager                                   -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The deplyment manager handles the lifecycle of deploying web    -->
-<!-- applications. Apps are provided by instances of the             -->
-<!-- AppProvider interface.                                          -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <Call name="addBean">
-    <Arg>
-      <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-        <Set name="contexts">
-          <Ref refid="Contexts" />
-        </Set>
-        <Call name="setContextAttribute">
-          <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
-        </Call>
-
-        <!-- Add a customize step to the deployment lifecycle -->
-        <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
-        <Call name="insertLifeCycleNode">
-          <Arg>deployed</Arg>
-          <Arg>starting</Arg>
-          <Arg>customise</Arg>
-        </Call>
-        <Call name="addLifeCycleBinding">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
-              <Arg>customise</Arg>
-            </New>
-          </Arg>
-        </Call> -->
-
-        <Call id="webappprovider" name="addAppProvider">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-              <Set name="monitoredDirName">
-                <Property>
-                  <Name>jetty.deploy.monitoredPath</Name>
-                  <Default>
-                    <Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="."/>
-                  </Default>
-                </Property>
-              </Set>
-              <Set name="defaultsDescriptor">
-                <Property>
-                  <Name>jetty.deploy.defaultsDescriptorPath</Name>
-                  <Default>
-                    <Property name="jetty.home" default="." />/etc/webdefault.xml
-                  </Default>
-                </Property>
-              </Set>
-              <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
-              <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
-              <Set name="configurationManager">
-                <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
-                  <!-- file of context configuration properties
-                  <Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set>
-                  -->
-                  <!-- set a context configuration property
-                  <Call name="put"><Arg>name</Arg><Arg>value</Arg></Call>
-                  -->
-                </New>
-              </Set>
-            </New>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml
deleted file mode 100644 (file)
index 556f544..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-               <Arg name="config">
-                  <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-                                          <Arg>
-                                             <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-                                                <!-- This says... Redirect to https://host:8443 if server returns "NOT SECURE" error -->
-                                                <Set name="secureScheme">https</Set>
-                                                <Set name="securePort">8444</Set>
-                                             </New>
-                                          </Arg>
-                                          <Call name="addCustomizer">
-                                             <Arg>
-                                                <New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
-                                             </Arg>
-                                          </Call>
-                                       </New>
-                </Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="9080" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml
deleted file mode 100644 (file)
index f4f61bf..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" default="9080" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml
deleted file mode 100644 (file)
index 71a0837..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure a HTTPS connector.                                  -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- and jetty-ssl.xml.                                            -->
-<!-- ============================================================= -->
-<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-
-  <Call name="addIfAbsentConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.SslConnectionFactory">
-        <Arg name="next">http/1.1</Arg>
-        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
-      </New>
-    </Arg>
-  </Call>
-
-  <Call name="addConnectionFactory">
-    <Arg>
-      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
-        <Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
-      </New>
-    </Arg>
-  </Call>
-  
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml
deleted file mode 100644 (file)
index e1edaf0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- SSL ContextFactory configuration                              -->
-<!-- ============================================================= -->
-
-<!-- 
-  To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
-     https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
--->
-
-<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="localhost.jks"/></Set>
-  <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="password"/></Set>
-  <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
-  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
-  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="password"/></Set>
-  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="localhost.jks"/></Set>
-  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="password"/></Set>
-  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
-  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
-  <Set name="EndpointIdentificationAlgorithm"></Set>
-  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
-  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
-  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
-  <Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
-  <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml
deleted file mode 100644 (file)
index db6e2eb..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Base SSL configuration                                        -->
-<!-- This configuration needs to be used together with 1 or more   -->
-<!-- of jetty-https.xml or jetty-http2.xml                         -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a SSL Connector with no protocol factories              -->
-  <!-- =========================================================== -->
-  <Call  name="addConnector">
-    <Arg>
-      <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <!-- uncomment to support proxy protocol
-            <Item>
-              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
-            </Item>-->
-          </Array>
-        </Arg>
-
-        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="444" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-  <!-- =========================================================== -->
-  <!-- Create a TLS specific HttpConfiguration based on the        -->
-  <!-- common HttpConfiguration defined in jetty.xml               -->
-  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
-  <!-- session information                                         -->
-  <!-- =========================================================== -->
-  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-    <Arg><Ref refid="httpConfig"/></Arg>
-    <Call name="addCustomizer">
-      <Arg>
-        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
-          <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
-          <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
-          <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
-        </New>
-      </Arg>
-    </Call>
-  </New>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml
deleted file mode 100644 (file)
index c9afdb5..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
-<!--                                                                 -->
-<!-- Additional configuration files are available in $JETTY_HOME/etc -->
-<!-- and can be mixed in. See start.ini file for the default         -->
-<!-- configuration files.                                            -->
-<!--                                                                 -->
-<!-- For a description of the configuration mechanism, see the       -->
-<!-- output of:                                                      -->
-<!--   java -jar start.jar -?                                        -->
-<!-- =============================================================== -->
-
-<!-- =============================================================== -->
-<!-- Configure a Jetty Server instance with an ID "Server"           -->
-<!-- Other configuration files may also configure the "Server"       -->
-<!-- ID, in which case they are adding configuration to the same     -->
-<!-- instance.  If other configuration have a different ID, they     -->
-<!-- will create and configure another instance of Jetty.            -->
-<!-- Consult the javadoc of o.e.j.server.Server for all              -->
-<!-- configuration that may be set here.                             -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- =========================================================== -->
-    <!-- Configure the Server Thread Pool.                           -->
-    <!-- The server holds a common thread pool which is used by      -->
-    <!-- default as the executor used by all connectors and servlet  -->
-    <!-- dispatches.                                                 -->
-    <!--                                                             -->
-    <!-- Configuring a fixed thread pool is vital to controlling the -->
-    <!-- maximal memory footprint of the server and is a key tuning  -->
-    <!-- parameter for tuning.  In an application that rarely blocks -->
-    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
-    <!-- In an application that frequently blocks, then maximal      -->
-    <!-- threads should be set as high as possible given the memory  -->
-    <!-- available.                                                  -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <!-- uncomment to change type of threadpool
-    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
-    -->
-    <Get name="ThreadPool">
-      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
-      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
-      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
-      <Set name="detailedDump">false</Set>
-    </Get>
-
-    <!-- =========================================================== -->
-    <!-- Add shared Scheduler instance                               -->
-    <!-- =========================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Http Configuration.                                         -->
-    <!-- This is a common configuration instance used by all         -->
-    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
-    <!-- It configures the non wire protocol aspects of the HTTP     -->
-    <!-- semantic.                                                   -->
-    <!--                                                             -->
-    <!-- This configuration is only defined here and is used by      -->
-    <!-- reference from other XML files such as jetty-http.xml,      -->
-    <!-- jetty-https.xml and other configuration files which         -->
-    <!-- instantiate the connectors.                                 -->
-    <!--                                                             -->
-    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
-    <!-- for all configuration that may be set here.                 -->
-    <!-- =========================================================== -->
-    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
-      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8444" /></Set>
-      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
-      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
-      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
-      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
-      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
-      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
-      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
-      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
-      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
-      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
-      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
-    </New>
-
-    <!-- =========================================================== -->
-    <!-- Set the default handler structure for the Server            -->
-    <!-- A handler collection is used to pass received requests to   -->
-    <!-- both the ContextHandlerCollection, which selects the next   -->
-    <!-- handler by context path and virtual host, and the           -->
-    <!-- DefaultHandler, which handles any requests not handled by   -->
-    <!-- the context handlers.                                       -->
-    <!-- Other handlers may be added to the "Handlers" collection,   -->
-    <!-- for example the jetty-requestlog.xml file adds the          -->
-    <!-- RequestLogHandler after the default handler                 -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-        <Set name="handlers">
-         <Array type="org.eclipse.jetty.server.Handler">
-           <Item>
-             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-           </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-           </Item>
-         </Array>
-        </Set>
-      </New>
-    </Set>
-
-    <!-- =========================================================== -->
-    <!-- extra server options                                        -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
-    <Set name="stopTimeout">5000</Set>
-    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
-    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
-
-</Configure>
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore and /dev/null differ
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks and /dev/null differ
diff --git a/server/RemoteSystemsTempFiles/.project b/server/RemoteSystemsTempFiles/.project
deleted file mode 100644 (file)
index 7675629..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>RemoteSystemsTempFiles</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>\r
-       </natures>\r
-</projectDescription>\r
index d58c0c8bb00fff32dbb14cb8251d10669830adb1..a7c660fcc6b390356b6f370f4461e880d1824651 100644 (file)
@@ -52,8 +52,6 @@ public interface IJobRuntime extends IJob {
 \r
        IJobEngine getJobEngine();\r
 \r
-       Marker getSessionMarker();\r
-\r
        IInstruction getNextInstruction() throws NoSuchElementException;\r
 \r
        Object getParameter(String name);\r
@@ -64,6 +62,8 @@ public interface IJobRuntime extends IJob {
 \r
        JobStatus getSavedStatus();\r
 \r
+       Marker getSessionMarker();\r
+\r
        int getSpawnOrder();\r
 \r
        Stack<Object> getStack();\r
@@ -80,6 +80,8 @@ public interface IJobRuntime extends IJob {
 \r
        boolean isCancelable();\r
 \r
+       boolean isDisableRetry();\r
+\r
        boolean isRunable();\r
 \r
        boolean isService();\r
@@ -112,6 +114,8 @@ public interface IJobRuntime extends IJob {
 \r
        void setCurrentStep(String currentStep);\r
 \r
+       void setDisableRetry(boolean disableRetry);\r
+\r
        @Override\r
        void setParameters(Map<String, Object> parameters);\r
 \r
index d9ee5afa8b5f816462ca0b0de42af3f243073c5c..f05de1ec58b7983d0d29f83d274fda418ee6aabf 100644 (file)
@@ -92,6 +92,7 @@ public class JobRuntime extends Job implements IJobRuntime {
 
        private boolean cancelable = true;
        private List<JobStatus> finishedStates = Arrays.asList(JobStatus.FINISHED, JobStatus.CANCELED, JobStatus.SUSPENDED);
+       private boolean disableRetry;
 
        public JobRuntime() {
                variables = null;
@@ -570,6 +571,11 @@ public class JobRuntime extends Job implements IJobRuntime {
                return cancelable;
        }
 
+       @Override
+       public boolean isDisableRetry() {
+               return disableRetry;
+       }
+
        @Override
        public boolean isRunable() {
                return JobStatus.RUNABLE.equals(status);
@@ -713,11 +719,6 @@ public class JobRuntime extends Job implements IJobRuntime {
                savedStack = (Stack<Object>) stack.clone();
        }
 
-       @Override
-       public void saveStatus() {
-               savedStatus = status;
-       }
-
        /*
                private final EventListenerList listeners = new EventListenerList();
                private List<JobRuntime> children;
@@ -730,6 +731,11 @@ public class JobRuntime extends Job implements IJobRuntime {
 
         * */
 
+       @Override
+       public void saveStatus() {
+               savedStatus = status;
+       }
+
        @Override
        public void setCancelable(boolean cancelable) {
                this.cancelable = cancelable;
@@ -740,6 +746,11 @@ public class JobRuntime extends Job implements IJobRuntime {
                this.currentStep = currentStep;
        }
 
+       @Override
+       public void setDisableRetry(boolean disableRetry) {
+               this.disableRetry = disableRetry;
+       }
+
        @Override
        public void setId(long id) {
                super.setId(id);
index 4533d1d28cdb37017e6aa1aa6abcb70e7a036548..785b8e9ec958952a1d1048842457a2548c646c08 100644 (file)
@@ -204,7 +204,7 @@ public class SearchModel extends AsyncBaseModel {
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
                //A MediaFileServlet a services/proxy alatt szolgal ki\r
-               Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', 'video/mp4')");\r
+               //Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', 'video/mp4')");\r
 \r
                try {\r
                        Selectors.wireComponents(view, this, false);\r