git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/mediacube-dev-user.properties b/server/-configuration/mediacube-dev-user.properties
index 2c0621ca5559d26756a194dc9352e8d9092e4454..4879ae5f92b1ecac0d06cdb4bb0e79bca898d788 100644 (file)
--- 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\r
 jobengine.nosql.db.password=password\r
 \r
-jobengine.master.server=http://localhost:8888
\ No newline at end of file
+jobengine.master.server=http://localhost:8888\r
+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 2ca556af96afcec2e1a76cf7cc898887bed496f8..fdc857ea426a46d1c241a8470ce3b55c40e61314 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="301">\r
+<?pde version="3.8"?><target name="JobEngine" sequenceNumber="305">\r
 <locations>\r
 <location path="${eclipse_home}" type="Profile"/>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
@@ -76,7 +76,6 @@
 <plugin id="org.eclipse.osgi.util"/>\r
 <plugin id="org.hamcrest.core" version="1.3.0.v201303031735"/>\r
 <plugin id="org.jboss.resteasy.client"/>\r
-<plugin id="org.jboss.resteasy.jackson2-provider"/>\r
 <plugin id="org.jboss.resteasy.jaxb-provider"/>\r
 <plugin id="org.jboss.resteasy.jaxrs"/>\r
 <plugin id="org.jboss.resteasy.jaxrs-api"/>\r

diff --git a/server/user.jobengine.executors/META-INF/MANIFEST.MF b/server/user.jobengine.executors/META-INF/MANIFEST.MF
index 853dd70d967fb4b5896cf9190f2dded33fe3348b..8257a45e1d87adf429284b371f5c5d505bf1429a 100644 (file)
--- 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 cd74817193d3138b99b6d998e19d60d26bb54fc8..ecf43fa134baf337a2e01c43f1ca0329f4cde587 100644 (file)
--- 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 e3fd06b0a3cc58fc5f3b58adb6f898a15da80ce2..ef16c48a7313e3c2fe7e4cd1cc6a7da70c75d4c2 100644 (file)
--- 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\r

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 (file)
index 0000000..9ad1f6f
--- /dev/null
+++ b/server/user.jobengine.osgi.server/test/user/jobengine/server/IT/SupportMigratePASA.java
@@ -0,0 +1,47 @@
+package user.jobengine.server.IT;\r
+\r
+import java.io.FileInputStream;\r
+import java.net.URL;\r
+import java.util.Properties;\r
+\r
+import org.junit.AfterClass;\r
+import org.junit.BeforeClass;\r
+import org.junit.Test;\r
+\r
+import user.jobengine.db.IItemManager;\r
+import user.jobengine.db.ItemManager;\r
+\r
+public class SupportMigratePASA {\r
+       protected static IItemManager manager = null;\r
+\r
+       @BeforeClass\r
+       static public void setUpConnection() throws Exception {\r
+               Properties properties = new Properties();\r
+               URL srcLocation = JobengineIT.class.getProtectionDomain().getCodeSource().getLocation();\r
+               URL location = new URL(srcLocation, "../../-configuration/mediacube-dev-user.properties");\r
+               properties.load(new FileInputStream(location.toURI().getPath().toString()));\r
+               System.getProperties().putAll(properties);\r
+\r
+               //Rendszer DB reteg\r
+               manager = new ItemManager();\r
+               manager.connect();\r
+       }\r
+\r
+       @AfterClass\r
+       static public void tearDownConnection() {\r
+               manager.disconnect();\r
+       }\r
+\r
+       @Test\r
+       public void migratePASA() throws Exception {\r
+               //              Item item = manager.createItem("Default", "Item1", "Itemdesc1", "Itemhouseid1");\r
+               //              Media media = manager.createMedia("Default", "Media1", "Mediadesc1", "Mediahouseid1");\r
+               //              item.appendMedia(media);\r
+               //              MediaFile mf1 = manager.createMediaFile("/xxx", manager.getFileType("Lowres"), manager.getSystemStore(true), media);\r
+               //              MediaFile mf2 = manager.createMediaFile("/yyy", manager.getFileType("Lowres"), manager.getSystemStore(true), media);\r
+               //\r
+               //              item.add();\r
+\r
+       }\r
+\r
+}\r

diff --git a/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF
index f6c7b15f9dfeb4ead66b7b23621e2b394522ccff..5c6714baec69cb6382c845577bde31c1485630e6 100644 (file)
--- 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,