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

diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
index fd6d94a57b523fbd94fce9012ca796c7f70d42d6..12679c8d9a49fe0c2aa47a7410b25068d2d1cdf1 100644 (file)
--- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
+++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Server
 Bundle-SymbolicName: user.jobengine.osgi.server;singleton:=true
 Bundle-Version: 1.0.0
-Service-Component: OSGI-INF/jobEngine.xml, OSGI-INF/jobEngineConfig.xml, OSGI-INF/componentBinder.xml
+Service-Component: OSGI-INF/jobEngine.xml, OSGI-INF/jobEngineConfig.xml
 Import-Package: com.fasterxml.jackson.databind;version="2.4.5",
  com.fasterxml.jackson.jaxrs.cfg;version="2.4.5",
  com.fasterxml.jackson.jaxrs.json;version="2.4.5",

diff --git a/server/user.jobengine.osgi.server/OSGI-INF/componentBinder.xml b/server/user.jobengine.osgi.server/OSGI-INF/componentBinder.xml
deleted file mode 100644 (file)
index 61bdea2..0000000
--- a/server/user.jobengine.osgi.server/OSGI-INF/componentBinder.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="user.jobengine.server.ComponentBinder">\r
-   <implementation class="user.jobengine.osgi.server.ComponentBinder"/>\r
-   <reference cardinality="1..1" interface="user.commons.nexio.INexioAPI" name="INexioAPI" policy="static" bind="bindNexioService" unbind="unbindNexioService"/>\r
-</scr:component>\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ComponentBinder.java b/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ComponentBinder.java
deleted file mode 100644 (file)
index 0dd3f5a..0000000
--- a/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ComponentBinder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package user.jobengine.osgi.server;\r
-\r
-import org.apache.logging.log4j.LogManager;\r
-import org.apache.logging.log4j.Logger;\r
-\r
-import user.commons.nexio.INexioAPI;\r
-import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r
-\r
-public class ComponentBinder {\r
-       private static final Logger logger = LogManager.getLogger();\r
-       private static INexioAPI nexioAPI;\r
-       private static IMetadataProviderFactory metadataProviderFactory;\r
-\r
-       public static IMetadataProviderFactory getMetadataProviderFactory() {\r
-               return metadataProviderFactory;\r
-       }\r
-\r
-       public static INexioAPI getNexioAPI() {\r
-               if (nexioAPI == null)\r
-                       throw new RuntimeException("INexioAPI is null");\r
-               return nexioAPI;\r
-       }\r
-\r
-       public synchronized void bindMetadataProviderFactory(Object service) {\r
-               if (service instanceof IMetadataProviderFactory) {\r
-                       metadataProviderFactory = (IMetadataProviderFactory) service;\r
-                       logger.info("IMetadataProviderFactory service binded");\r
-               }\r
-       }\r
-\r
-       public synchronized void bindNexioService(Object service) {\r
-               if (service instanceof INexioAPI) {\r
-                       nexioAPI = (INexioAPI) service;\r
-                       logger.info("INexioAPI service binded");\r
-               }\r
-       }\r
-\r
-       public synchronized void unbindMetadataProviderFactory(Object service) {\r
-               metadataProviderFactory = null;\r
-               logger.info("IMetadataProviderFactory service unbinded");\r
-       }\r
-\r
-       public synchronized void unbindNexioService(Object service) {\r
-               nexioAPI = null;\r
-               logger.info("INexioAPI service unbinded");\r
-       }\r
-\r
-}\r