From bdb04a5210c23cc86e44f397f8307ca8a79afa0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 12 May 2020 09:23:53 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31820 --- .../mediacube-dev-user.properties | 3 +- server/-dependencies/jobengine.target | 3 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 + .../services/javax.ws.rs.ext.Providers | 2 +- .../server/IT/SupportMigratePASA.java | 47 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 1 + 7 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportMigratePASA.java diff --git a/server/-configuration/mediacube-dev-user.properties b/server/-configuration/mediacube-dev-user.properties index 2c0621ca..4879ae5f 100644 --- a/server/-configuration/mediacube-dev-user.properties +++ b/server/-configuration/mediacube-dev-user.properties @@ -14,4 +14,5 @@ jobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFro jobengine.nosql.db.user=db2admin jobengine.nosql.db.password=password -jobengine.master.server=http://localhost:8888 \ No newline at end of file +jobengine.master.server=http://localhost:8888 +javax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory \ No newline at end of file diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index 2ca556af..fdc857ea 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -1,5 +1,5 @@ - + @@ -76,7 +76,6 @@ - diff --git a/server/user.jobengine.executors/META-INF/MANIFEST.MF b/server/user.jobengine.executors/META-INF/MANIFEST.MF index 853dd70d..8257a45e 100644 --- a/server/user.jobengine.executors/META-INF/MANIFEST.MF +++ b/server/user.jobengine.executors/META-INF/MANIFEST.MF @@ -18,7 +18,6 @@ Require-Bundle: user.jobengine.osgi.commons;bundle-version="1.0.0", com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;bundle-version="2.4.5", com.fasterxml.jackson.module.jackson-module-jaxb-annotations;bundle-version="2.4.5", org.jboss.resteasy.client;bundle-version="3.0.11", - org.jboss.resteasy.jackson2-provider;bundle-version="3.0.11", org.jboss.resteasy.jaxb-provider;bundle-version="3.0.11", org.jboss.resteasy.jaxrs;bundle-version="3.0.11", org.jboss.resteasy.jaxrs-api;bundle-version="3.0.11", diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index cd748171..ecf43fa1 100644 --- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Import-Package: javax.servlet;version="3.1.0", org.eclipse.core.runtime.adaptor, org.eclipse.osgi.framework.console;version="1.1.0", org.jboss.resteasy.client.jaxrs, + org.jboss.resteasy.spi, org.osgi.framework;version="1.5.0", org.osgi.framework.wiring;version="1.2.0", org.osgi.util.tracker;version="1.4.0", diff --git a/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers b/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers index e3fd06b0..ef16c48a 100644 --- a/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers +++ b/server/user.jobengine.osgi.server/META-INF/services/javax.ws.rs.ext.Providers @@ -1 +1 @@ -org.jboss.resteasy.plugins.providers.StringTextStar \ No newline at end of file +org.jboss.resteasy.plugins.providers.StringTextStar diff --git a/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportMigratePASA.java b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportMigratePASA.java new file mode 100644 index 00000000..9ad1f6ff --- /dev/null +++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportMigratePASA.java @@ -0,0 +1,47 @@ +package user.jobengine.server.IT; + +import java.io.FileInputStream; +import java.net.URL; +import java.util.Properties; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import user.jobengine.db.IItemManager; +import user.jobengine.db.ItemManager; + +public class SupportMigratePASA { + protected static IItemManager manager = null; + + @BeforeClass + static public void setUpConnection() throws Exception { + Properties properties = new Properties(); + URL srcLocation = JobengineIT.class.getProtectionDomain().getCodeSource().getLocation(); + URL location = new URL(srcLocation, "../../-configuration/mediacube-dev-user.properties"); + properties.load(new FileInputStream(location.toURI().getPath().toString())); + System.getProperties().putAll(properties); + + //Rendszer DB reteg + manager = new ItemManager(); + manager.connect(); + } + + @AfterClass + static public void tearDownConnection() { + manager.disconnect(); + } + + @Test + public void migratePASA() throws Exception { + // Item item = manager.createItem("Default", "Item1", "Itemdesc1", "Itemhouseid1"); + // Media media = manager.createMedia("Default", "Media1", "Mediadesc1", "Mediahouseid1"); + // item.appendMedia(media); + // MediaFile mf1 = manager.createMediaFile("/xxx", manager.getFileType("Lowres"), manager.getSystemStore(true), media); + // MediaFile mf2 = manager.createMediaFile("/yyy", manager.getFileType("Lowres"), manager.getSystemStore(true), media); + // + // item.add(); + + } + +} diff --git a/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF index f6c7b15f..5c6714ba 100644 --- a/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF @@ -33,6 +33,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", org.joda.time.base;version="2.2.0", org.osgi.framework;version="1.8.0", user.commons, + user.commons.cluster, user.commons.nexio, user.commons.octopus, user.jobengine.db, -- 2.54.0